[PATCH] ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard

[PATCH] ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard

[Gregory CLEMENT]

Wildcards in compatible strings should be avoid. "marvell,armada38x"
was recently introduced but was not yet used.

The armada 385 SoC is a superset of the armada 380 SoC (with more CPUs
and more PCIe slots). So this patch replaces the use of
"marvell,armada38x" by the "marvell,armada380" string.

Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
Hi,

This fix should be merged in 3.16 and maybe sent as a fix for 3.15
too.

The initial patch (ARM: mvebu: Fix missing binding documentation for
Armada 38x) was re-written after the review about the use of the
wildcards here:
http://thread.gmane.org/gmane.linux.kernel/1728755/focus=79339 and
there:
http://thread.gmane.org/gmane.linux.ports.arm.kernel/334225/focus=334311


Thanks,
Gregory

 Documentation/devicetree/bindings/arm/armada-38x.txt | 14 ++++++++++++--
 arch/arm/boot/dts/armada-380.dtsi                    |  2 +-
 arch/arm/boot/dts/armada-385-db.dts                  |  2 +-
 arch/arm/boot/dts/armada-385-rd.dts                  |  2 +-
 arch/arm/boot/dts/armada-385.dtsi                    |  2 +-
 arch/arm/boot/dts/armada-38x.dtsi                    |  2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/armada-38x.txt b/Documentation/devicetree/bindings/arm/armada-38x.txt
index 11f2330a6554..ad9f8ed4d9bd 100644
--- a/Documentation/devicetree/bindings/arm/armada-38x.txt
+++ b/Documentation/devicetree/bindings/arm/armada-38x.txt
@@ -6,5 +6,15 @@ following property:
 
 Required root node property:
 
