* [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants
@ 2022-08-17 19:33 Brian Norris
2022-08-17 19:33 ` [PATCH 2/2] arm64: dts: rockchip: Support " Brian Norris
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Brian Norris @ 2022-08-17 19:33 UTC (permalink / raw)
To: Heiko Stuebner, Krzysztof Kozlowski, Rob Herring
Cc: linux-arm-kernel, linux-rockchip, linux-kernel, Chen-Yu Tsai,
devicetree, Brian Norris
The Gru-Scarlet family includes a variety of SKU identifiers, using
parts of a 3-bit space {0..7}. SKU2 and SKU4 devices (under a few
different manufacturer names) also use the Innolux display.
For reference, the original vendor tree source:
CHROMIUM: arm64: dts: rockchip: add sku{0,2,4} compatibility
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f6ed665c9e2eb37fb2680debbb36ec9fb0e8fb97
CHROMIUM: arm64: dts: rockchip: scarlet: add SKU0 device tree
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/9987c8776f4b087d135d761e59f7fa6cc83fc7fc
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
.../devicetree/bindings/arm/rockchip.yaml | 27 ++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 7811ba64149c..dcae534e3971 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -363,30 +363,55 @@ properties:
- const: google,gru
- const: rockchip,rk3399
- - description: Google Scarlet - Innolux display (Acer Chromebook Tab 10)
+ - description: |
+ Google Scarlet - Innolux display (Acer Chromebook Tab 10 and more)
items:
+ - const: google,scarlet-rev15-sku2
+ - const: google,scarlet-rev15-sku4
- const: google,scarlet-rev15-sku6
- const: google,scarlet-rev15
+ - const: google,scarlet-rev14-sku2
+ - const: google,scarlet-rev14-sku4
- const: google,scarlet-rev14-sku6
- const: google,scarlet-rev14
+ - const: google,scarlet-rev13-sku2
+ - const: google,scarlet-rev13-sku4
- const: google,scarlet-rev13-sku6
- const: google,scarlet-rev13
+ - const: google,scarlet-rev12-sku2
+ - const: google,scarlet-rev12-sku4
- const: google,scarlet-rev12-sku6
- const: google,scarlet-rev12
+ - const: google,scarlet-rev11-sku2
+ - const: google,scarlet-rev11-sku4
- const: google,scarlet-rev11-sku6
- const: google,scarlet-rev11
+ - const: google,scarlet-rev10-sku2
+ - const: google,scarlet-rev10-sku4
- const: google,scarlet-rev10-sku6
- const: google,scarlet-rev10
+ - const: google,scarlet-rev9-sku2
+ - const: google,scarlet-rev9-sku4
- const: google,scarlet-rev9-sku6
- const: google,scarlet-rev9
+ - const: google,scarlet-rev8-sku2
+ - const: google,scarlet-rev8-sku4
- const: google,scarlet-rev8-sku6
- const: google,scarlet-rev8
+ - const: google,scarlet-rev7-sku2
+ - const: google,scarlet-rev7-sku4
- const: google,scarlet-rev7-sku6
- const: google,scarlet-rev7
+ - const: google,scarlet-rev6-sku2
+ - const: google,scarlet-rev6-sku4
- const: google,scarlet-rev6-sku6
- const: google,scarlet-rev6
+ - const: google,scarlet-rev5-sku2
+ - const: google,scarlet-rev5-sku4
- const: google,scarlet-rev5-sku6
- const: google,scarlet-rev5
+ - const: google,scarlet-rev4-sku2
+ - const: google,scarlet-rev4-sku4
- const: google,scarlet-rev4-sku6
- const: google,scarlet-rev4
- const: google,scarlet
--
2.37.1.595.g718a3a8f04-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm64: dts: rockchip: Support gru-scarlet sku{2,4} variants
2022-08-17 19:33 [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants Brian Norris
@ 2022-08-17 19:33 ` Brian Norris
2022-08-18 10:01 ` [PATCH 1/2] dt-bindings: arm: rockchip: Add " Krzysztof Kozlowski
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Brian Norris @ 2022-08-17 19:33 UTC (permalink / raw)
To: Heiko Stuebner, Krzysztof Kozlowski, Rob Herring
Cc: linux-arm-kernel, linux-rockchip, linux-kernel, Chen-Yu Tsai,
devicetree, Brian Norris
The Gru-Scarlet family includes a variety of SKU identifiers, using
parts of a 3-bit space {0..7}. SKU2 and SKU4 devices (under a few
different manufacturer names) also use the Innolux display.
Without this, a SKU2 device may non-deterministically (depending on the
matching order of DTBs and bootloader behavior) select either one of the
INX DTBs (rk3399-gru-scarlet-dumo.dtb or rk3399-gru-scarlet-inx.dtb) or
the KingDisplay DTB (rk3399-gru-scarlet-kd.dtb), to ill effect.
For reference, the original vendor tree source:
CHROMIUM: arm64: dts: rockchip: add sku{0,2,4} compatibility
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f6ed665c9e2eb37fb2680debbb36ec9fb0e8fb97
CHROMIUM: arm64: dts: rockchip: scarlet: add SKU0 device tree
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/9987c8776f4b087d135d761e59f7fa6cc83fc7fc
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
.../boot/dts/rockchip/rk3399-gru-scarlet-inx.dts | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts
index 2d721a974790..5d1879033e7c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts
@@ -11,17 +11,29 @@
/ {
model = "Google Scarlet";
- compatible = "google,scarlet-rev15-sku6", "google,scarlet-rev15",
+ compatible = "google,scarlet-rev15-sku2", "google,scarlet-rev15-sku4",
+ "google,scarlet-rev15-sku6", "google,scarlet-rev15",
+ "google,scarlet-rev14-sku2", "google,scarlet-rev14-sku4",
"google,scarlet-rev14-sku6", "google,scarlet-rev14",
+ "google,scarlet-rev13-sku2", "google,scarlet-rev13-sku4",
"google,scarlet-rev13-sku6", "google,scarlet-rev13",
+ "google,scarlet-rev12-sku2", "google,scarlet-rev12-sku4",
"google,scarlet-rev12-sku6", "google,scarlet-rev12",
+ "google,scarlet-rev11-sku2", "google,scarlet-rev11-sku4",
"google,scarlet-rev11-sku6", "google,scarlet-rev11",
+ "google,scarlet-rev10-sku2", "google,scarlet-rev10-sku4",
"google,scarlet-rev10-sku6", "google,scarlet-rev10",
+ "google,scarlet-rev9-sku2", "google,scarlet-rev9-sku4",
"google,scarlet-rev9-sku6", "google,scarlet-rev9",
+ "google,scarlet-rev8-sku2", "google,scarlet-rev8-sku4",
"google,scarlet-rev8-sku6", "google,scarlet-rev8",
+ "google,scarlet-rev7-sku2", "google,scarlet-rev7-sku4",
"google,scarlet-rev7-sku6", "google,scarlet-rev7",
+ "google,scarlet-rev6-sku2", "google,scarlet-rev6-sku4",
"google,scarlet-rev6-sku6", "google,scarlet-rev6",
+ "google,scarlet-rev5-sku2", "google,scarlet-rev5-sku4",
"google,scarlet-rev5-sku6", "google,scarlet-rev5",
+ "google,scarlet-rev4-sku2", "google,scarlet-rev4-sku4",
"google,scarlet-rev4-sku6", "google,scarlet-rev4",
"google,scarlet", "google,gru", "rockchip,rk3399";
};
--
2.37.1.595.g718a3a8f04-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants
2022-08-17 19:33 [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants Brian Norris
2022-08-17 19:33 ` [PATCH 2/2] arm64: dts: rockchip: Support " Brian Norris
@ 2022-08-18 10:01 ` Krzysztof Kozlowski
2022-08-22 18:57 ` Brian Norris
2022-09-14 22:44 ` Brian Norris
2022-09-15 13:49 ` Heiko Stuebner
3 siblings, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-08-18 10:01 UTC (permalink / raw)
To: Brian Norris, Heiko Stuebner, Krzysztof Kozlowski, Rob Herring
Cc: linux-arm-kernel, linux-rockchip, linux-kernel, Chen-Yu Tsai, devicetree
On 17/08/2022 22:33, Brian Norris wrote:
> The Gru-Scarlet family includes a variety of SKU identifiers, using
> parts of a 3-bit space {0..7}. SKU2 and SKU4 devices (under a few
> different manufacturer names) also use the Innolux display.
>
> For reference, the original vendor tree source:
>
> CHROMIUM: arm64: dts: rockchip: add sku{0,2,4} compatibility
> https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f6ed665c9e2eb37fb2680debbb36ec9fb0e8fb97
>
> CHROMIUM: arm64: dts: rockchip: scarlet: add SKU0 device tree
> https://chromium.googlesource.com/chromiumos/third_party/kernel/+/9987c8776f4b087d135d761e59f7fa6cc83fc7fc
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
>
> .../devicetree/bindings/arm/rockchip.yaml | 27 ++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index 7811ba64149c..dcae534e3971 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -363,30 +363,55 @@ properties:
> - const: google,gru
> - const: rockchip,rk3399
>
> - - description: Google Scarlet - Innolux display (Acer Chromebook Tab 10)
> + - description: |
> + Google Scarlet - Innolux display (Acer Chromebook Tab 10 and more)
> items:
> + - const: google,scarlet-rev15-sku2
> + - const: google,scarlet-rev15-sku4
This does not match the sources you linked in commit msg, so I am
confused what the links are supposed to prove.
Is this matching at least your DTS (dtbs_check passes)?
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants
2022-08-18 10:01 ` [PATCH 1/2] dt-bindings: arm: rockchip: Add " Krzysztof Kozlowski
@ 2022-08-22 18:57 ` Brian Norris
0 siblings, 0 replies; 6+ messages in thread
From: Brian Norris @ 2022-08-22 18:57 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Heiko Stuebner, Krzysztof Kozlowski, Rob Herring,
linux-arm-kernel, open list:ARM/Rockchip SoC...,
Linux Kernel, Chen-Yu Tsai, devicetree
Hi Krzysztof,
On Thu, Aug 18, 2022 at 3:02 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
> On 17/08/2022 22:33, Brian Norris wrote:
> > The Gru-Scarlet family includes a variety of SKU identifiers, using
> > parts of a 3-bit space {0..7}. SKU2 and SKU4 devices (under a few
> > different manufacturer names) also use the Innolux display.
> >
> > For reference, the original vendor tree source:
> >
> > CHROMIUM: arm64: dts: rockchip: add sku{0,2,4} compatibility
> > https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f6ed665c9e2eb37fb2680debbb36ec9fb0e8fb97
> >
> > CHROMIUM: arm64: dts: rockchip: scarlet: add SKU0 device tree
> > https://chromium.googlesource.com/chromiumos/third_party/kernel/+/9987c8776f4b087d135d761e59f7fa6cc83fc7fc
> >
> > Signed-off-by: Brian Norris <briannorris@chromium.org>
> > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> > + - const: google,scarlet-rev15-sku2
> > + - const: google,scarlet-rev15-sku4
>
> This does not match the sources you linked in commit msg, so I am
> confused what the links are supposed to prove.
It took 2 patches to get there (because SKU0 had some additional
customizations later, which were already upstreamed [0]), but the
result is the same. I'm not sure which part you think doesn't match.
One difference: they're listed in different order, because that seems
to be how the YAML schema is organized. But it doesn't make any
material difference, as long as the -skuX variants are listed before
the non-skuX variants (i.e., "more specific" goes first).
As to what they prove? Well, whoever applies is free to drop them if
they'd like, but I figured more documentation is better. IMO, it shows
that the real product uses those strings, and implies (but not quite
proves) the bootloader is looking for those. That is useful
information, if one expects to use an upstream kernel with the
production bootloader.
[0] https://git.kernel.org/linus/5707e34166f546bf1fcdfd3da600e8187d04d937
arm64: dts: rockchip: Add gru-scarlet-dumo board
> Is this matching at least your DTS (dtbs_check passes)?
Yes. (Well, after patch 2. I didn't try to make this bisectable.)
Brian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants
2022-08-17 19:33 [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants Brian Norris
2022-08-17 19:33 ` [PATCH 2/2] arm64: dts: rockchip: Support " Brian Norris
2022-08-18 10:01 ` [PATCH 1/2] dt-bindings: arm: rockchip: Add " Krzysztof Kozlowski
@ 2022-09-14 22:44 ` Brian Norris
2022-09-15 13:49 ` Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: Brian Norris @ 2022-09-14 22:44 UTC (permalink / raw)
To: Heiko Stuebner, Krzysztof Kozlowski, Rob Herring
Cc: linux-arm-kernel, linux-rockchip, linux-kernel, Chen-Yu Tsai, devicetree
On Wed, Aug 17, 2022 at 12:33:55PM -0700, Brian Norris wrote:
> The Gru-Scarlet family includes a variety of SKU identifiers, using
> parts of a 3-bit space {0..7}. SKU2 and SKU4 devices (under a few
> different manufacturer names) also use the Innolux display.
>
> For reference, the original vendor tree source:
>
> CHROMIUM: arm64: dts: rockchip: add sku{0,2,4} compatibility
> https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f6ed665c9e2eb37fb2680debbb36ec9fb0e8fb97
>
> CHROMIUM: arm64: dts: rockchip: scarlet: add SKU0 device tree
> https://chromium.googlesource.com/chromiumos/third_party/kernel/+/9987c8776f4b087d135d761e59f7fa6cc83fc7fc
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
Ping. What's happening with this? I got one non-actionable comment (that
I replied to), but I can't tell if this is just waiting on Heiko to pick
it up, or if it needs a DT reviewer.
Brian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants
2022-08-17 19:33 [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants Brian Norris
` (2 preceding siblings ...)
2022-09-14 22:44 ` Brian Norris
@ 2022-09-15 13:49 ` Heiko Stuebner
3 siblings, 0 replies; 6+ messages in thread
From: Heiko Stuebner @ 2022-09-15 13:49 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Brian Norris
Cc: Heiko Stuebner, linux-kernel, Chen-Yu Tsai, linux-rockchip,
linux-arm-kernel, devicetree
On Wed, 17 Aug 2022 12:33:55 -0700, Brian Norris wrote:
> The Gru-Scarlet family includes a variety of SKU identifiers, using
> parts of a 3-bit space {0..7}. SKU2 and SKU4 devices (under a few
> different manufacturer names) also use the Innolux display.
>
> For reference, the original vendor tree source:
>
> CHROMIUM: arm64: dts: rockchip: add sku{0,2,4} compatibility
> https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f6ed665c9e2eb37fb2680debbb36ec9fb0e8fb97
>
> [...]
I cornored Krzysztof at ELCE today and he had no objections, so
Applied, thanks!
[1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants
commit: b360cfbf86a918b835e673b9da5faf972a9bf146
[2/2] arm64: dts: rockchip: Support gru-scarlet sku{2,4} variants
commit: 578980728868fcd99bbb5af12e50b38d2e66f5aa
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-15 13:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-17 19:33 [PATCH 1/2] dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants Brian Norris
2022-08-17 19:33 ` [PATCH 2/2] arm64: dts: rockchip: Support " Brian Norris
2022-08-18 10:01 ` [PATCH 1/2] dt-bindings: arm: rockchip: Add " Krzysztof Kozlowski
2022-08-22 18:57 ` Brian Norris
2022-09-14 22:44 ` Brian Norris
2022-09-15 13:49 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).