From: Douglas Anderson <dianders@chromium.org>
Date: Fri, 22 Apr 2016 21:27:39 +0000 (-0700)
Subject: ARM64: dts: rockchip: Remove 'veyron' in kevin/gru compatible
X-Git-Tag: firefly_0821_release~2742
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8d3a4374ee20fe9ede9724e034d2f460ee94b482;p=firefly-linux-kernel-4.4.55.git

ARM64: dts: rockchip: Remove 'veyron' in kevin/gru compatible

Veyron was an rk3288 board.  Having it in the compatible doesn't make a
ton of sense.  We'll stick 'gru' in the kevin name, though, since that
sorta makes sense.  Not that we ever really fall back to this stuff.

BUG=None
TEST=Build and boot

Change-Id: Ia4b6e02bd9b160c0b20e5459ca441047add2c0bd
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-on: https://chrome-internal-review.googlesource.com/256508
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/rk3399-gru-gru.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts
index f986fd5377b9..ce5db0ad27d7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts
@@ -55,7 +55,7 @@
 		     "google,gru-rev5", "google,gru-rev4",
 		     "google,gru-rev3", "google,gru-rev2",
 		     "google,gru-rev1", "google,gru-rev0",
-		     "google,gru", "google,veyron", "rockchip,rk3399";
+		     "google,gru", "rockchip,rk3399";
 
 	// TODO: Model:
 	// - pp1200_mipi_cam
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
index ff6166b8ec1e..99e7b2cb01e4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
@@ -48,7 +48,7 @@
 / {
 	model = "Google Kevin Rev 0";
 	compatible = "google,kevin-rev0",
-		     "google,kevin", "google,veyron", "rockchip,rk3399";
+		     "google,kevin", "google,gru", "rockchip,rk3399";
 };
 
 &pp3000 {
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 cf8a4fb6dde2..858e80397841 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
@@ -55,7 +55,7 @@
 		     "google,kevin-rev5", "google,kevin-rev4",
 		     "google,kevin-rev3", "google,kevin-rev2",
 		     "google,kevin-rev1", "google,kevin",
-		     "google,veyron", "rockchip,rk3399";
+		     "google,gru", "rockchip,rk3399";
 };
 
 /* PINCTRL: always below everything else */