From 536f74a892e6a034e09a0d204dd2a3b3b02c5b30 Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Wed, 30 Dec 2020 11:42:05 +0100 Subject: [PATCH] arm64: allwinner: dts: pinephone: add 'pine64, pinephone' to the compatible list All revisions of the PinePhone share most of the hardware. This patch makes it easier to detect PinePhone hardware without having to check for each possible revision. Signed-off-by: Dylan Van Assche Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20201230104205.5592-1-me@dylanvanassche.be --- Documentation/devicetree/bindings/arm/sunxi.yaml | 3 +++ arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml index 42a4d01077f0a..7ea4d9645e936 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.yaml +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml @@ -683,16 +683,19 @@ properties: - description: Pine64 PinePhone Developer Batch (1.0) items: - const: pine64,pinephone-1.0 + - const: pine64,pinephone - const: allwinner,sun50i-a64 - description: Pine64 PinePhone Braveheart (1.1) items: - const: pine64,pinephone-1.1 + - const: pine64,pinephone - const: allwinner,sun50i-a64 - description: Pine64 PinePhone (1.2) items: - const: pine64,pinephone-1.2 + - const: pine64,pinephone - const: allwinner,sun50i-a64 - description: Pine64 PineTab, Development Sample diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts index 3d5a2ae9aa390..fb65319a3bd3c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts @@ -7,7 +7,7 @@ / { model = "Pine64 PinePhone Developer Batch (1.0)"; - compatible = "pine64,pinephone-1.0", "allwinner,sun50i-a64"; + compatible = "pine64,pinephone-1.0", "pine64,pinephone", "allwinner,sun50i-a64"; }; &sgm3140 { diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts index c9b9f6e9ee8c0..5e59d37521784 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts @@ -7,7 +7,7 @@ / { model = "Pine64 PinePhone Braveheart (1.1)"; - compatible = "pine64,pinephone-1.1", "allwinner,sun50i-a64"; + compatible = "pine64,pinephone-1.1", "pine64,pinephone", "allwinner,sun50i-a64"; }; &backlight { diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts index acc0ab53b9c1a..4e7e237cb46aa 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts @@ -7,7 +7,7 @@ / { model = "Pine64 PinePhone (1.2)"; - compatible = "pine64,pinephone-1.2", "allwinner,sun50i-a64"; + compatible = "pine64,pinephone-1.2", "pine64,pinephone", "allwinner,sun50i-a64"; wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; -- 2.39.5