Skip to contentSkip to conversation

ARM: dts: atlas7: fix spaces in compatible strings

PATCH In review Johan Hovold 1 participant 5 messages Feb 12, 2020 – Mar 12, 2020 Device tree bindings

lore
Share & tools
lore
#0 lore raw

cover ARM: dts: atlas7: fix spaces in compatible strings

I stumbled over a new driver in 5.6 whose compatible strings did not match the corresponding binding due to spaces in the driver compatible strings:

	https://lkml.kernel.org/r/[email protected]

A quick grep revealed that we a couple of devicetrees in mainline with similarly malformed compatible strings.

Note that there are no in-kernel drivers or bindings that use the strings question, so I think simply dropping the spaces would be acceptable. This is especially true for the flexnox nodes that also specify "simple-bus" so therefore I split the fixes in three patches.

Johan

Johan Hovold (3):
ARM: dts: atlas7: fix space in flexnoc compatible strings
ARM: dts: atlas7: fix space in gmac compatible string
ARM: dts: atlas7: fix space in g2d compatible string

 arch/arm/boot/dts/atlas7.dtsi | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/3 ARM: dts: atlas7: fix space in flexnoc compatible strings

Drop the space between manufacturer and model in the Arteris FlexNoC compatible string in the noc-bus nodes so that it matches the recommended format.

Note that there are no in-kernel drivers that use this compatible and it is not present in any binding.

Fixes 7d76d03b9be8 ("ARM: dts: add init dts file for CSR atlas7 SoC")
Cc Zhiwu Song <[email protected]>
Cc Hao Liu <[email protected]>
Cc Barry Song <[email protected]>
---
 arch/arm/boot/dts/atlas7.dtsi | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
arch/arm/boot/dts/atlas7.dtsi +13 -13
index 99c9d9d9267f..92b00e4740f6 100644
@@ -1164,7 +1164,7 @@ vi_vip1_high8bit {
 		};
 
 		pmipc {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x13240000 0x13240000 0x00010000>;
@@ -1175,7 +1175,7 @@ pmipc@0x13240000 {
 		};
 
 		dramfw {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x10830000 0x10830000 0x18000>;
@@ -1186,7 +1186,7 @@ dramfw@10820000 {
 		};
 
 		spramfw {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x10250000 0x10250000 0x3000>;
@@ -1197,7 +1197,7 @@ spramfw@10820000 {
 		};
 
 		cpum {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x10200000 0x10200000 0x3000>;
@@ -1208,7 +1208,7 @@ cpum@10200000 {
 		};
 
 		cgum {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x18641000 0x18641000 0x3000>,
@@ -1238,7 +1238,7 @@ pwm: pwm@18630000 {
 		};
 
 		gnssm {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x18000000 0x18000000 0x0000ffff>,
@@ -1365,7 +1365,7 @@ spi1: spi@18200000 {
 
 
 		gpum {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x13000000 0x13000000 0x3000>,
@@ -1407,7 +1407,7 @@ sdr@0x13010000 {
 		};
 
 		mediam {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x15000000 0x15000000 0x00600000>,
@@ -1549,7 +1549,7 @@ i2c0: i2c@17020000 {
 		};
 
 		vdifm {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x13290000 0x13290000 0x3000>,
@@ -1652,7 +1652,7 @@ sd7: sdhci@14700000 {
 		};
 
 		audiom {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x10d50000 0x10d50000 0x0000ffff>,
@@ -1767,7 +1767,7 @@ usp2: usp@10d40000 {
 		};
 
 		ddrm {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x10820000 0x10820000 0x3000>,
@@ -1786,7 +1786,7 @@ memory-controller@0x10800000 {
 		};
 
 		btm {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x11002000 0x11002000 0x0000ffff>,
@@ -1838,7 +1838,7 @@ btm@11010000 {
 		};
 
 		rtcm {
-			compatible = "arteris, flexnoc", "simple-bus";
+			compatible = "arteris,flexnoc", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x18810000 0x18810000 0x3000>,
Signature · 1 line
2.24.1
#2 lore raw

PATCH 2/3 ARM: dts: atlas7: fix space in gmac compatible string

In reply to Johan Hovold

Drop the space between manufacturer and model in the Synopsis compatible string in the gmac node so that it matches the recommended format.

Note that there are no in-kernel drivers that use this compatible and it is not present in any binding.

Fixes 153645b3e037 ("ARM: dts: atlas7: add lost gmac node")
Cc Barry Song <[email protected]>
---
 arch/arm/boot/dts/atlas7.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/atlas7.dtsi +1 -1
index 92b00e4740f6..f1e8c772a59e 100644
@@ -1333,7 +1333,7 @@ uart5: uart@18060000 {
 				status = "disabled";
 			};
 			gmac: eth@180b0000 {
-				compatible = "snps, dwc-eth-qos";
+				compatible = "snps,dwc-eth-qos";
 				reg = <0x180b0000 0x4000>;
 				interrupts = <0 59 0>, <0 70 0>;
 				interrupt-names = "macirq", "macpmt";
Signature · 1 line
2.24.1
#3 lore raw

PATCH 3/3 ARM: dts: atlas7: fix space in g2d compatible string

In reply to Johan Hovold

Drop the space between manufacturer and model in the SiRF compatible string in the g2d node so that it matches the recommended format.

Note that there are no in-kernel drivers that use this compatible and it is not present in any binding.

Fixes d9615f8bf5d9 ("ARM: dts: atlas7: add lost G2D node")
Cc Dongli Li <[email protected]>
Cc Barry Song <[email protected]>
---
 arch/arm/boot/dts/atlas7.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/atlas7.dtsi +1 -1
index f1e8c772a59e..c3104b85813b 100644
@@ -1930,7 +1930,7 @@ lvds@10e10000 {
 				resets = <&car 29>;
 			};
 			g2d@17010000 {
-				compatible = "sirf, atlas7-g2d";
+				compatible = "sirf,atlas7-g2d";
 				reg = <0x17010000 0x10000>;
 				interrupts = <0 61 0>;
 				clocks = <&car 104>;
Signature · 1 line
2.24.1
#4 lore raw
In reply to Johan Hovold
Quoted 6 lines · Johan Hovold

I stumbled over a new driver in 5.6 whose compatible strings did not match the corresponding binding due to spaces in the driver compatible strings:

	https://lkml.kernel.org/r/[email protected]
Quoted 7 lines

A quick grep revealed that we a couple of devicetrees in mainline with similarly malformed compatible strings.

Note that there are no in-kernel drivers or bindings that use the strings question, so I think simply dropping the spaces would be acceptable. This is especially true for the flexnox nodes that also specify "simple-bus" so therefore I split the fixes in three patches.

No reply from the CSR people after a month.

Rob, could you pick these up directly?

Johan

Quoted 7 lines

Johan Hovold (3):
ARM: dts: atlas7: fix space in flexnoc compatible strings
ARM: dts: atlas7: fix space in gmac compatible string
ARM: dts: atlas7: fix space in g2d compatible string

 arch/arm/boot/dts/atlas7.dtsi | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)