All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gregory CLEMENT <gregory.clement@bootlin.com>
To: "Pali Rohár" <pali@kernel.org>, "Andrew Lunn" <andrew@lunn.ch>,
	"Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards
Date: Wed, 01 Feb 2023 08:46:05 +0100	[thread overview]
Message-ID: <87h6w5bzgi.fsf@BL-laptop> (raw)
In-Reply-To: <20220713125644.3117-1-pali@kernel.org>

Pali Rohár <pali@kernel.org> writes:

> All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> family and do not have Armada 3710 processor. So none of them should have
> compatible string for Armada 3710 processor.
>
> Fix compatible string for all these boards by removing wrong processor
> string "marvell,armada3710" and adding family string "marvell,armada3700"
> as the last one. (Note that this is same way how are defined Armada 3710
> DTS files).
>
> Signed-off-by: Pali Rohár <pali@kernel.org>


Fixedd a marge conflict and applied on mvebu/dt64

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-3720-db.dts                  | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts    | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts   | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts      | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts         | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts          | 2 +-
>  arch/arm64/boot/dts/marvell/armada-372x.dtsi                    | 2 +-
>  8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> index bd4e61d5448e..0cfb38492021 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> @@ -18,7 +18,7 @@
>  
>  / {
>  	model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> -	compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> +	compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
>  
>  	chosen {
>  		stdout-path = "serial0:115200n8";
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> index 5c4d8f379704..6715a19c1483 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> @@ -18,7 +18,7 @@
>  / {
>  	model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
>  	compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> -		     "marvell,armada3720", "marvell,armada3710";
> +		     "marvell,armada3720", "marvell,armada3700";
>  };
>  
>  &sdhci0 {
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> index 070725b81be5..447760b69850 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> @@ -13,7 +13,7 @@
>  / {
>  	model = "Globalscale Marvell ESPRESSOBin Ultra Board";
>  	compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> -		     "marvell,armada3710";
> +		     "marvell,armada3700";
>  
>  	aliases {
>  		/* ethernet1 is WAN port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> index 75401eab4d42..2a8aa3901a9f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> @@ -19,7 +19,7 @@
>  	model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
>  	compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
>  		     "globalscale,espressobin", "marvell,armada3720",
> -		     "marvell,armada3710";
> +		     "marvell,armada3700";
>  
>  	aliases {
>  		/* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> index 48a7f50fb427..b03af87611a9 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> @@ -18,7 +18,7 @@
>  / {
>  	model = "Globalscale Marvell ESPRESSOBin Board V7";
>  	compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> -		     "marvell,armada3720", "marvell,armada3710";
> +		     "marvell,armada3720", "marvell,armada3700";
>  
>  	aliases {
>  		/* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> index 1542d836c090..c5a834b33b77 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> @@ -16,5 +16,5 @@
>  
>  / {
>  	model = "Globalscale Marvell ESPRESSOBin Board";
> -	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> +	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
>  };
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> index caf9c8529fca..5840ed129309 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -14,7 +14,7 @@
>  / {
>  	model = "CZ.NIC Turris Mox Board";
>  	compatible = "cznic,turris-mox", "marvell,armada3720",
> -		     "marvell,armada3710";
> +		     "marvell,armada3700";
>  
>  	aliases {
>  		spi0 = &spi0;
> diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> index 5ce55bdbb995..02ae1e153288 100644
> --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> @@ -13,7 +13,7 @@
>  
>  / {
>  	model = "Marvell Armada 3720 SoC";
> -	compatible = "marvell,armada3720", "marvell,armada3710";
> +	compatible = "marvell,armada3720", "marvell,armada3700";
>  
>  	cpus {
>  		cpu1: cpu@1 {
> -- 
> 2.20.1
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

WARNING: multiple messages have this Message-ID (diff)
From: Gregory CLEMENT <gregory.clement@bootlin.com>
To: "Pali Rohár" <pali@kernel.org>, "Andrew Lunn" <andrew@lunn.ch>,
	"Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards
Date: Wed, 01 Feb 2023 08:46:05 +0100	[thread overview]
Message-ID: <87h6w5bzgi.fsf@BL-laptop> (raw)
In-Reply-To: <20220713125644.3117-1-pali@kernel.org>

Pali Rohár <pali@kernel.org> writes:

> All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
> family and do not have Armada 3710 processor. So none of them should have
> compatible string for Armada 3710 processor.
>
> Fix compatible string for all these boards by removing wrong processor
> string "marvell,armada3710" and adding family string "marvell,armada3700"
> as the last one. (Note that this is same way how are defined Armada 3710
> DTS files).
>
> Signed-off-by: Pali Rohár <pali@kernel.org>


Fixedd a marge conflict and applied on mvebu/dt64

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-3720-db.dts                  | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts    | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts   | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts      | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts         | 2 +-
>  arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts          | 2 +-
>  arch/arm64/boot/dts/marvell/armada-372x.dtsi                    | 2 +-
>  8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> index bd4e61d5448e..0cfb38492021 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> @@ -18,7 +18,7 @@
>  
>  / {
>  	model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
> -	compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
> +	compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
>  
>  	chosen {
>  		stdout-path = "serial0:115200n8";
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> index 5c4d8f379704..6715a19c1483 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> @@ -18,7 +18,7 @@
>  / {
>  	model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
>  	compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
> -		     "marvell,armada3720", "marvell,armada3710";
> +		     "marvell,armada3720", "marvell,armada3700";
>  };
>  
>  &sdhci0 {
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> index 070725b81be5..447760b69850 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
> @@ -13,7 +13,7 @@
>  / {
>  	model = "Globalscale Marvell ESPRESSOBin Ultra Board";
>  	compatible = "globalscale,espressobin-ultra", "marvell,armada3720",
> -		     "marvell,armada3710";
> +		     "marvell,armada3700";
>  
>  	aliases {
>  		/* ethernet1 is WAN port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> index 75401eab4d42..2a8aa3901a9f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
> @@ -19,7 +19,7 @@
>  	model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
>  	compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
>  		     "globalscale,espressobin", "marvell,armada3720",
> -		     "marvell,armada3710";
> +		     "marvell,armada3700";
>  
>  	aliases {
>  		/* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> index 48a7f50fb427..b03af87611a9 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> @@ -18,7 +18,7 @@
>  / {
>  	model = "Globalscale Marvell ESPRESSOBin Board V7";
>  	compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
> -		     "marvell,armada3720", "marvell,armada3710";
> +		     "marvell,armada3720", "marvell,armada3700";
>  
>  	aliases {
>  		/* ethernet1 is wan port */
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> index 1542d836c090..c5a834b33b77 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
> @@ -16,5 +16,5 @@
>  
>  / {
>  	model = "Globalscale Marvell ESPRESSOBin Board";
> -	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
> +	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
>  };
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> index caf9c8529fca..5840ed129309 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -14,7 +14,7 @@
>  / {
>  	model = "CZ.NIC Turris Mox Board";
>  	compatible = "cznic,turris-mox", "marvell,armada3720",
> -		     "marvell,armada3710";
> +		     "marvell,armada3700";
>  
>  	aliases {
>  		spi0 = &spi0;
> diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> index 5ce55bdbb995..02ae1e153288 100644
> --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
> @@ -13,7 +13,7 @@
>  
>  / {
>  	model = "Marvell Armada 3720 SoC";
> -	compatible = "marvell,armada3720", "marvell,armada3710";
> +	compatible = "marvell,armada3720", "marvell,armada3700";
>  
>  	cpus {
>  		cpu1: cpu@1 {
> -- 
> 2.20.1
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2023-02-01  7:47 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-13 12:56 [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards Pali Rohár
2022-07-13 12:56 ` Pali Rohár
2022-07-13 19:42 ` Krzysztof Kozlowski
2022-07-13 19:42   ` Krzysztof Kozlowski
2022-07-13 20:03   ` Pali Rohár
2022-07-13 20:03     ` Pali Rohár
2022-07-14  6:56     ` Krzysztof Kozlowski
2022-07-14  6:56       ` Krzysztof Kozlowski
2022-07-14  9:36       ` Pali Rohár
2022-07-14  9:36         ` Pali Rohár
2022-08-08 20:24 ` Pali Rohár
2022-08-08 20:24   ` Pali Rohár
2022-08-08 20:33   ` Andrew Lunn
2022-08-08 20:33     ` Andrew Lunn
2022-08-08 20:39     ` Pali Rohár
2022-08-08 20:39       ` Pali Rohár
2022-09-02 22:31     ` Pali Rohár
2022-09-02 22:31       ` Pali Rohár
2022-09-19 23:19       ` Pali Rohár
2022-09-19 23:19         ` Pali Rohár
2022-09-30 23:38 ` Pali Rohár
2022-09-30 23:38   ` Pali Rohár
2022-10-09 12:06   ` Pali Rohár
2022-10-09 12:06     ` Pali Rohár
2022-11-01 22:44     ` Pali Rohár
2022-11-01 22:44       ` Pali Rohár
2022-11-28 18:21       ` Pali Rohár
2022-11-28 18:21         ` Pali Rohár
2022-12-16 18:21         ` Pali Rohár
2022-12-16 18:21           ` Pali Rohár
2023-01-22 11:28           ` Pali Rohár
2023-01-22 11:28             ` Pali Rohár
2023-02-01  7:46 ` Gregory CLEMENT [this message]
2023-02-01  7:46   ` Gregory CLEMENT

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87h6w5bzgi.fsf@BL-laptop \
    --to=gregory.clement@bootlin.com \
    --cc=andrew@lunn.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pali@kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=sebastian.hesselbarth@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.