Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1522751 > unrolled thread

[PATCH 1/2] ARM: zynq: Remove skeleton.dtsi

Started byMichal Simek <michal.simek@xilinx.com>
First post2016-11-15 15:10 +0100
Last post2016-11-15 16:50 +0100
Articles 5 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/2] ARM: zynq: Remove skeleton.dtsi Michal Simek <michal.simek@xilinx.com> - 2016-11-15 15:10 +0100
    [PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings Michal Simek <michal.simek@xilinx.com> - 2016-11-15 15:10 +0100
      Re: [PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings Julia Cartwright <julia@ni.com> - 2016-11-15 16:50 +0100
        Re: [PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings Michal Simek <monstr@monstr.eu> - 2016-11-15 19:10 +0100
    Re: [PATCH 1/2] ARM: zynq: Remove skeleton.dtsi Julia Cartwright <julia@ni.com> - 2016-11-15 16:50 +0100

#1522751 — [PATCH 1/2] ARM: zynq: Remove skeleton.dtsi

FromMichal Simek <michal.simek@xilinx.com>
Date2016-11-15 15:10 +0100
Subject[PATCH 1/2] ARM: zynq: Remove skeleton.dtsi
Message-ID<sDMAW-5VL-35@gated-at.bofh.it>
Based on
"ARM: dts: explicitly mark skeleton.dtsi as deprecated"
(sha1: 9c0da3cc61f1233c2782e2d3d91e3d0707dd4ba5)
skeleton.dtsi is deprecated.
Move address and size-cells directly to zynq-7000.dtsi.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/boot/dts/zynq-7000.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index f283ff08381c..f47a6c1cc752 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -10,9 +10,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-/include/ "skeleton.dtsi"
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
 	compatible = "xlnx,zynq-7000";
 
 	cpus {
-- 
1.9.1

[toc] | [next] | [standalone]

#1522759 — [PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings

FromMichal Simek <michal.simek@xilinx.com>
Date2016-11-15 15:10 +0100
Subject[PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings
Message-ID<sDMAX-5VL-53@gated-at.bofh.it>
In reply to#1522751
The patch removes these warnings reported by dtc 1.4:
Warning (unit_address_vs_reg): Node /pmu has a reg or ranges property,
but no unit name
Warning (unit_address_vs_reg): Node /fixedregulator@0 has a unit name,
but no reg property
Warning (unit_address_vs_reg): Node /memory has a reg or ranges
property, but no unit name

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/boot/dts/zynq-7000.dtsi      | 4 ++--
 arch/arm/boot/dts/zynq-parallella.dts | 2 +-
 arch/arm/boot/dts/zynq-zc702.dts      | 2 +-
 arch/arm/boot/dts/zynq-zc706.dts      | 2 +-
 arch/arm/boot/dts/zynq-zed.dts        | 2 +-
 arch/arm/boot/dts/zynq-zybo.dts       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index f47a6c1cc752..402b5bbe3b5b 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -42,14 +42,14 @@
 		};
 	};
 
-	pmu {
+	pmu@f8891000 {
 		compatible = "arm,cortex-a9-pmu";
 		interrupts = <0 5 4>, <0 6 4>;
 		interrupt-parent = <&intc>;
 		reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >;
 	};
 
-	regulator_vccpint: fixedregulator@0 {
+	regulator_vccpint: fixedregulator {
 		compatible = "regulator-fixed";
 		regulator-name = "VCCPINT";
 		regulator-min-microvolt = <1000000>;
diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
index 307ed201d658..64a6390fc501 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -28,7 +28,7 @@
 		serial0 = &uart1;
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index e96959b2e67a..0cdad2cc8b78 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -24,7 +24,7 @@
 		serial0 = &uart1;
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index be6a986bbbd8..ad4bb06dba25 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -24,7 +24,7 @@
 		serial0 = &uart1;
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 7250c1eac7f9..325379f7983c 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -23,7 +23,7 @@
 		serial0 = &uart1;
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x20000000>;
 	};
diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts
index d9e0f3e70671..590ec24b8749 100644
--- a/arch/arm/boot/dts/zynq-zybo.dts
+++ b/arch/arm/boot/dts/zynq-zybo.dts
@@ -23,7 +23,7 @@
 		serial0 = &uart1;
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x20000000>;
 	};
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1522855 — Re: [PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings

FromJulia Cartwright <julia@ni.com>
Date2016-11-15 16:50 +0100
SubjectRe: [PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings
Message-ID<sDO9H-6Nu-5@gated-at.bofh.it>
In reply to#1522759
On Tue, Nov 15, 2016 at 03:07:27PM +0100, Michal Simek wrote:
> The patch removes these warnings reported by dtc 1.4:
> Warning (unit_address_vs_reg): Node /pmu has a reg or ranges property,
> but no unit name
> Warning (unit_address_vs_reg): Node /fixedregulator@0 has a unit name,
> but no reg property
> Warning (unit_address_vs_reg): Node /memory has a reg or ranges
> property, but no unit name
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Reviewed-by: Julia Cartwright <julia@ni.com>
>
> ---
> 
>  arch/arm/boot/dts/zynq-7000.dtsi      | 4 ++--
>  arch/arm/boot/dts/zynq-parallella.dts | 2 +-
>  arch/arm/boot/dts/zynq-zc702.dts      | 2 +-
>  arch/arm/boot/dts/zynq-zc706.dts      | 2 +-
>  arch/arm/boot/dts/zynq-zed.dts        | 2 +-
>  arch/arm/boot/dts/zynq-zybo.dts       | 2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
> index f47a6c1cc752..402b5bbe3b5b 100644
> --- a/arch/arm/boot/dts/zynq-7000.dtsi
> +++ b/arch/arm/boot/dts/zynq-7000.dtsi
> @@ -42,14 +42,14 @@
>  		};
>  	};
>  
> -	pmu {
> +	pmu@f8891000 {
>  		compatible = "arm,cortex-a9-pmu";
>  		interrupts = <0 5 4>, <0 6 4>;
>  		interrupt-parent = <&intc>;
>  		reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >;

Style nit: we should drop the space before/after '<' and '>'; and,
perhaps separate the entries to be a bit more readable:

   reg = <0xf8891000 0x1000>,
         <0xf8893000 0x1000>;

Thanks,

   Julia

[toc] | [prev] | [next] | [standalone]

#1522960 — Re: [PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings

FromMichal Simek <monstr@monstr.eu>
Date2016-11-15 19:10 +0100
SubjectRe: [PATCH 2/2] ARM: zynq: Fix W=1 dtc 1.4 warnings
Message-ID<sDQlb-8ps-9@gated-at.bofh.it>
In reply to#1522855

[Multipart message — attachments visible in raw view] — view raw

Hi,

On 15.11.2016 16:46, Julia Cartwright wrote:
> On Tue, Nov 15, 2016 at 03:07:27PM +0100, Michal Simek wrote:
>> The patch removes these warnings reported by dtc 1.4:
>> Warning (unit_address_vs_reg): Node /pmu has a reg or ranges property,
>> but no unit name
>> Warning (unit_address_vs_reg): Node /fixedregulator@0 has a unit name,
>> but no reg property
>> Warning (unit_address_vs_reg): Node /memory has a reg or ranges
>> property, but no unit name
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> 
> Reviewed-by: Julia Cartwright <julia@ni.com>
>>
>> ---
>>
>>  arch/arm/boot/dts/zynq-7000.dtsi      | 4 ++--
>>  arch/arm/boot/dts/zynq-parallella.dts | 2 +-
>>  arch/arm/boot/dts/zynq-zc702.dts      | 2 +-
>>  arch/arm/boot/dts/zynq-zc706.dts      | 2 +-
>>  arch/arm/boot/dts/zynq-zed.dts        | 2 +-
>>  arch/arm/boot/dts/zynq-zybo.dts       | 2 +-
>>  6 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
>> index f47a6c1cc752..402b5bbe3b5b 100644
>> --- a/arch/arm/boot/dts/zynq-7000.dtsi
>> +++ b/arch/arm/boot/dts/zynq-7000.dtsi
>> @@ -42,14 +42,14 @@
>>  		};
>>  	};
>>  
>> -	pmu {
>> +	pmu@f8891000 {
>>  		compatible = "arm,cortex-a9-pmu";
>>  		interrupts = <0 5 4>, <0 6 4>;
>>  		interrupt-parent = <&intc>;
>>  		reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >;
> 
> Style nit: we should drop the space before/after '<' and '>'; and,
> perhaps separate the entries to be a bit more readable:
> 
>    reg = <0xf8891000 0x1000>,
>          <0xf8893000 0x1000>;

yes we can do it. Do you want to send separate patch for it?

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs

[toc] | [prev] | [next] | [standalone]

#1522856

FromJulia Cartwright <julia@ni.com>
Date2016-11-15 16:50 +0100
Message-ID<sDO9H-6Nu-19@gated-at.bofh.it>
In reply to#1522751
On Tue, Nov 15, 2016 at 03:07:26PM +0100, Michal Simek wrote:
> Based on
> "ARM: dts: explicitly mark skeleton.dtsi as deprecated"
> (sha1: 9c0da3cc61f1233c2782e2d3d91e3d0707dd4ba5)
> skeleton.dtsi is deprecated.
> Move address and size-cells directly to zynq-7000.dtsi.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Reviewed-by: Julia Cartwright <julia@ni.com>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web