diff --git a/Documentation/devicetree/bindings/arm/google.yaml b/Documentation/devicetree/bindings/arm/google.yaml index 988cf3de02..1f5258ae2c 100644 --- a/Documentation/devicetree/bindings/arm/google.yaml +++ b/Documentation/devicetree/bindings/arm/google.yaml @@ -34,9 +34,10 @@ properties: const: '/' compatible: oneOf: - - description: Google Pixel 6 or 6 Pro (Oriole or Raven) + - description: Google Pixel 6, 6 Pro or 6a (Oriole, Raven or Bluejay) items: - enum: + - google,gs101-bluejay - google,gs101-oriole - google,gs101-raven - const: google,gs101 diff --git a/arch/arm64/boot/dts/exynos/google/Makefile b/arch/arm64/boot/dts/exynos/google/Makefile index 90969cf844..8e651de7d7 100644 --- a/arch/arm64/boot/dts/exynos/google/Makefile +++ b/arch/arm64/boot/dts/exynos/google/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_EXYNOS) += \ + gs101-bluejay.dtb \ gs101-oriole.dtb \ gs101-raven.dtb \ gs201-cheetah.dtb \ @@ -11,6 +12,7 @@ dtb-$(CONFIG_ARCH_EXYNOS) += \ zumapro-tegu.dtb # ABL applies board overlays, so keep symbols for labels +DTC_FLAGS_gs101-bluejay += -@ DTC_FLAGS_gs101-oriole += -@ DTC_FLAGS_gs101-raven += -@ DTC_FLAGS_gs201-cheetah += -@ diff --git a/arch/arm64/boot/dts/exynos/google/gs101-bluejay.dts b/arch/arm64/boot/dts/exynos/google/gs101-bluejay.dts new file mode 100644 index 0000000000..e74fb3b359 --- /dev/null +++ b/arch/arm64/boot/dts/exynos/google/gs101-bluejay.dts @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Bluejay Device Tree + * + * Copyright 2021-2023 Google LLC + * Copyright 2023 Linaro Ltd - + */ + +/dts-v1/; + +#include "gs101-pixel-common.dtsi" + +/ { + model = "Bluejay"; + compatible = "google,gs101-bluejay", "google,gs101"; + + /* + * ABL picks the base DTB by soc_id (product id 0x09845000 | major + * revision); the factory vendor_boot carries one per revision. B0 = 1. + */ + soc_id = <0x09845001 0x0>; + + chosen { + /* + * ABL appends its own arguments (console=null among them), so a + * panic is silent: panic=10 reboots instead of hanging. init hands + * over to the Arch root on userdata when it finds one. + */ + bootargs = "console=tty0 panic=10 clk_ignore_unused pd_ignore_unused rdinit=/init"; + }; +}; + +&cont_splash_mem { + reg = <0x0 0xfac00000 (1080 * 2400 * 4)>; + + status = "okay"; +}; + +&framebuffer0 { + width = <1080>; + height = <2400>; + stride = <(1080 * 4)>; + format = "a8r8g8b8"; + + status = "okay"; +};