* [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet-dumo board
2021-08-12 9:47 [PATCH 0/2] arm64: dts: rockchip: Add Scarlet Dumo Variant Chen-Yu Tsai
@ 2021-08-12 9:47 ` Chen-Yu Tsai
2021-08-12 9:47 ` [PATCH 2/2] arm64: dts: rockchip: rk3399: " Chen-Yu Tsai
2021-08-13 8:51 ` [PATCH 0/2] arm64: dts: rockchip: Add Scarlet Dumo Variant Heiko Stuebner
2 siblings, 0 replies; 4+ messages in thread
From: Chen-Yu Tsai @ 2021-08-12 9:47 UTC (permalink / raw)
To: Rob Herring, Heiko Stuebner
Cc: Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
Dumo is another variant of Scarlet, also known as the ASUS Chromebook
Tablet CT100. This is almost the same as Scarlet-Innolux, but uses a
specific calibration variant for the WiFi module.
Add an entry for the board compatibles.
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
.../devicetree/bindings/arm/rockchip.yaml | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index aa9a4fd4fc20..4aed16176434 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -298,6 +298,34 @@ properties:
- const: google,veyron
- const: rockchip,rk3288
+ - description: Google Scarlet - Dumo (ASUS Chromebook Tablet CT100)
+ items:
+ - const: google,scarlet-rev15-sku0
+ - const: google,scarlet-rev15
+ - const: google,scarlet-rev14-sku0
+ - const: google,scarlet-rev14
+ - const: google,scarlet-rev13-sku0
+ - const: google,scarlet-rev13
+ - const: google,scarlet-rev12-sku0
+ - const: google,scarlet-rev12
+ - const: google,scarlet-rev11-sku0
+ - const: google,scarlet-rev11
+ - const: google,scarlet-rev10-sku0
+ - const: google,scarlet-rev10
+ - const: google,scarlet-rev9-sku0
+ - const: google,scarlet-rev9
+ - const: google,scarlet-rev8-sku0
+ - const: google,scarlet-rev8
+ - const: google,scarlet-rev7-sku0
+ - const: google,scarlet-rev7
+ - const: google,scarlet-rev6-sku0
+ - const: google,scarlet-rev6
+ - const: google,scarlet-rev5-sku0
+ - const: google,scarlet-rev5
+ - const: google,scarlet
+ - const: google,gru
+ - const: rockchip,rk3399
+
- description: Google Scarlet - Kingdisplay (Acer Chromebook Tab 10)
items:
- const: google,scarlet-rev15-sku7
--
2.32.0.605.g8dce9f2422-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] arm64: dts: rockchip: rk3399: Add gru-scarlet-dumo board
2021-08-12 9:47 [PATCH 0/2] arm64: dts: rockchip: Add Scarlet Dumo Variant Chen-Yu Tsai
2021-08-12 9:47 ` [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet-dumo board Chen-Yu Tsai
@ 2021-08-12 9:47 ` Chen-Yu Tsai
2021-08-13 8:51 ` [PATCH 0/2] arm64: dts: rockchip: Add Scarlet Dumo Variant Heiko Stuebner
2 siblings, 0 replies; 4+ messages in thread
From: Chen-Yu Tsai @ 2021-08-12 9:47 UTC (permalink / raw)
To: Rob Herring, Heiko Stuebner
Cc: Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
Dumo is another variant of Scarlet, also known as the ASUS Chromebook
Tablet CT100. This is almost the same as Scarlet-Innolux, but uses a
board-specific calibration variant for the WiFi module.
Add a new device tree for it.
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../dts/rockchip/rk3399-gru-scarlet-dumo.dts | 41 +++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 12a8b6cacdbd..479906f3ad7b 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -25,6 +25,7 @@ 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-dumo.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts
new file mode 100644
index 000000000000..853e88455e75
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Gru-Scarlet Rev5+ (SKU-0) board device tree source
+ *
+ * Copyright 2021 Google LLC.
+ */
+
+/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";
+ avdd-supply = <&ppvarp_lcd>;
+ avee-supply = <&ppvarn_lcd>;
+};
+
+&pci_rootport {
+ wifi@0,0 {
+ compatible = "qcom,ath10k";
+ reg = <0x00010000 0x0 0x00000000 0x0 0x00000000>,
+ <0x03010010 0x0 0x00000000 0x0 0x00200000>;
+ qcom,ath10k-calibration-variant = "GO_DUMO";
+ };
+};
--
2.32.0.605.g8dce9f2422-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] arm64: dts: rockchip: Add Scarlet Dumo Variant
2021-08-12 9:47 [PATCH 0/2] arm64: dts: rockchip: Add Scarlet Dumo Variant Chen-Yu Tsai
2021-08-12 9:47 ` [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet-dumo board Chen-Yu Tsai
2021-08-12 9:47 ` [PATCH 2/2] arm64: dts: rockchip: rk3399: " Chen-Yu Tsai
@ 2021-08-13 8:51 ` Heiko Stuebner
2 siblings, 0 replies; 4+ messages in thread
From: Heiko Stuebner @ 2021-08-13 8:51 UTC (permalink / raw)
To: Rob Herring, Chen-Yu Tsai
Cc: Heiko Stuebner, linux-kernel, devicetree, linux-rockchip,
linux-arm-kernel
On Thu, 12 Aug 2021 17:47:51 +0800, Chen-Yu Tsai wrote:
> A variant of the Chrome OS Gru-Scarlet device is missing in upstream.
> This variant, dumo, is the same as the Innolux display panel variant,
> but requires a specific calibration variant for its WiFi module.
>
> I'm not sure if it's better to inherit from gru-scarlet-innolux. I kept
> them separate from now, like in downstream ChromeOS kernel v4.4.
>
> [...]
Applied, thanks!
[1/2] dt-bindings: arm: rockchip: Add gru-scarlet-dumo board
commit: 1aec043e2bcfc28a7b3946c852c89c008cfceb30
[2/2] arm64: dts: rockchip: rk3399: Add gru-scarlet-dumo board
commit: ae328485ba0d5e2e0ff058438afbd8371badbc19
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread