CHROMIUM: arm64: dts: rockchip: scarlet: add SKU0 device tree
BUG=b:120112668
TEST=confirm the new dts matched to dumo board from firmware log
and see device tree update from /proc/device-tree
Change-Id: I34ceb3bae83357f26e6e5e485038e1c9921c7820
Signed-off-by: Philip Chen <philipchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1443508
Reviewed-by: Brian Norris <briannorris@chromium.org>
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 55fd984..215b4ee2 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -16,6 +16,7 @@
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-r2.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-r3-sku7.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-r4-sku6.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-r5-sku0.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
always := $(dtb-y)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r4-sku6.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r4-sku6.dts
index 0bacef5..82dd7c6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r4-sku6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r4-sku6.dts
@@ -48,13 +48,7 @@
/ {
model = "Google Scarlet";
- compatible = "google,scarlet-rev15-sku0", "google,scarlet-rev14-sku0",
- "google,scarlet-rev13-sku0", "google,scarlet-rev12-sku0",
- "google,scarlet-rev11-sku0", "google,scarlet-rev10-sku0",
- "google,scarlet-rev9-sku0", "google,scarlet-rev8-sku0",
- "google,scarlet-rev7-sku0", "google,scarlet-rev6-sku0",
- "google,scarlet-rev5-sku0", "google,scarlet-rev4-sku0",
- "google,scarlet-rev15-sku2", "google,scarlet-rev14-sku2",
+ compatible = "google,scarlet-rev15-sku2", "google,scarlet-rev14-sku2",
"google,scarlet-rev13-sku2", "google,scarlet-rev12-sku2",
"google,scarlet-rev11-sku2", "google,scarlet-rev10-sku2",
"google,scarlet-rev9-sku2", "google,scarlet-rev8-sku2",
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r5-sku0.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r5-sku0.dts
new file mode 100644
index 0000000..16bbd34
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r5-sku0.dts
@@ -0,0 +1,74 @@
+/*
+ * Google Gru-Scarlet Rev5+ (SKU-0) board device tree source
+ *
+ * Copyright 2019 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-scarlet.dtsi"
+
+/ {
+ model = "Google Scarlet";
+ compatible = "google,scarlet-rev15-sku0", "google,scarlet-rev15",
+ "google,scarlet-rev14-sku0", "google,scarlet-rev14",
+ "google,scarlet-rev13-sku0", "google,scarlet-rev13",
+ "google,scarlet-rev12-sku0", "google,scarlet-rev12",
+ "google,scarlet-rev11-sku0", "google,scarlet-rev11",
+ "google,scarlet-rev10-sku0", "google,scarlet-rev10",
+ "google,scarlet-rev9-sku0", "google,scarlet-rev9",
+ "google,scarlet-rev8-sku0", "google,scarlet-rev8",
+ "google,scarlet-rev7-sku0", "google,scarlet-rev7",
+ "google,scarlet-rev6-sku0", "google,scarlet-rev6",
+ "google,scarlet-rev5-sku0", "google,scarlet-rev5",
+ "google,scarlet", "google,gru", "rockchip,rk3399";
+};
+
+&mipi_panel {
+ compatible = "innolux,p097pfg";
+ /delete-property/ power-supply;
+ avdd-supply = <&ppvarp_lcd>;
+ avee-supply = <&ppvarn_lcd>;
+};
+
+&qca_wifi {
+ qcom,ath10k-calibration-variant = "GO_DUMO";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
index 7e4205b..f44434d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
@@ -628,6 +628,14 @@
vpcie1v8-supply = <&pp1800_pcie>;
};
+&pci_rootport {
+ qca_wifi: wifi@0,0 {
+ compatible = "qcom,ath10k";
+ reg = <0x83010000 0x0 0x00000000 0x0 0x00100000
+ 0x83010000 0x0 0x00100000 0x0 0x00100000>;
+ };
+};
+
&sdmmc {
cd-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