- - compatible: must contain either "marvell,armada380" or
-   "marvell,armada385" depending on the variant of the SoC being used.
+ - compatible: must contain "marvell,armada380"
+
+In addition, boards using the Marvell Armada 385 SoC shall have the
+following property before the previous one:
+
+Required root node property:
+
+compatible: must contain "marvell,armada385"
+
+Example:
+
+compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi
index e69bc6759c39..4173a8ab34e7 100644
--- a/arch/arm/boot/dts/armada-380.dtsi
+++ b/arch/arm/boot/dts/armada-380.dtsi
@@ -16,7 +16,7 @@
 
 / {
 	model = "Marvell Armada 380 family SoC";
-	compatible = "marvell,armada380", "marvell,armada38x";
+	compatible = "marvell,armada380";
 
 	cpus {
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
index ff9637dd8d0f..4be6a2838a41 100644
--- a/arch/arm/boot/dts/armada-385-db.dts
+++ b/arch/arm/boot/dts/armada-385-db.dts
@@ -16,7 +16,7 @@
 
 / {
 	model = "Marvell Armada 385 Development Board";
-	compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x";
+	compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380";
 
 	chosen {
 		bootargs = "console=ttyS0,115200 earlyprintk";
diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
index 40893255a3f0..aaca2861dc87 100644
--- a/arch/arm/boot/dts/armada-385-rd.dts
+++ b/arch/arm/boot/dts/armada-385-rd.dts
@@ -17,7 +17,7 @@
 
 / {
 	model = "Marvell Armada 385 Reference Design";
-	compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x";
+	compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
 
 	chosen {
 		bootargs = "console=ttyS0,115200 earlyprintk";
diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
index f011009bf4cf..6283d7912f71 100644
--- a/arch/arm/boot/dts/armada-385.dtsi
+++ b/arch/arm/boot/dts/armada-385.dtsi
@@ -16,7 +16,7 @@
 
 / {
 	model = "Marvell Armada 385 family SoC";
-	compatible = "marvell,armada385", "marvell,armada38x";
+	compatible = "marvell,armada385", "marvell,armada380";
 
 	cpus {
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 3de364e81b52..689fa1a46728 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -20,7 +20,7 @@
 
 / {
 	model = "Marvell Armada 38x family SoC";
-	compatible = "marvell,armada38x";
+	compatible = "marvell,armada380";
 
 	aliases {
 		gpio0 = &gpio0;
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard

[Andrew Lunn]

On Mon, Jun 23, 2014 at 04:16:51PM +0200, Gregory CLEMENT wrote:
> Wildcards in compatible strings should be avoid. "marvell,armada38x"
> was recently introduced but was not yet used.
> 
> The armada 385 SoC is a superset of the armada 380 SoC (with more CPUs
> and more PCIe slots). So this patch replaces the use of
> "marvell,armada38x" by the "marvell,armada380" string.
> 
> Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>

Acked-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>

> ---
> Hi,
> 
> This fix should be merged in 3.16 and maybe sent as a fix for 3.15
> too.
> 
> The initial patch (ARM: mvebu: Fix missing binding documentation for
> Armada 38x) was re-written after the review about the use of the
> wildcards here:
> http://thread.gmane.org/gmane.linux.kernel/1728755/focus=79339 and
> there:
> http://thread.gmane.org/gmane.linux.ports.arm.kernel/334225/focus=334311
> 
> 
> Thanks,
> Gregory
> 
>  Documentation/devicetree/bindings/arm/armada-38x.txt | 14 ++++++++++++--
>  arch/arm/boot/dts/armada-380.dtsi                    |  2 +-
>  arch/arm/boot/dts/armada-385-db.dts                  |  2 +-
>  arch/arm/boot/dts/armada-385-rd.dts                  |  2 +-
>  arch/arm/boot/dts/armada-385.dtsi                    |  2 +-
>  arch/arm/boot/dts/armada-38x.dtsi                    |  2 +-
>  6 files changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/armada-38x.txt b/Documentation/devicetree/bindings/arm/armada-38x.txt
> index 11f2330a6554..ad9f8ed4d9bd 100644
> --- a/Documentation/devicetree/bindings/arm/armada-38x.txt
> +++ b/Documentation/devicetree/bindings/arm/armada-38x.txt
> @@ -6,5 +6,15 @@ following property:
>  
>  Required root node property:
>  
> - - compatible: must contain either "marvell,armada380" or
> -   "marvell,armada385" depending on the variant of the SoC being used.
> + - compatible: must contain "marvell,armada380"
> +
> +In addition, boards using the Marvell Armada 385 SoC shall have the
> +following property before the previous one:
> +
> +Required root node property:
> +
> +compatible: must contain "marvell,armada385"
> +
> +Example:
> +
> +compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
> diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi
> index e69bc6759c39..4173a8ab34e7 100644
> --- a/arch/arm/boot/dts/armada-380.dtsi
> +++ b/arch/arm/boot/dts/armada-380.dtsi
> @@ -16,7 +16,7 @@
>  
>  / {
>  	model = "Marvell Armada 380 family SoC";
> -	compatible = "marvell,armada380", "marvell,armada38x";
> +	compatible = "marvell,armada380";
>  
>  	cpus {
>  		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
> index ff9637dd8d0f..4be6a2838a41 100644
> --- a/arch/arm/boot/dts/armada-385-db.dts
> +++ b/arch/arm/boot/dts/armada-385-db.dts
> @@ -16,7 +16,7 @@
>  
>  / {
>  	model = "Marvell Armada 385 Development Board";
> -	compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x";
> +	compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380";
>  
>  	chosen {
>  		bootargs = "console=ttyS0,115200 earlyprintk";
> diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
> index 40893255a3f0..aaca2861dc87 100644
> --- a/arch/arm/boot/dts/armada-385-rd.dts
> +++ b/arch/arm/boot/dts/armada-385-rd.dts
> @@ -17,7 +17,7 @@
>  
>  / {
>  	model = "Marvell Armada 385 Reference Design";
> -	compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x";
> +	compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
>  
>  	chosen {
>  		bootargs = "console=ttyS0,115200 earlyprintk";
> diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
> index f011009bf4cf..6283d7912f71 100644
> --- a/arch/arm/boot/dts/armada-385.dtsi
> +++ b/arch/arm/boot/dts/armada-385.dtsi
> @@ -16,7 +16,7 @@
>  
>  / {
>  	model = "Marvell Armada 385 family SoC";
> -	compatible = "marvell,armada385", "marvell,armada38x";
> +	compatible = "marvell,armada385", "marvell,armada380";
>  
>  	cpus {
>  		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
> index 3de364e81b52..689fa1a46728 100644
> --- a/arch/arm/boot/dts/armada-38x.dtsi
> +++ b/arch/arm/boot/dts/armada-38x.dtsi
> @@ -20,7 +20,7 @@
>  
>  / {
>  	model = "Marvell Armada 38x family SoC";
> -	compatible = "marvell,armada38x";
> +	compatible = "marvell,armada380";
>  
>  	aliases {
>  		gpio0 = &gpio0;
> -- 
> 1.8.1.2
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard

[Jason Cooper]

On Mon, Jun 23, 2014 at 04:16:51PM +0200, Gregory CLEMENT wrote:
> Wildcards in compatible strings should be avoid. "marvell,armada38x"
> was recently introduced but was not yet used.
> 
> The armada 385 SoC is a superset of the armada 380 SoC (with more CPUs
> and more PCIe slots). So this patch replaces the use of
> "marvell,armada38x" by the "marvell,armada380" string.
> 
> Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> ---
> Hi,
> 
> This fix should be merged in 3.16 and maybe sent as a fix for 3.15
> too.
> 
> The initial patch (ARM: mvebu: Fix missing binding documentation for
> Armada 38x) was re-written after the review about the use of the
> wildcards here:
> http://thread.gmane.org/gmane.linux.kernel/1728755/focus=79339 and
> there:
> http://thread.gmane.org/gmane.linux.ports.arm.kernel/334225/focus=334311
> 
> 
> Thanks,
> Gregory
> 
>  Documentation/devicetree/bindings/arm/armada-38x.txt | 14 ++++++++++++--
>  arch/arm/boot/dts/armada-380.dtsi                    |  2 +-
>  arch/arm/boot/dts/armada-385-db.dts                  |  2 +-
>  arch/arm/boot/dts/armada-385-rd.dts                  |  2 +-
>  arch/arm/boot/dts/armada-385.dtsi                    |  2 +-
>  arch/arm/boot/dts/armada-38x.dtsi                    |  2 +-
>  6 files changed, 17 insertions(+), 7 deletions(-)

Applied to mvebu/dt with Andrew's Ack.

thx,

Jason.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard

[Gregory CLEMENT]

Hi Jason,

>> This fix should be merged in 3.16 and maybe sent as a fix for 3.15
>> too.

[...]

> Applied to mvebu/dt with Andrew's Ack.

I think it should go mvebu/fixes as this patch modifies the binding,
sooner is better.


Thanks,

Gregory



-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard

[Jason Cooper]

On Tue, Jun 24, 2014 at 09:55:27AM +0200, Gregory CLEMENT wrote:
> Hi Jason,
> 
> >> This fix should be merged in 3.16 and maybe sent as a fix for 3.15
> >> too.
> 
> [...]
> 
> > Applied to mvebu/dt with Andrew's Ack.
> 
> I think it should go mvebu/fixes as this patch modifies the binding,
> sooner is better.

oops.  Yeah, I f'd that up.  Sorry.  Fixed now.  I've Cc'd stable for
v3.15+

thx,

Jason.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html