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 <me@dylanvanassche.be>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20201230104205.5592-1-me@dylanvanassche.be

diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
index 42a4d01077f0a54d6966af10f2c10d780033e92b..7ea4d9645e9360a72e048fab95ba6888d9b72396 100644 (file)
--- 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 3d5a2ae9aa39014aaa995a155f607c2f65287667..fb65319a3bd3c50139d382983a80c79b7eb52a56 100644 (file)
--- 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 c9b9f6e9ee8c0dfc1ec232a20ca15dd2a068ea10..5e59d37521784430d663875313aed5374863d432 100644 (file)
--- 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 acc0ab53b9c1a4549af4761ce8db2d93e54bad2e..4e7e237cb46aa3dcc08e7e0f6d18b6b667b5ae21 100644 (file)
--- 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";