Skip to contentSkip to conversation

arm(64): dts: meson: adjust order of some compatibles

PATCH In review Heiner Kallweit 2 participants 3 messages Feb 1, 2023

Subsystems (2)
Device tree bindings Arm/Amlogic Meson SoC support
lore
Share & tools
lore

Heiner Kallweit

author
#0 lore raw

PATCH 1/1 arm(64): dts: meson: adjust order of some compatibles

During review of a new yaml binding, affecting these dts, it turned out that some compatibles aren't ordered as they should be. Order should be most specific to least specific.

Suggested-by Rob Herring <[email protected]>
Signed-off-by Heiner Kallweit <[email protected]>
---
 arch/arm/boot/dts/meson8b.dtsi              | 4 ++--
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 ++--
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/meson8b.dtsi +2 -2
index d5a3fe21e..5979209fe 100644
@@ -580,8 +580,8 @@ &ethmac {
 };
 
 &gpio_intc {
-	compatible = "amlogic,meson-gpio-intc",
-		     "amlogic,meson8b-gpio-intc";
+	compatible = "amlogic,meson8b-gpio-intc",
+		     "amlogic,meson-gpio-intc";
 	status = "okay";
 };
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +2 -2
index 923d2d8bb..12ef6e81c 100644
@@ -300,8 +300,8 @@ &ethmac {
 };
 
 &gpio_intc {
-	compatible = "amlogic,meson-gpio-intc",
-		     "amlogic,meson-gxbb-gpio-intc";
+	compatible = "amlogic,meson-gxbb-gpio-intc",
+		     "amlogic,meson-gpio-intc";
 	status = "okay";
 };
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +2 -2
index 04e9d0f1b..af912f698 100644
@@ -312,8 +312,8 @@ &clkc_AO {
 };
 
 &gpio_intc {
-	compatible = "amlogic,meson-gpio-intc",
-		     "amlogic,meson-gxl-gpio-intc";
+	compatible = "amlogic,meson-gxl-gpio-intc",
+		     "amlogic,meson-gpio-intc";
 	status = "okay";
 };
Signature · 7 lines
2.39.1


_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
maintainer
#1 lore raw

Hi Heiner,

Quoted 47 lines · Heiner Kallweit

During review of a new yaml binding, affecting these dts, it turned out that some compatibles aren't ordered as they should be. Order should be most specific to least specific.

Suggested-by Rob Herring <[email protected]>
Signed-off-by Heiner Kallweit <[email protected]>
---
  arch/arm/boot/dts/meson8b.dtsi              | 4 ++--
  arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 ++--
  arch/arm64/boot/dts/amlogic/meson-gxl.dtsi  | 4 ++--
  3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/meson8b.dtsi +2 -2
index d5a3fe21e..5979209fe 100644
@@ -580,8 +580,8 @@ &ethmac {
  };
 
  &gpio_intc {
-	compatible = "amlogic,meson-gpio-intc",
-		     "amlogic,meson8b-gpio-intc";
+	compatible = "amlogic,meson8b-gpio-intc",
+		     "amlogic,meson-gpio-intc";
  	status = "okay";
  };
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +2 -2
index 923d2d8bb..12ef6e81c 100644
@@ -300,8 +300,8 @@ &ethmac {
  };
 
  &gpio_intc {
-	compatible = "amlogic,meson-gpio-intc",
-		     "amlogic,meson-gxbb-gpio-intc";
+	compatible = "amlogic,meson-gxbb-gpio-intc",
+		     "amlogic,meson-gpio-intc";
  	status = "okay";
  };
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +0 -0
index 04e9d0f1b..af912f698 100644

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi &clkc_AO { · line 319

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +2 -2
@@ -312,8 +312,8 @@ &clkc_AO {
  };
 
  &gpio_intc {
-	compatible = "amlogic,meson-gpio-intc",
-		     "amlogic,meson-gxl-gpio-intc";
+	compatible = "amlogic,meson-gxl-gpio-intc",
+		     "amlogic,meson-gpio-intc";
  	status = "okay";
  };

Please send a new clean patchset with the associated bindings changes then this patch, and split ARM and arm64 in 2 patches.

Neil

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

author
#2 lore raw
Quoted 50 lines · Neil Armstrong

Hi Heiner,

Quoted 47 lines · Heiner Kallweit

During review of a new yaml binding, affecting these dts, it turned out that some compatibles aren't ordered as they should be. Order should be most specific to least specific.

Suggested-by Rob Herring <[email protected]>
Signed-off-by Heiner Kallweit <[email protected]>

---
  arch/arm/boot/dts/meson8b.dtsi              | 4 ++-- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi  | 4 ++--

  3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/meson8b.dtsi +2 -2
index d5a3fe21e..5979209fe 100644
@@ -580,8 +580,8 @@ &ethmac {
   };
     &gpio_intc {
-    compatible = "amlogic,meson-gpio-intc",
-             "amlogic,meson8b-gpio-intc";
+    compatible = "amlogic,meson8b-gpio-intc",
+             "amlogic,meson-gpio-intc";
       status = "okay";
   };

  diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 923d2d8bb..12ef6e81c 100644

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +2 -2
@@ -300,8 +300,8 @@ &ethmac {
   };
     &gpio_intc {
-    compatible = "amlogic,meson-gpio-intc",
-             "amlogic,meson-gxbb-gpio-intc";
+    compatible = "amlogic,meson-gxbb-gpio-intc",
+             "amlogic,meson-gpio-intc";
       status = "okay";
   };

  diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 04e9d0f1b..af912f698 100644

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +0 -2
@@ -312,8 +312,8 @@ &clkc_AO {
   };
     &gpio_intc {
-    compatible = "amlogic,meson-gpio-intc",
-             "amlogic,meson-gxl-gpio-intc";
Quoted 9 lines
Quoted 5 lines
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +2 -0
+    compatible = "amlogic,meson-gxl-gpio-intc",
+             "amlogic,meson-gpio-intc";
       status = "okay";
   };

Please send a new clean patchset with the associated bindings changes then this patch, and split ARM and arm64 in 2 patches.

Shouldn't this patch be first? Else make dtbs_check will complain.

Quoted 1 line

Neil