2020-02-27 16:49:24

by Tomasz Maciej Nowak

Subject: [PATCH 1/2] arm64: dts: marvell: espressobin: indicate dts version

The commit introducing ESPRESSObin variants didn't specify dts version,
and because of that they are treated by dtc as legacy ones. Fix that by
properly specifying version in each dts.

Fixes: 447b878935 ("arm64: dts: marvell: add ESPRESSObin variants")
Signed-off-by: Tomasz Maciej Nowak <[email protected]>
---
arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.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.dtsi | 2 --
4 files changed, 6 insertions(+), 2 deletions(-)

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 bd9ed9dc9c3e..ec72a11ed80f 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
@@ -11,6 +11,8 @@
* Schematic available at http://espressobin.net/wp-content/uploads/2017/08/ESPRESSObin_V5_Schematics.pdf
*/

+/dts-v1/;
+
#include "armada-3720-espressobin.dtsi"

/ {
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 6e876a6d9532..03733fd92732 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
@@ -11,6 +11,8 @@
* Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200
*/

+/dts-v1/;
+
#include "armada-3720-espressobin.dtsi"

/ {
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 0f8405d085fd..8570c5f47d7d 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
@@ -11,6 +11,8 @@
* Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200
*/

+/dts-v1/;
+
#include "armada-3720-espressobin.dtsi"

/ {
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
index 53b8ac55a7f3..c8e2e993c69c 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -7,8 +7,6 @@
*
*/

-/dts-v1/;
-
#include <dt-bindings/gpio/gpio.h>
#include "armada-372x.dtsi"

--
2.25.1

2020-03-13 20:36:04

by Gregory CLEMENT

Subject: Re: [PATCH 1/2] arm64: dts: marvell: espressobin: indicate dts version

Hi Tomasz,

> The commit introducing ESPRESSObin variants didn't specify dts version,
> and because of that they are treated by dtc as legacy ones. Fix that by
> properly specifying version in each dts.
>
> Fixes: 447b878935 ("arm64: dts: marvell: add ESPRESSObin variants")
> Signed-off-by: Tomasz Maciej Nowak <[email protected]>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
> arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.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.dtsi | 2 --
> 4 files changed, 6 insertions(+), 2 deletions(-)
>
> 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 bd9ed9dc9c3e..ec72a11ed80f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
> @@ -11,6 +11,8 @@
> * Schematic available at http://espressobin.net/wp-content/uploads/2017/08/ESPRESSObin_V5_Schematics.pdf
> */
>
> +/dts-v1/;
> +
> #include "armada-3720-espressobin.dtsi"
>
> / {
> 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 6e876a6d9532..03733fd92732 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
> @@ -11,6 +11,8 @@
> * Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200
> */
>
> +/dts-v1/;
> +
> #include "armada-3720-espressobin.dtsi"
>
> / {
> 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 0f8405d085fd..8570c5f47d7d 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
> @@ -11,6 +11,8 @@
> * Schematic available at http://wiki.espressobin.net/tiki-download_file.php?fileId=200
> */
>
> +/dts-v1/;
> +
> #include "armada-3720-espressobin.dtsi"
>
> / {
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> index 53b8ac55a7f3..c8e2e993c69c 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> @@ -7,8 +7,6 @@
> *
> */
>
> -/dts-v1/;
> -
> #include <dt-bindings/gpio/gpio.h>
> #include "armada-372x.dtsi"
>
> --
> 2.25.1
>

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