diff mbox

ARM: dts: s3c: Fix DTC unit name warnings in S3C2416 and S3C6410

Message ID 1459494710-16269-1-git-send-email-k.kozlowski@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Krzysztof Kozlowski April 1, 2016, 7:11 a.m. UTC
Fix following DTC warnings in S3C2416 and S3C6410 boards:

Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 arch/arm/boot/dts/s3c2416-smdk2416.dts | 2 +-
 arch/arm/boot/dts/s3c6410-mini6410.dts | 2 +-
 arch/arm/boot/dts/s3c6410-smdk6410.dts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Joachim Eastwood April 1, 2016, 2:22 p.m. UTC | #1
On 1 April 2016 at 09:11, Krzysztof Kozlowski <k.kozlowski@samsung.com> wrote:
> Fix following DTC warnings in S3C2416 and S3C6410 boards:
>
> Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  arch/arm/boot/dts/s3c2416-smdk2416.dts | 2 +-
>  arch/arm/boot/dts/s3c6410-mini6410.dts | 2 +-
>  arch/arm/boot/dts/s3c6410-smdk6410.dts | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/s3c2416-smdk2416.dts b/arch/arm/boot/dts/s3c2416-smdk2416.dts
> index f257926c13b7..15f3d1c1bb80 100644
> --- a/arch/arm/boot/dts/s3c2416-smdk2416.dts
> +++ b/arch/arm/boot/dts/s3c2416-smdk2416.dts
> @@ -15,7 +15,7 @@
>         model = "SMDK2416";
>         compatible = "samsung,s3c2416";
>
> -       memory {
> +       memory@30000000 {
>                 reg =  <0x30000000 0x4000000>;
>         };

This change will cause duplicated memory node entries in the DT as
noted by Vladimir Zapolskiy [1]. Same goes for all the other patch
where you make this change.

$ scripts/dtc/dtc -I dtb -O dts arch/arm/boot/dts/s3c2416-smdk2416.dtb
| grep -A2 memory
        memory {
                device_type = "memory";
                reg = <0x0 0x0>;
        };
--
        memory@30000000 {
                reg = <0x30000000 0x4000000>;
        };


regards,
Joachim Eastwood

[1] http://marc.info/?l=linux-arm-kernel&m=145933287125938&w=2
Krzysztof Kozlowski April 3, 2016, 3:53 a.m. UTC | #2
On Fri, Apr 01, 2016 at 04:22:59PM +0200, Joachim Eastwood wrote:
> On 1 April 2016 at 09:11, Krzysztof Kozlowski <k.kozlowski@samsung.com> wrote:
> > Fix following DTC warnings in S3C2416 and S3C6410 boards:
> >
> > Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name
> >
> > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> > ---
> >  arch/arm/boot/dts/s3c2416-smdk2416.dts | 2 +-
> >  arch/arm/boot/dts/s3c6410-mini6410.dts | 2 +-
> >  arch/arm/boot/dts/s3c6410-smdk6410.dts | 2 +-
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/s3c2416-smdk2416.dts b/arch/arm/boot/dts/s3c2416-smdk2416.dts
> > index f257926c13b7..15f3d1c1bb80 100644
> > --- a/arch/arm/boot/dts/s3c2416-smdk2416.dts
> > +++ b/arch/arm/boot/dts/s3c2416-smdk2416.dts
> > @@ -15,7 +15,7 @@
> >         model = "SMDK2416";
> >         compatible = "samsung,s3c2416";
> >
> > -       memory {
> > +       memory@30000000 {
> >                 reg =  <0x30000000 0x4000000>;
> >         };
> 
> This change will cause duplicated memory node entries in the DT as
> noted by Vladimir Zapolskiy [1]. Same goes for all the other patch
> where you make this change.
> 
> $ scripts/dtc/dtc -I dtb -O dts arch/arm/boot/dts/s3c2416-smdk2416.dtb
> | grep -A2 memory
>         memory {
>                 device_type = "memory";
>                 reg = <0x0 0x0>;
>         };
> --
>         memory@30000000 {
>                 reg = <0x30000000 0x4000000>;
>         };

Yeah, I also spotted this later after running scripts/dtx_diff. I will
leave the memory node untouched.

Thanks for feedback!
Krzysztof
diff mbox

Patch

diff --git a/arch/arm/boot/dts/s3c2416-smdk2416.dts b/arch/arm/boot/dts/s3c2416-smdk2416.dts
index f257926c13b7..15f3d1c1bb80 100644
--- a/arch/arm/boot/dts/s3c2416-smdk2416.dts
+++ b/arch/arm/boot/dts/s3c2416-smdk2416.dts
@@ -15,7 +15,7 @@ 
 	model = "SMDK2416";
 	compatible = "samsung,s3c2416";
 
-	memory {
+	memory@30000000 {
 		reg =  <0x30000000 0x4000000>;
 	};
 
diff --git a/arch/arm/boot/dts/s3c6410-mini6410.dts b/arch/arm/boot/dts/s3c6410-mini6410.dts
index a25debb50401..b7d84cf816c2 100644
--- a/arch/arm/boot/dts/s3c6410-mini6410.dts
+++ b/arch/arm/boot/dts/s3c6410-mini6410.dts
@@ -22,7 +22,7 @@ 
 	model = "FriendlyARM Mini6410 board based on S3C6410";
 	compatible = "friendlyarm,mini6410", "samsung,s3c6410";
 
-	memory {
+	memory@50000000 {
 		reg = <0x50000000 0x10000000>;
 	};
 
diff --git a/arch/arm/boot/dts/s3c6410-smdk6410.dts b/arch/arm/boot/dts/s3c6410-smdk6410.dts
index ecf35ec466f7..dbebd58a4764 100644
--- a/arch/arm/boot/dts/s3c6410-smdk6410.dts
+++ b/arch/arm/boot/dts/s3c6410-smdk6410.dts
@@ -22,7 +22,7 @@ 
 	model = "SAMSUNG SMDK6410 board based on S3C6410";
 	compatible = "samsung,mini6410", "samsung,s3c6410";
 
-	memory {
+	memory@50000000 {
 		reg = <0x50000000 0x8000000>;
 	};