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.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)
--- /dev/null
+/*
+ * Google Gru-Kevin Rev 1+ 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 1";
+ compatible = "google,kevin-rev1", "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>;
+};
--- /dev/null
+/*
+ * 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>;
+ };
+ };
+};
+++ /dev/null
-/*
- * 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";
- 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-rev0",
- "google,kevin", "google,veyron", "rockchip,rk3399";
-};
-
pinctrl-0 = <&pp3000_en>;
enable-active-high;
- gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+ gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>;
regulator-always-on;
regulator-boot-on;
regulator-boot-on;
enable-active-high;
- gpio = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+ gpio = <&gpio0 2 GPIO_ACTIVE_HIGH>;
vin-supply = <&pp1800>;
};
regulator-always-on; // TODO: for bringup???
regulator-boot-on; // TODO: for bringup???
enable-active-high;
- gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+ gpio = <&gpio0 4 GPIO_ACTIVE_HIGH>;
vin-supply = <&pp1800>;
};
clock-freq-min-max = <400000 37500000>;
bus-width = <4>;
- cd-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
+ cd-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
disable-wp;
cap-mmc-highspeed;
google,cros-ec-spi-pre-delay = <30>; // TODO: check
interrupt-parent = <&gpio0>;
- interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
spi-max-frequency = <3000000>; // TODO: check; TODO: rx-sample-delay-ns?
i2c_tunnel: i2c-tunnel {
cros-ec {
ec_ap_int_l: ec-ap-int-l {
- rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
+ rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
discrete-regulators {
pp1500_en: pp1500-en {
- rockchip,pins = <RK_GPIO1 11 RK_FUNC_GPIO
+ rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO
&pcfg_pull_none>;
};
pp1800_audio_en: pp1800-audio-en {
- rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO
- &pcfg_pull_none>;
+ rockchip,pins = <RK_GPIO0 2 RK_FUNC_GPIO
+ &pcfg_pull_down>;
};
pp3300_disp_en: pp3300-disp-en {
};
pp3000_en: pp3000-en {
- rockchip,pins = <RK_GPIO1 12 RK_FUNC_GPIO
+ rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO
&pcfg_pull_none>;
};
};
wlan_module_pd_l: wlan-module-pd-l {
- rockchip,pins = <RK_GPIO0 8 RK_FUNC_GPIO
- &pcfg_pull_none>;
+ rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO
+ &pcfg_pull_down>;
};
};
/* This is where we actually hook up CD; has external pull */
sdmmc_cd_gpio: sdmmc-cd-gpio {
- rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>;
+ rockchip,pins = <4 24 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
projects / firefly-linux-kernel-4.4.55.git / commitdiff