6 files changed, 1629 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index cc4ace6397ab..d05caa6ee89d 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -56,6 +56,17 @@ Rockchip platforms device tree bindings
       - compatible = "google,veyron-brain-rev0", "google,veyron-brain",
                      "google,veyron", "rockchip,rk3288";
 
+- Google Gru (dev-board):
+    Required root node properties:
+      - compatible = "google,gru-rev15", "google,gru-rev14",
+                     "google,gru-rev13", "google,gru-rev12",
+                     "google,gru-rev11", "google,gru-rev10",
+                     "google,gru-rev9", "google,gru-rev8",
+                     "google,gru-rev7", "google,gru-rev6",
+                     "google,gru-rev5", "google,gru-rev4",
+                     "google,gru-rev3", "google,gru-rev2",
+                     "google,gru", "rockchip,rk3399";
+
 - Google Jaq (Haier Chromebook 11 and more):
     Required root node properties:
       - compatible = "google,veyron-jaq-rev5", "google,veyron-jaq-rev4",
@@ -70,6 +81,15 @@ Rockchip platforms device tree bindings
                      "google,veyron-jerry-rev3", "google,veyron-jerry",
                      "google,veyron", "rockchip,rk3288";
 
+- Google Kevin (Samsung Chromebook Plus):
+    Required root node properties:
+      - 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", "google,gru", "rockchip,rk3399";
+
 - Google Mickey (Asus Chromebit CS10):
     Required root node properties:
       - compatible = "google,veyron-mickey-rev8", "google,veyron-mickey-rev7",
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 3a862894ea44..b82f7b61ab6f 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
 
 always          := $(dtb-y)
 subdir-y        := $(dts-dirs)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
new file mode 100644
index 000000000000..658bb9dc9dfd
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
@@ -0,0 +1,306 @@
+/*
+ * Google Gru-Kevin Rev 6+ board device tree source
+ *
+ * Copyright 2016-2017 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"
+#include <include/dt-bindings/input/linux-event-codes.h>
+
+/*
+ * Kevin-specific things
+ *
+ * Things in this section should use names from Kevin schematic since no
+ * equivalent exists in Gru schematic.  If referring to signals that exist
+ * in Gru we use the Gru names, though.  Confusing enough for you?
+ */
+/ {
+        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", "google,gru", "rockchip,rk3399";
+
+        /* Power tree */
+
+        p3_3v_dig: p3-3v-dig {
+                compatible = "regulator-fixed";
+                regulator-name = "p3.3v_dig";
+                pinctrl-names = "default";
+                pinctrl-0 = <&cpu3_pen_pwr_en>;
+
+                enable-active-high;
+                gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>;
+                vin-supply = <&pp3300>;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&cros_ec_pwm 1>;
+                brightness-levels = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+                                     17 18 19 20 21 22 23 24 25 26 27 28 29 30
+                                     31 32 33 34 35 36 37 38 39 40 41 42 43 44
+                                     45 46 47 48 49 50 51 52 53 54 55 56 57 58
+                                     59 60 61 62 63 64 65 66 67 68 69 70 71 72
+                                     73 74 75 76 77 78 79 80 81 82 83 84 85 86
+                                     87 88 89 90 91 92 93 94 95 96 97 98 99 100>;
+                default-brightness-level = <51>;
+                enable-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
+                power-supply = <&pp3300_disp>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&bl_en>;
+                pwm-delay-us = <10000>;
+        };
+
+        thermistor_ppvar_bigcpu: thermistor-ppvar-bigcpu {
+                compatible = "murata,ncp15wb473";
+                pullup-uv = <1800000>;
+                pullup-ohm = <25500>;
+                pulldown-ohm = <0>;
+                io-channels = <&saradc 2>;
+                #thermal-sensor-cells = <0>;
+        };
+
+        thermistor_ppvar_litcpu: thermistor-ppvar-litcpu {
+                compatible = "murata,ncp15wb473";
+                pullup-uv = <1800000>;
+                pullup-ohm = <25500>;
+                pulldown-ohm = <0>;
+                io-channels = <&saradc 3>;
+                #thermal-sensor-cells = <0>;
+        };
+};
+
+&gpio_keys {
+        pinctrl-names = "default";
+        pinctrl-0 = <&bt_host_wake_l>, <&cpu1_pen_eject>;
+
+        pen-insert {
+                label = "Pen Insert";
+                /* Insert = low, eject = high */
+                gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                linux,code = <SW_PEN_INSERTED>;
+                linux,input-type = <EV_SW>;
+                wakeup-source;
+        };
+};
+
+&thermal_zones {
+        bigcpu_reg_thermal: bigcpu-reg-thermal {
+                polling-delay-passive = <100>; /* milliseconds */