Skip to contentSkip to conversation

arm64: dts: rockchip: add missing address and size cells for rk3399 mipi dsi

PATCH New Heiko Stuebner 3 participants 5 messages Nov 1, 2018 – Nov 8, 2018

Subsystems (2)
Device tree bindings Arm Rockchip
lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

PATCH v2 1/2 arm64: dts: rockchip: add missing address and size cells for rk3399 mipi dsi

DSI controllers are also the hosts of their dsi bus and therefore contain nodes describing the attached panels with their reg properties containing the virtual ids.

The dsi controller nodes on rk3399 lacked the #address-cells and #size-cells for these subnodes, so add them.

Signed-off-by Heiko Stuebner <[email protected]>

---
changes in v2: none

 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +4 -0
index c88e603396f6..4ac7bf547916 100644
@@ -1720,6 +1720,8 @@
 		resets = <&cru SRST_P_MIPI_DSI0>;
 		reset-names = "apb";
 		rockchip,grf = <&grf>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 		status = "disabled";
 
 		ports {

@@ -1754,6 +1756,8 @@
 		resets = <&cru SRST_P_MIPI_DSI1>;
 		reset-names = "apb";
 		rockchip,grf = <&grf>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 		status = "disabled";
 
 		ports {
Signature · 1 line
2.17.0
author maintainer
#1 lore raw

PATCH v2 2/2 arm64: dts: rockchip: add Gru Scarlet devicetrees

Gru-Scarlet is a tablet device using ChomeOS, dual-dsi display and Wacom touchscreen with stylus.

There exist two variants in the market using different displays that are differentiated via their sku-id.
The bootloader on them also determines the correct devicetree to load via the sku-id.

So add a common scarlet dtsi and two minimal board devicetrees for the two display variants.

Signed-off-by Heiko Stuebner <[email protected]>

---
changes in v2:
- drop coreboot param override
- rebase against current master state so it will apply against 4.20-rc1

 .../devicetree/bindings/arm/rockchip.txt      |  34 +
 arch/arm64/boot/dts/rockchip/Makefile         |   2 +
 .../dts/rockchip/rk3399-gru-scarlet-inx.dts   |  33 +
 .../dts/rockchip/rk3399-gru-scarlet-kd.dts    |  33 +
 .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 594 ++++++++++++++++++
 5 files changed, 696 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-kd.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
Documentation/devicetree/bindings/arm/rockchip.txt +34 -0
index 0cc71236d639..7ce7382fedd8 100644
@@ -152,6 +152,40 @@ Rockchip platforms device tree bindings
       - compatible = "google,veyron-pinky-rev2", "google,veyron-pinky",
 		     "google,veyron", "rockchip,rk3288";
 
+- Google Scarlet - with display from Kingdisplay
+    Required root node properties:
+      - compatible = "google,scarlet-rev15-sku7", "google,scarlet-rev15",
+		     "google,scarlet-rev14-sku7", "google,scarlet-rev14",
+		     "google,scarlet-rev13-sku7", "google,scarlet-rev13",
+		     "google,scarlet-rev12-sku7", "google,scarlet-rev12",
+		     "google,scarlet-rev11-sku7", "google,scarlet-rev11",
+		     "google,scarlet-rev10-sku7", "google,scarlet-rev10",
+		     "google,scarlet-rev9-sku7",  "google,scarlet-rev9",
+		     "google,scarlet-rev8-sku7",  "google,scarlet-rev8",
+		     "google,scarlet-rev7-sku7",  "google,scarlet-rev7",
+		     "google,scarlet-rev6-sku7",  "google,scarlet-rev6",
+		     "google,scarlet-rev5-sku7",  "google,scarlet-rev5",
+		     "google,scarlet-rev4-sku7",  "google,scarlet-rev4",
+		     "google,scarlet-rev3-sku7",  "google,scarlet-rev3",
+		     "google,scarlet", "google,gru", "rockchip,rk3399";
+
+- Google Scarlet - with display from Innolux
+    Required root node properties:
+      - compatible = "google,scarlet-rev15-sku6", "google,scarlet-rev15",
+		     "google,scarlet-rev14-sku6", "google,scarlet-rev14",
+		     "google,scarlet-rev13-sku6", "google,scarlet-rev13",
+		     "google,scarlet-rev12-sku6", "google,scarlet-rev12",
+		     "google,scarlet-rev11-sku6", "google,scarlet-rev11",
+		     "google,scarlet-rev10-sku6", "google,scarlet-rev10",
+		     "google,scarlet-rev9-sku6",  "google,scarlet-rev9",
+		     "google,scarlet-rev8-sku6",  "google,scarlet-rev8",
+		     "google,scarlet-rev7-sku6",  "google,scarlet-rev7",
+		     "google,scarlet-rev6-sku6",  "google,scarlet-rev6",
+		     "google,scarlet-rev5-sku6",  "google,scarlet-rev5",
+		     "google,scarlet-rev4-sku6",  "google,scarlet-rev4",
+		     "google,scarlet", "google,gru", "rockchip,rk3399";
+
+
 - Google Speedy (Asus C201 Chromebook):
     Required root node properties:
       - compatible = "google,veyron-speedy-rev9", "google,veyron-speedy-rev8",
arch/arm64/boot/dts/rockchip/Makefile +2 -0
index 49042c477870..de0c406c20cc 100644
@@ -14,6 +14,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts new file +33 -0
new file mode 100644
index 000000000000..2d721a974790
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Gru-Scarlet Rev4+ (SKU-6/Innolux) board device tree source
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+#include "rk3399-gru-scarlet.dtsi"
+
+/ {
+	model = "Google Scarlet";
+	compatible = "google,scarlet-rev15-sku6", "google,scarlet-rev15",
+		     "google,scarlet-rev14-sku6", "google,scarlet-rev14",
+		     "google,scarlet-rev13-sku6", "google,scarlet-rev13",
+		     "google,scarlet-rev12-sku6", "google,scarlet-rev12",
+		     "google,scarlet-rev11-sku6", "google,scarlet-rev11",
+		     "google,scarlet-rev10-sku6", "google,scarlet-rev10",
+		     "google,scarlet-rev9-sku6",  "google,scarlet-rev9",
+		     "google,scarlet-rev8-sku6",  "google,scarlet-rev8",
+		     "google,scarlet-rev7-sku6",  "google,scarlet-rev7",
+		     "google,scarlet-rev6-sku6",  "google,scarlet-rev6",
+		     "google,scarlet-rev5-sku6",  "google,scarlet-rev5",
+		     "google,scarlet-rev4-sku6",  "google,scarlet-rev4",
+		     "google,scarlet", "google,gru", "rockchip,rk3399";
+};
+
+&mipi_panel {
+	compatible = "innolux,p097pfg";
+	avdd-supply = <&ppvarp_lcd>;
+	avee-supply = <&ppvarn_lcd>;
+};
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-kd.dts new file +33 -0
new file mode 100644
index 000000000000..e49a194aaa0f
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Gru-Scarlet Rev3+ (SKU-7/Kingdisplay) board device tree source
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+#include "rk3399-gru-scarlet.dtsi"
+
+/ {
+	model = "Google Scarlet";
+	compatible = "google,scarlet-rev15-sku7", "google,scarlet-rev15",
+		     "google,scarlet-rev14-sku7", "google,scarlet-rev14",
+		     "google,scarlet-rev13-sku7", "google,scarlet-rev13",
+		     "google,scarlet-rev12-sku7", "google,scarlet-rev12",
+		     "google,scarlet-rev11-sku7", "google,scarlet-rev11",
+		     "google,scarlet-rev10-sku7", "google,scarlet-rev10",
+		     "google,scarlet-rev9-sku7",  "google,scarlet-rev9",
+		     "google,scarlet-rev8-sku7",  "google,scarlet-rev8",
+		     "google,scarlet-rev7-sku7",  "google,scarlet-rev7",
+		     "google,scarlet-rev6-sku7",  "google,scarlet-rev6",
+		     "google,scarlet-rev5-sku7",  "google,scarlet-rev5",
+		     "google,scarlet-rev4-sku7",  "google,scarlet-rev4",
+		     "google,scarlet-rev3-sku7",  "google,scarlet-rev3",
+		     "google,scarlet", "google,gru", "rockchip,rk3399";
+};
+
+&mipi_panel {
+	compatible = "kingdisplay,kd097d04";
+	power-supply = <&pp3300_s0>;
+};
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi new file +594 -0

594 lines not on this page · raw message

Signature · 1 line
2.18.0
maintainer
#2 lore raw

PATCH v2 2/2 arm64: dts: rockchip: add Gru Scarlet devicetrees

Quoted 17 lines · Heiko Stuebner

Gru-Scarlet is a tablet device using ChomeOS, dual-dsi display and Wacom touchscreen with stylus.

There exist two variants in the market using different displays that are differentiated via their sku-id.
The bootloader on them also determines the correct devicetree to load via the sku-id.

So add a common scarlet dtsi and two minimal board devicetrees for the two display variants.

Signed-off-by Heiko Stuebner <[email protected]>

---
changes in v2:
- drop coreboot param override
- rebase against current master state so it will apply against 4.20-rc1

Quoted 10 lines
 .../devicetree/bindings/arm/rockchip.txt      |  34 +
 arch/arm64/boot/dts/rockchip/Makefile         |   2 +
 .../dts/rockchip/rk3399-gru-scarlet-inx.dts   |  33 +
 .../dts/rockchip/rk3399-gru-scarlet-kd.dts    |  33 +
 .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 594 ++++++++++++++++++
 5 files changed, 696 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-kd.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
Reviewed-by Rob Herring <[email protected]>
author maintainer
#3 lore raw

PATCH v2 2/2 arm64: dts: rockchip: add Gru Scarlet devicetrees

In reply to Heiko Stuebner

Am Donnerstag, 1. November 2018, 13:36:39 CET schrieb Heiko Stuebner:

Quoted 8 lines

Gru-Scarlet is a tablet device using ChomeOS, dual-dsi display and Wacom touchscreen with stylus.

There exist two variants in the market using different displays that are differentiated via their sku-id.
The bootloader on them also determines the correct devicetree to load via the sku-id.

Quoted 4 lines

So add a common scarlet dtsi and two minimal board devicetrees for the two display variants.

Signed-off-by Heiko Stuebner <[email protected]>

looks like I already applied patch1 in time for 4.20 (and forgot about it), but have now also applied this patch2 for 4.21 with Rob's review.

#4 lore raw

PATCH v2 2/2 arm64: dts: rockchip: add Gru Scarlet devicetrees

Quoted 9 lines · Heiko Stuebner

Am Donnerstag, 1. November 2018, 13:36:39 CET schrieb Heiko Stuebner:

Quoted 8 lines

Gru-Scarlet is a tablet device using ChomeOS, dual-dsi display and Wacom touchscreen with stylus.

There exist two variants in the market using different displays that are differentiated via their sku-id.
The bootloader on them also determines the correct devicetree to load via the sku-id.

Quoted 8 lines
Quoted 4 lines

So add a common scarlet dtsi and two minimal board devicetrees for the two display variants.

Signed-off-by Heiko Stuebner <[email protected]>

looks like I already applied patch1 in time for 4.20 (and forgot about it), but have now also applied this patch2 for 4.21 with Rob's review.

Thanks, by the way! This worked well for me today, testing 4.20-rc1. Well, except for this silly bit, but that bug has been around (and more or less untested) for several releases:

https://lore.kernel.org/patchwork/patch/1008074/
[PATCH] input: cros_ec_keyb: fix button/switch capability reports

And this silly one that slipped into this merge window:

https://lore.kernel.org/patchwork/patch/1008098/
[PATCH 4.20] ath10k: don't assume 'vif' is non-NULL in flush()

*Grumble*: one would think people would test their changes before submitting them, but apparently that's too much to ask.