Commit 57898072 authored by Brian Norris's avatar Brian Norris Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: Support gru-scarlet sku{2,4} variants 

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: default avatarBrian Norris <briannorris@chromium.org>
Link: https://lore.kernel.org/r/20220817123350.2.I5f4fd0808a927b08e267c189712fb4a85931fd3b@changeid


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent b360cfbf

arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts

+13 −1
Original line number Diff line number Diff line
@@ -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";

};