ARM64: dts: rockchip: Fixup revisions for kevin

Turns out that we got mixed up.  Old stuff should just be rev 0.  New
stuff should be rev 1+.  Fix all that.

BUG=None
TEST=Boot rev 0.

Change-Id: I41b38893f1e4224df4e3646cd268179307b3476b
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-on: https://chrome-internal-review.googlesource.com/256507
Commit-Ready: Doug Anderson <dianders@google.com>
Tested-by: Doug Anderson <dianders@google.com>
Reviewed-by: Brian Norris <briannorris@google.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 70a32af2b25c10f18ddd57cf8978d977313e4015..6563eaa2029f223ef4b89456ec4279ec838db9d8 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -6,8 +6,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb1-android.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb1-cros.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-fpga.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-gru.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin-r0.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin-r1.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin-r2.dtb
 
 always         := $(dtb-y)
 subdir-y       := $(dts-dirs)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
new file mode 100644 (file)
index 0000000..ff6166b
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
@@ -0,0 +1,100 @@
+/*
+ * Google Gru-Kevin Rev 0 board device tree source
+ *
+ * Copyright 2016 Google, Inc
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *  Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "rk3399-gru.dtsi"
+
+/ {
+       model = "Google Kevin Rev 0";
+       compatible = "google,kevin-rev0",
+                    "google,kevin", "google,veyron", "rockchip,rk3399";
+};
+
+&pp3000 {
+       gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+};
+
+&pp1800_audio {
+       gpio = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+};
+
+&pp1800_pcie {
+       gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+};
+
+&sdmmc {
+       cd-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
+};
+
+&cros_ec {
+       interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+};
+
+&ec_ap_int_l {
+       rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
+};
+
+&pp1500_en {
+       rockchip,pins = <RK_GPIO1 11 RK_FUNC_GPIO &pcfg_pull_none>;
+};
+
+&pp1800_audio_en {
+       rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO
+                        &pcfg_pull_none>;
+};
+
+&pp3000_en {
+       rockchip,pins = <RK_GPIO1 12 RK_FUNC_GPIO
+                        &pcfg_pull_none>;
+};
+
+&wlan_module_pd_l {
+       rockchip,pins = <RK_GPIO0 8 RK_FUNC_GPIO
+                        &pcfg_pull_none>;
+};
+
+/* This is where we actually hook up CD; has external pull */
+&sdmmc_cd_gpio {
+       rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>;
+};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
index 8e2f59d4cedb1acc5d47b15adabe9f702459b810..cf8a4fb6dde2db1e594049d3f5bfb87bae5f6e75 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
@@ -46,55 +46,25 @@
 #include "rk3399-gru.dtsi"
 
 / {
-       model = "Google Kevin Rev 1";
-       compatible = "google,kevin-rev1", "google,kevin-rev0",
-                    "google,kevin", "google,veyron", "rockchip,rk3399";
+       model = "Google Kevin";
+       compatible = "google,kevin-rev15", "google,kevin-rev14",
+                    "google,kevin-rev13", "google,kevin-rev12",
+                    "google,kevin-rev11", "google,kevin-rev10",
+                    "google,kevin-rev9", "google,kevin-rev8",
+                    "google,kevin-rev7", "google,kevin-rev6",
+                    "google,kevin-rev5", "google,kevin-rev4",
+                    "google,kevin-rev3", "google,kevin-rev2",
+                    "google,kevin-rev1", "google,kevin",
+                    "google,veyron", "rockchip,rk3399";
 };
 
-&pp3000 {
-       gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
-};
-
-&pp1800_audio {
-       gpio = <&gpio0 1 GPIO_ACTIVE_HIGH>;
-};
-
-&pp1800_pcie {
-       gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>;
-};
-
-&sdmmc {
-       cd-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
-};
-
-&cros_ec {
-       interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-};
-
-&ec_ap_int_l {
-       rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
-};
-
-&pp1500_en {
-       rockchip,pins = <RK_GPIO1 11 RK_FUNC_GPIO &pcfg_pull_none>;
-};
-
-&pp1800_audio_en {
-       rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO
-                        &pcfg_pull_none>;
-};
-
-&pp3000_en {
-       rockchip,pins = <RK_GPIO1 12 RK_FUNC_GPIO
-                        &pcfg_pull_none>;
-};
-
-&wlan_module_pd_l {
-       rockchip,pins = <RK_GPIO0 8 RK_FUNC_GPIO
-                        &pcfg_pull_none>;
-};
+/* PINCTRL: always below everything else */
 
-/* This is where we actually hook up CD; has external pull */
-&sdmmc_cd_gpio {
-       rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>;
+&pinctrl {
+       pen-eject {
+               pen_eject_l: pen-eject-l {
+                       rockchip,pins = <RK_GPIO0 13 RK_FUNC_GPIO
+                               &pcfg_pull_up>;
+               };
+       };
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r2.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r2.dts
deleted file mode 100644 (file)
index 1aff9c7..0000000
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r2.dts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Google Gru-Kevin Rev 2+ board device tree source
- *
- * Copyright 2016 Google, Inc
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *  Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use,
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/dts-v1/;
-#include "rk3399-gru.dtsi"
-
-/ {
-       model = "Google Kevin";
-       compatible = "google,kevin-rev15", "google,kevin-rev14",
-                    "google,kevin-rev13", "google,kevin-rev12",
-                    "google,kevin-rev11", "google,kevin-rev10",
-                    "google,kevin-rev9", "google,kevin-rev8",
-                    "google,kevin-rev7", "google,kevin-rev6",
-                    "google,kevin-rev5", "google,kevin-rev4",
-                    "google,kevin-rev3", "google,kevin-rev2",
-                    "google,kevin", "google,veyron", "rockchip,rk3399";
-};
-
-/* PINCTRL: always below everything else */
-
-&pinctrl {
-       pen-eject {
-               pen_eject_l: pen-eject-l {
-                       rockchip,pins = <RK_GPIO0 13 RK_FUNC_GPIO
-                               &pcfg_pull_up>;
-               };
-       };
-};