* [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings
@ 2016-03-07 12:12 Sudeep Holla
2016-03-07 12:12 ` [PATCH 2/2] ARM: dts: vexpress: " Sudeep Holla
2016-03-17 21:44 ` [PATCH 1/2] arm64: dts: juno/vexpress: " Rob Herring
0 siblings, 2 replies; 7+ messages in thread
From: Sudeep Holla @ 2016-03-07 12:12 UTC (permalink / raw)
To: linux-arm-kernel
Commit fa38a82096a1 ("scripts/dtc: Update to upstream version
53bf130b1cdd") added warnings on node name unit-address presence/absence
mismatch in device trees.
This patch fixes those warning on all the juno/vexpress platforms where
unit-address is present in node name while the reg/ranges property is
not present.
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
arch/arm64/boot/dts/arm/foundation-v8.dtsi | 2 +-
arch/arm64/boot/dts/arm/juno-base.dtsi | 14 +++++-----
arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 30 +++++++++++-----------
arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 2 +-
arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 14 +++++-----
.../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 10 ++++----
6 files changed, 36 insertions(+), 36 deletions(-)
Hi Rob,
I am not sure if the intention of commit fa38a82096a1 is to fix even
existing warnings or not. I saw warning with today's -next branch.
Let me know.
Regards,
Sudeep
diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 9314f3943269..ba03c934a861 100644
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -89,7 +89,7 @@
<0 63 4>;
};
- smb {
+ smb at 0,08000000 {
compatible = "arm,vexpress,v2m-p1", "simple-bus";
arm,v2m-memory-map = "rs1";
#address-cells = <2>; /* SMB chipselect number and offset */
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 4b6172b0f2cb..3841e82fa6f8 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -105,13 +105,13 @@
clocks {
compatible = "arm,scpi-clocks";
- scpi_dvfs: scpi_clocks at 0 {
+ scpi_dvfs: scpi-clocks-0 {
compatible = "arm,scpi-dvfs-clocks";
#clock-cells = <1>;
clock-indices = <0>, <1>, <2>;
clock-output-names = "atlclk", "aplclk","gpuclk";
};
- scpi_clk: scpi_clocks at 3 {
+ scpi_clk: scpi-clocks-1 {
compatible = "arm,scpi-variable-clocks";
#clock-cells = <1>;
clock-indices = <3>;
@@ -154,7 +154,7 @@
clock-names = "pxlclk";
port {
- hdlcd1_output: endpoint at 0 {
+ hdlcd1_output: endpoint0 {
remote-endpoint = <&tda998x_1_input>;
};
};
@@ -168,7 +168,7 @@
clock-names = "pxlclk";
port {
- hdlcd0_output: endpoint at 0 {
+ hdlcd0_output: endpoint0 {
remote-endpoint = <&tda998x_0_input>;
};
};
@@ -196,7 +196,7 @@
compatible = "nxp,tda998x";
reg = <0x70>;
port {
- tda998x_0_input: endpoint at 0 {
+ tda998x_0_input: endpoint0 {
remote-endpoint = <&hdlcd0_output>;
};
};
@@ -206,7 +206,7 @@
compatible = "nxp,tda998x";
reg = <0x71>;
port {
- tda998x_1_input: endpoint at 0 {
+ tda998x_1_input: endpoint0 {
remote-endpoint = <&hdlcd1_output>;
};
};
@@ -243,7 +243,7 @@
<0x00000008 0x80000000 0x1 0x80000000>;
};
- smb {
+ smb at 0,08000000 {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 413f1b9ebcd4..3d4af126df6e 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -46,7 +46,7 @@
arm,vexpress,site = <0>;
arm,v2m-memory-map = "rs1";
- mb_fixed_3v3: fixedregulator at 0 {
+ mb_fixed_3v3: fixedregulator0 {
compatible = "regulator-fixed";
regulator-name = "MCC_SB_3V3";
regulator-min-microvolt = <3300000>;
@@ -59,42 +59,42 @@
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ button1 {
debounce_interval = <50>;
wakeup-source;
linux,code = <116>;
label = "POWER";
gpios = <&iofpga_gpio0 0 0x4>;
};
- button at 2 {
+ button2 {
debounce_interval = <50>;
wakeup-source;
linux,code = <102>;
label = "HOME";
gpios = <&iofpga_gpio0 1 0x4>;
};
- button at 3 {
+ button3 {
debounce_interval = <50>;
wakeup-source;
linux,code = <152>;
label = "RLOCK";
gpios = <&iofpga_gpio0 2 0x4>;
};
- button at 4 {
+ button4 {
debounce_interval = <50>;
wakeup-source;
linux,code = <115>;
label = "VOL+";
gpios = <&iofpga_gpio0 3 0x4>;
};
- button at 5 {
+ button5 {
debounce_interval = <50>;
wakeup-source;
linux,code = <114>;
label = "VOL-";
gpios = <&iofpga_gpio0 4 0x4>;
};
- button at 6 {
+ button6 {
debounce_interval = <50>;
wakeup-source;
linux,code = <99>;
@@ -159,7 +159,7 @@
compatible = "syscon", "simple-mfd";
reg = <0x010000 0x1000>;
- led at 08.0 {
+ led0 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x01>;
@@ -167,7 +167,7 @@
linux,default-trigger = "heartbeat";
default-state = "on";
};
- led at 08.1 {
+ led1 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x02>;
@@ -175,7 +175,7 @@
linux,default-trigger = "mmc0";
default-state = "off";
};
- led at 08.2 {
+ led2 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x04>;
@@ -183,7 +183,7 @@
linux,default-trigger = "cpu0";
default-state = "off";
};
- led at 08.3 {
+ led3 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x08>;
@@ -191,7 +191,7 @@
linux,default-trigger = "cpu1";
default-state = "off";
};
- led at 08.4 {
+ led4 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x10>;
@@ -199,7 +199,7 @@
linux,default-trigger = "cpu2";
default-state = "off";
};
- led at 08.5 {
+ led5 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x20>;
@@ -207,14 +207,14 @@
linux,default-trigger = "cpu3";
default-state = "off";
};
- led at 08.6 {
+ led6 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x40>;
label = "vexpress:6";
default-state = "off";
};
- led at 08.7 {
+ led7 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x80>;
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index 20addabbd127..0d0df795809c 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -104,7 +104,7 @@
<0 63 4>;
};
- smb {
+ smb at 0,08000000 {
compatible = "simple-bus";
#address-cells = <2>;
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 88a7583ed7a7..09d97e1a8948 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -226,7 +226,7 @@
};
};
- v2m_fixed_3v3: fixedregulator at 0 {
+ v2m_fixed_3v3: fixedregulator {
compatible = "regulator-fixed";
regulator-name = "3V3";
regulator-min-microvolt = <3300000>;
@@ -238,7 +238,7 @@
compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>;
- v2m_oscclk1: osc at 1 {
+ v2m_oscclk1: osc {
/* CLCD clock */
compatible = "arm,vexpress-osc";
arm,vexpress-sysreg,func = <1 1>;
@@ -247,27 +247,27 @@
clock-output-names = "v2m:oscclk1";
};
- reset at 0 {
+ reset {
compatible = "arm,vexpress-reset";
arm,vexpress-sysreg,func = <5 0>;
};
- muxfpga at 0 {
+ muxfpga {
compatible = "arm,vexpress-muxfpga";
arm,vexpress-sysreg,func = <7 0>;
};
- shutdown at 0 {
+ shutdown {
compatible = "arm,vexpress-shutdown";
arm,vexpress-sysreg,func = <8 0>;
};
- reboot at 0 {
+ reboot {
compatible = "arm,vexpress-reboot";
arm,vexpress-sysreg,func = <9 0>;
};
- dvimode at 0 {
+ dvimode {
compatible = "arm,vexpress-dvimode";
arm,vexpress-sysreg,func = <11 0>;
};
diff --git a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
index bb3c26d1154d..00024be0c9b0 100644
--- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
+++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
@@ -93,7 +93,7 @@
compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>;
- smbclk: osc at 4 {
+ smbclk: osc4 {
/* SMC clock */
compatible = "arm,vexpress-osc";
arm,vexpress-sysreg,func = <1 4>;
@@ -102,7 +102,7 @@
clock-output-names = "smclk";
};
- volt at 0 {
+ volt0 {
/* VIO to expansion board above */
compatible = "arm,vexpress-volt";
arm,vexpress-sysreg,func = <2 0>;
@@ -112,7 +112,7 @@
regulator-always-on;
};
- volt at 1 {
+ volt1 {
/* 12V from power connector J6 */
compatible = "arm,vexpress-volt";
arm,vexpress-sysreg,func = <2 1>;
@@ -120,7 +120,7 @@
regulator-always-on;
};
- temp at 0 {
+ temp0 {
/* FPGA temperature */
compatible = "arm,vexpress-temp";
arm,vexpress-sysreg,func = <4 0>;
@@ -128,7 +128,7 @@
};
};
- smb {
+ smb at 0,08000000 {
compatible = "simple-bus";
#address-cells = <2>;
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] ARM: dts: vexpress: fix node name unit-address presence warnings 2016-03-07 12:12 [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings Sudeep Holla @ 2016-03-07 12:12 ` Sudeep Holla 2016-03-17 21:44 ` [PATCH 1/2] arm64: dts: juno/vexpress: " Rob Herring 1 sibling, 0 replies; 7+ messages in thread From: Sudeep Holla @ 2016-03-07 12:12 UTC (permalink / raw) To: linux-arm-kernel Commit fa38a82096a1 ("scripts/dtc: Update to upstream version 53bf130b1cdd") added warnings on node name unit-address presence/absence mismatch in device trees. This patch fixes those warning on all the vexpress platforms where unit-address is present in node name while the reg/ranges property is not present. Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 44 ++++++++++++++--------------- arch/arm/boot/dts/vexpress-v2m.dtsi | 44 ++++++++++++++--------------- arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 24 ++++++++-------- arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 42 +++++++++++++-------------- arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 16 +++++------ arch/arm/boot/dts/vexpress-v2p-ca9.dts | 28 +++++++++--------- 6 files changed, 99 insertions(+), 99 deletions(-) diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi index 21b02874bea3..e0e4f8a15752 100644 --- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi @@ -75,19 +75,19 @@ compatible = "arm,vexpress-sysreg"; reg = <0x010000 0x1000>; - v2m_led_gpios: sys_led at 08 { + v2m_led_gpios: sys_led { compatible = "arm,vexpress-sysreg,sys_led"; gpio-controller; #gpio-cells = <2>; }; - v2m_mmc_gpios: sys_mci at 48 { + v2m_mmc_gpios: sys_mci { compatible = "arm,vexpress-sysreg,sys_mci"; gpio-controller; #gpio-cells = <2>; }; - v2m_flash_gpios: sys_flash at 4c { + v2m_flash_gpios: sys_flash { compatible = "arm,vexpress-sysreg,sys_flash"; gpio-controller; #gpio-cells = <2>; @@ -286,7 +286,7 @@ }; }; - v2m_fixed_3v3: fixedregulator at 0 { + v2m_fixed_3v3: fixedregulator0 { compatible = "regulator-fixed"; regulator-name = "3V3"; regulator-min-microvolt = <3300000>; @@ -318,49 +318,49 @@ leds { compatible = "gpio-leds"; - user at 1 { + user1 { label = "v2m:green:user1"; gpios = <&v2m_led_gpios 0 0>; linux,default-trigger = "heartbeat"; }; - user at 2 { + user2 { label = "v2m:green:user2"; gpios = <&v2m_led_gpios 1 0>; linux,default-trigger = "mmc0"; }; - user at 3 { + user3 { label = "v2m:green:user3"; gpios = <&v2m_led_gpios 2 0>; linux,default-trigger = "cpu0"; }; - user at 4 { + user4 { label = "v2m:green:user4"; gpios = <&v2m_led_gpios 3 0>; linux,default-trigger = "cpu1"; }; - user at 5 { + user5 { label = "v2m:green:user5"; gpios = <&v2m_led_gpios 4 0>; linux,default-trigger = "cpu2"; }; - user at 6 { + user6 { label = "v2m:green:user6"; gpios = <&v2m_led_gpios 5 0>; linux,default-trigger = "cpu3"; }; - user at 7 { + user7 { label = "v2m:green:user7"; gpios = <&v2m_led_gpios 6 0>; linux,default-trigger = "cpu4"; }; - user at 8 { + user8 { label = "v2m:green:user8"; gpios = <&v2m_led_gpios 7 0>; linux,default-trigger = "cpu5"; @@ -371,7 +371,7 @@ compatible = "arm,vexpress,config-bus"; arm,vexpress,config-bridge = <&v2m_sysreg>; - osc at 0 { + osc0 { /* MCC static memory clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 0>; @@ -380,7 +380,7 @@ clock-output-names = "v2m:oscclk0"; }; - v2m_oscclk1: osc at 1 { + v2m_oscclk1: osc1 { /* CLCD clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 1>; @@ -389,7 +389,7 @@ clock-output-names = "v2m:oscclk1"; }; - v2m_oscclk2: osc at 2 { + v2m_oscclk2: osc2 { /* IO FPGA peripheral clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 2>; @@ -398,7 +398,7 @@ clock-output-names = "v2m:oscclk2"; }; - volt at 0 { + volt { /* Logic level voltage */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 0>; @@ -407,34 +407,34 @@ label = "VIO"; }; - temp at 0 { + temp { /* MCC internal operating temperature */ compatible = "arm,vexpress-temp"; arm,vexpress-sysreg,func = <4 0>; label = "MCC"; }; - reset at 0 { + reset { compatible = "arm,vexpress-reset"; arm,vexpress-sysreg,func = <5 0>; }; - muxfpga at 0 { + muxfpga { compatible = "arm,vexpress-muxfpga"; arm,vexpress-sysreg,func = <7 0>; }; - shutdown at 0 { + shutdown { compatible = "arm,vexpress-shutdown"; arm,vexpress-sysreg,func = <8 0>; }; - reboot at 0 { + reboot { compatible = "arm,vexpress-reboot"; arm,vexpress-sysreg,func = <9 0>; }; - dvimode at 0 { + dvimode { compatible = "arm,vexpress-dvimode"; arm,vexpress-sysreg,func = <11 0>; }; diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi index e712c0af149b..f0d22a4cd3b6 100644 --- a/arch/arm/boot/dts/vexpress-v2m.dtsi +++ b/arch/arm/boot/dts/vexpress-v2m.dtsi @@ -74,19 +74,19 @@ compatible = "arm,vexpress-sysreg"; reg = <0x00000 0x1000>; - v2m_led_gpios: sys_led at 08 { + v2m_led_gpios: sys_led { compatible = "arm,vexpress-sysreg,sys_led"; gpio-controller; #gpio-cells = <2>; }; - v2m_mmc_gpios: sys_mci at 48 { + v2m_mmc_gpios: sys_mci { compatible = "arm,vexpress-sysreg,sys_mci"; gpio-controller; #gpio-cells = <2>; }; - v2m_flash_gpios: sys_flash at 4c { + v2m_flash_gpios: sys_flash { compatible = "arm,vexpress-sysreg,sys_flash"; gpio-controller; #gpio-cells = <2>; @@ -285,7 +285,7 @@ }; }; - v2m_fixed_3v3: fixedregulator at 0 { + v2m_fixed_3v3: fixedregulator0 { compatible = "regulator-fixed"; regulator-name = "3V3"; regulator-min-microvolt = <3300000>; @@ -317,49 +317,49 @@ leds { compatible = "gpio-leds"; - user at 1 { + user1 { label = "v2m:green:user1"; gpios = <&v2m_led_gpios 0 0>; linux,default-trigger = "heartbeat"; }; - user at 2 { + user2 { label = "v2m:green:user2"; gpios = <&v2m_led_gpios 1 0>; linux,default-trigger = "mmc0"; }; - user at 3 { + user3 { label = "v2m:green:user3"; gpios = <&v2m_led_gpios 2 0>; linux,default-trigger = "cpu0"; }; - user at 4 { + user4 { label = "v2m:green:user4"; gpios = <&v2m_led_gpios 3 0>; linux,default-trigger = "cpu1"; }; - user at 5 { + user5 { label = "v2m:green:user5"; gpios = <&v2m_led_gpios 4 0>; linux,default-trigger = "cpu2"; }; - user at 6 { + user6 { label = "v2m:green:user6"; gpios = <&v2m_led_gpios 5 0>; linux,default-trigger = "cpu3"; }; - user at 7 { + user7 { label = "v2m:green:user7"; gpios = <&v2m_led_gpios 6 0>; linux,default-trigger = "cpu4"; }; - user at 8 { + user8 { label = "v2m:green:user8"; gpios = <&v2m_led_gpios 7 0>; linux,default-trigger = "cpu5"; @@ -370,7 +370,7 @@ compatible = "arm,vexpress,config-bus"; arm,vexpress,config-bridge = <&v2m_sysreg>; - osc at 0 { + osc0 { /* MCC static memory clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 0>; @@ -379,7 +379,7 @@ clock-output-names = "v2m:oscclk0"; }; - v2m_oscclk1: osc at 1 { + v2m_oscclk1: osc1 { /* CLCD clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 1>; @@ -388,7 +388,7 @@ clock-output-names = "v2m:oscclk1"; }; - v2m_oscclk2: osc at 2 { + v2m_oscclk2: osc2 { /* IO FPGA peripheral clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 2>; @@ -397,7 +397,7 @@ clock-output-names = "v2m:oscclk2"; }; - volt at 0 { + volt { /* Logic level voltage */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 0>; @@ -406,34 +406,34 @@ label = "VIO"; }; - temp at 0 { + temp { /* MCC internal operating temperature */ compatible = "arm,vexpress-temp"; arm,vexpress-sysreg,func = <4 0>; label = "MCC"; }; - reset at 0 { + reset { compatible = "arm,vexpress-reset"; arm,vexpress-sysreg,func = <5 0>; }; - muxfpga at 0 { + muxfpga { compatible = "arm,vexpress-muxfpga"; arm,vexpress-sysreg,func = <7 0>; }; - shutdown at 0 { + shutdown { compatible = "arm,vexpress-shutdown"; arm,vexpress-sysreg,func = <8 0>; }; - reboot at 0 { + reboot { compatible = "arm,vexpress-reboot"; arm,vexpress-sysreg,func = <9 0>; }; - dvimode at 0 { + dvimode { compatible = "arm,vexpress-dvimode"; arm,vexpress-sysreg,func = <11 0>; }; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts index 9420053acc14..a58a7a2fbff4 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts @@ -126,7 +126,7 @@ compatible = "arm,vexpress,config-bus"; arm,vexpress,config-bridge = <&v2m_sysreg>; - osc at 0 { + osc0 { /* CPU PLL reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 0>; @@ -135,7 +135,7 @@ clock-output-names = "oscclk0"; }; - osc at 4 { + osc4 { /* Multiplexed AXI master clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 4>; @@ -144,7 +144,7 @@ clock-output-names = "oscclk4"; }; - oscclk5: osc at 5 { + oscclk5: osc5 { /* HDLCD PLL reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 5>; @@ -153,7 +153,7 @@ clock-output-names = "oscclk5"; }; - smbclk: osc at 6 { + smbclk: osc6 { /* SMB clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 6>; @@ -162,7 +162,7 @@ clock-output-names = "oscclk6"; }; - oscclk7: osc at 7 { + oscclk7: osc7 { /* SYS PLL reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 7>; @@ -171,7 +171,7 @@ clock-output-names = "oscclk7"; }; - osc at 8 { + osc8 { /* DDR2 PLL reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 8>; @@ -180,7 +180,7 @@ clock-output-names = "oscclk8"; }; - volt at 0 { + volt0 { /* CPU core voltage */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 0>; @@ -191,28 +191,28 @@ label = "Cores"; }; - amp at 0 { + amp0 { /* Total current for the two cores */ compatible = "arm,vexpress-amp"; arm,vexpress-sysreg,func = <3 0>; label = "Cores"; }; - temp at 0 { + temp0 { /* DCC internal temperature */ compatible = "arm,vexpress-temp"; arm,vexpress-sysreg,func = <4 0>; label = "DCC"; }; - power at 0 { + power0 { /* Total power */ compatible = "arm,vexpress-power"; arm,vexpress-sysreg,func = <12 0>; label = "Cores"; }; - energy at 0 { + energy0 { /* Total energy */ compatible = "arm,vexpress-energy"; arm,vexpress-sysreg,func = <13 0>; @@ -220,7 +220,7 @@ }; }; - smb { + smb at 0,08000000 { compatible = "simple-bus"; #address-cells = <2>; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index 17f63f7dfd9e..791beaac2509 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -227,7 +227,7 @@ compatible = "arm,vexpress,config-bus"; arm,vexpress,config-bridge = <&v2m_sysreg>; - osc at 0 { + osc0 { /* A15 PLL 0 reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 0>; @@ -236,7 +236,7 @@ clock-output-names = "oscclk0"; }; - osc at 1 { + osc1 { /* A15 PLL 1 reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 1>; @@ -245,7 +245,7 @@ clock-output-names = "oscclk1"; }; - osc at 2 { + osc2 { /* A7 PLL 0 reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 2>; @@ -254,7 +254,7 @@ clock-output-names = "oscclk2"; }; - osc at 3 { + osc3 { /* A7 PLL 1 reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 3>; @@ -263,7 +263,7 @@ clock-output-names = "oscclk3"; }; - osc at 4 { + osc4 { /* External AXI master clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 4>; @@ -272,7 +272,7 @@ clock-output-names = "oscclk4"; }; - oscclk5: osc at 5 { + oscclk5: osc5 { /* HDLCD PLL reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 5>; @@ -281,7 +281,7 @@ clock-output-names = "oscclk5"; }; - smbclk: osc at 6 { + smbclk: osc6 { /* Static memory controller clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 6>; @@ -290,7 +290,7 @@ clock-output-names = "oscclk6"; }; - osc at 7 { + osc7 { /* SYS PLL reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 7>; @@ -299,7 +299,7 @@ clock-output-names = "oscclk7"; }; - osc at 8 { + osc8 { /* DDR2 PLL reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 8>; @@ -308,7 +308,7 @@ clock-output-names = "oscclk8"; }; - volt at 0 { + volt0 { /* A15 CPU core voltage */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 0>; @@ -319,7 +319,7 @@ label = "A15 Vcore"; }; - volt at 1 { + volt1 { /* A7 CPU core voltage */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 1>; @@ -330,49 +330,49 @@ label = "A7 Vcore"; }; - amp at 0 { + amp0 { /* Total current for the two A15 cores */ compatible = "arm,vexpress-amp"; arm,vexpress-sysreg,func = <3 0>; label = "A15 Icore"; }; - amp at 1 { + amp1 { /* Total current for the three A7 cores */ compatible = "arm,vexpress-amp"; arm,vexpress-sysreg,func = <3 1>; label = "A7 Icore"; }; - temp at 0 { + temp0 { /* DCC internal temperature */ compatible = "arm,vexpress-temp"; arm,vexpress-sysreg,func = <4 0>; label = "DCC"; }; - power at 0 { + power0 { /* Total power for the two A15 cores */ compatible = "arm,vexpress-power"; arm,vexpress-sysreg,func = <12 0>; label = "A15 Pcore"; }; - power at 1 { + power1 { /* Total power for the three A7 cores */ compatible = "arm,vexpress-power"; arm,vexpress-sysreg,func = <12 1>; label = "A7 Pcore"; }; - energy at 0 { + energy0 { /* Total energy for the two A15 cores */ compatible = "arm,vexpress-energy"; arm,vexpress-sysreg,func = <13 0>, <13 1>; label = "A15 Jcore"; }; - energy at 2 { + energy2 { /* Total energy for the three A7 cores */ compatible = "arm,vexpress-energy"; arm,vexpress-sysreg,func = <13 2>, <13 3>; @@ -387,7 +387,7 @@ clocks = <&oscclk6a>; clock-names = "apb_pclk"; port { - etb_in_port: endpoint at 0 { + etb_in_port: endpoint { slave-mode; remote-endpoint = <&replicator_out_port0>; }; @@ -401,7 +401,7 @@ clocks = <&oscclk6a>; clock-names = "apb_pclk"; port { - tpiu_in_port: endpoint at 0 { + tpiu_in_port: endpoint { slave-mode; remote-endpoint = <&replicator_out_port1>; }; @@ -578,7 +578,7 @@ }; }; - smb { + smb at 0,08000000 { compatible = "simple-bus"; #address-cells = <2>; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts index d2709b73316b..dd6fbbe08a23 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts @@ -128,7 +128,7 @@ compatible = "arm,vexpress,config-bus"; arm,vexpress,config-bridge = <&v2m_sysreg>; - oscclk0: osc at 0 { + oscclk0: osc0 { /* CPU and internal AXI reference clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 0>; @@ -137,7 +137,7 @@ clock-output-names = "oscclk0"; }; - oscclk1: osc at 1 { + oscclk1: osc1 { /* Multiplexed AXI master clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 1>; @@ -146,7 +146,7 @@ clock-output-names = "oscclk1"; }; - osc at 2 { + osc2 { /* DDR2 */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 2>; @@ -155,7 +155,7 @@ clock-output-names = "oscclk2"; }; - oscclk3: osc at 3 { + oscclk3: osc3 { /* HDLCD */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 3>; @@ -164,7 +164,7 @@ clock-output-names = "oscclk3"; }; - osc at 4 { + osc4 { /* Test chip gate configuration */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 4>; @@ -173,7 +173,7 @@ clock-output-names = "oscclk4"; }; - smbclk: osc at 5 { + smbclk: osc5 { /* SMB clock */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 5>; @@ -182,7 +182,7 @@ clock-output-names = "oscclk5"; }; - temp at 0 { + temp0 { /* DCC internal operating temperature */ compatible = "arm,vexpress-temp"; arm,vexpress-sysreg,func = <4 0>; @@ -190,7 +190,7 @@ }; }; - smb { + smb at 0,08000000 { compatible = "simple-bus"; #address-cells = <2>; diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts index d949facba376..ef883e2015ac 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts @@ -190,7 +190,7 @@ compatible = "arm,vexpress,config-bus"; arm,vexpress,config-bridge = <&v2m_sysreg>; - osc at 0 { + osc0 { /* ACLK clock to the AXI master port on the test chip */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 0>; @@ -199,7 +199,7 @@ clock-output-names = "extsaxiclk"; }; - oscclk1: osc at 1 { + oscclk1: osc1 { /* Reference clock for the CLCD */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 1>; @@ -208,7 +208,7 @@ clock-output-names = "clcdclk"; }; - smbclk: oscclk2: osc at 2 { + smbclk: oscclk2: osc2 { /* Reference clock for the test chip internal PLLs */ compatible = "arm,vexpress-osc"; arm,vexpress-sysreg,func = <1 2>; @@ -217,7 +217,7 @@ clock-output-names = "tcrefclk"; }; - volt at 0 { + volt0 { /* Test Chip internal logic voltage */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 0>; @@ -226,7 +226,7 @@ label = "VD10"; }; - volt at 1 { + volt1 { /* PL310, L2 cache, RAM cell supply (not PL310 logic) */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 1>; @@ -235,7 +235,7 @@ label = "VD10_S2"; }; - volt at 2 { + volt2 { /* Cortex-A9 system supply, Cores, MPEs, SCU and PL310 logic */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 2>; @@ -244,7 +244,7 @@ label = "VD10_S3"; }; - volt at 3 { + volt3 { /* DDR2 SDRAM and Test Chip DDR2 I/O supply */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 3>; @@ -253,7 +253,7 @@ label = "VCC1V8"; }; - volt at 4 { + volt4 { /* DDR2 SDRAM VTT termination voltage */ compatible = "arm,vexpress-volt"; arm,vexpress-sysreg,func = <2 4>; @@ -262,7 +262,7 @@ label = "DDR2VTT"; }; - volt at 5 { + volt5 { /* Local board supply for miscellaneous logic external to the Test Chip */ arm,vexpress-sysreg,func = <2 5>; compatible = "arm,vexpress-volt"; @@ -271,28 +271,28 @@ label = "VCC3V3"; }; - amp at 0 { + amp0 { /* PL310, L2 cache, RAM cell supply (not PL310 logic) */ compatible = "arm,vexpress-amp"; arm,vexpress-sysreg,func = <3 0>; label = "VD10_S2"; }; - amp at 1 { + amp1 { /* Cortex-A9 system supply, Cores, MPEs, SCU and PL310 logic */ compatible = "arm,vexpress-amp"; arm,vexpress-sysreg,func = <3 1>; label = "VD10_S3"; }; - power at 0 { + power0 { /* PL310, L2 cache, RAM cell supply (not PL310 logic) */ compatible = "arm,vexpress-power"; arm,vexpress-sysreg,func = <12 0>; label = "PVD10_S2"; }; - power at 1 { + power1 { /* Cortex-A9 system supply, Cores, MPEs, SCU and PL310 logic */ compatible = "arm,vexpress-power"; arm,vexpress-sysreg,func = <12 1>; @@ -300,7 +300,7 @@ }; }; - smb { + smb at 0,04000000 { compatible = "simple-bus"; #address-cells = <2>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings 2016-03-07 12:12 [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings Sudeep Holla 2016-03-07 12:12 ` [PATCH 2/2] ARM: dts: vexpress: " Sudeep Holla @ 2016-03-17 21:44 ` Rob Herring 2016-03-18 10:32 ` Jon Medhurst (Tixy) 1 sibling, 1 reply; 7+ messages in thread From: Rob Herring @ 2016-03-17 21:44 UTC (permalink / raw) To: linux-arm-kernel On Mon, Mar 7, 2016 at 6:12 AM, Sudeep Holla <sudeep.holla@arm.com> wrote: > Commit fa38a82096a1 ("scripts/dtc: Update to upstream version > 53bf130b1cdd") added warnings on node name unit-address presence/absence > mismatch in device trees. > > This patch fixes those warning on all the juno/vexpress platforms where > unit-address is present in node name while the reg/ranges property is > not present. > > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > --- > arch/arm64/boot/dts/arm/foundation-v8.dtsi | 2 +- > arch/arm64/boot/dts/arm/juno-base.dtsi | 14 +++++----- > arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 30 +++++++++++----------- > arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 2 +- > arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 14 +++++----- > .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 10 ++++---- > 6 files changed, 36 insertions(+), 36 deletions(-) > > Hi Rob, > > I am not sure if the intention of commit fa38a82096a1 is to fix even > existing warnings or not. I saw warning with today's -next branch. Yes. I'm dropping it for 4.6 though. > Let me know. > > Regards, > Sudeep > > diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi > index 9314f3943269..ba03c934a861 100644 > --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi > +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi > @@ -89,7 +89,7 @@ > <0 63 4>; > }; > > - smb { > + smb at 0,08000000 { Drop the comma and leading zeros. Comma is for distinct fields like bus,dev,func on PCI. This is the next warning I'm working on... > compatible = "arm,vexpress,v2m-p1", "simple-bus"; > arm,v2m-memory-map = "rs1"; > #address-cells = <2>; /* SMB chipselect number and offset */ > diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi > index 4b6172b0f2cb..3841e82fa6f8 100644 > --- a/arch/arm64/boot/dts/arm/juno-base.dtsi > +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi > @@ -105,13 +105,13 @@ > clocks { > compatible = "arm,scpi-clocks"; > > - scpi_dvfs: scpi_clocks at 0 { > + scpi_dvfs: scpi-clocks-0 { > compatible = "arm,scpi-dvfs-clocks"; > #clock-cells = <1>; > clock-indices = <0>, <1>, <2>; > clock-output-names = "atlclk", "aplclk","gpuclk"; > }; > - scpi_clk: scpi_clocks at 3 { > + scpi_clk: scpi-clocks-1 { > compatible = "arm,scpi-variable-clocks"; > #clock-cells = <1>; > clock-indices = <3>; > @@ -154,7 +154,7 @@ > clock-names = "pxlclk"; > > port { > - hdlcd1_output: endpoint at 0 { > + hdlcd1_output: endpoint0 { Just "endpoint" or add the reg property if there is another endpoint. > remote-endpoint = <&tda998x_1_input>; > }; > }; > @@ -168,7 +168,7 @@ > clock-names = "pxlclk"; > > port { > - hdlcd0_output: endpoint at 0 { > + hdlcd0_output: endpoint0 { > remote-endpoint = <&tda998x_0_input>; > }; > }; > @@ -196,7 +196,7 @@ > compatible = "nxp,tda998x"; > reg = <0x70>; > port { > - tda998x_0_input: endpoint at 0 { > + tda998x_0_input: endpoint0 { > remote-endpoint = <&hdlcd0_output>; > }; > }; > @@ -206,7 +206,7 @@ > compatible = "nxp,tda998x"; > reg = <0x71>; > port { > - tda998x_1_input: endpoint at 0 { > + tda998x_1_input: endpoint0 { > remote-endpoint = <&hdlcd1_output>; > }; > }; > @@ -243,7 +243,7 @@ > <0x00000008 0x80000000 0x1 0x80000000>; > }; > > - smb { > + smb at 0,08000000 { > compatible = "simple-bus"; > #address-cells = <2>; > #size-cells = <1>; > diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi > index 413f1b9ebcd4..3d4af126df6e 100644 > --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi > +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi > @@ -46,7 +46,7 @@ > arm,vexpress,site = <0>; > arm,v2m-memory-map = "rs1"; > > - mb_fixed_3v3: fixedregulator at 0 { > + mb_fixed_3v3: fixedregulator0 { fixed-regulator-0 perhaps. > compatible = "regulator-fixed"; > regulator-name = "MCC_SB_3V3"; > regulator-min-microvolt = <3300000>; > @@ -59,42 +59,42 @@ > #address-cells = <1>; > #size-cells = <0>; > > - button at 1 { > + button1 { > debounce_interval = <50>; > wakeup-source; > linux,code = <116>; > label = "POWER"; > gpios = <&iofpga_gpio0 0 0x4>; > }; > - button at 2 { > + button2 { > debounce_interval = <50>; > wakeup-source; > linux,code = <102>; > label = "HOME"; > gpios = <&iofpga_gpio0 1 0x4>; > }; > - button at 3 { > + button3 { > debounce_interval = <50>; > wakeup-source; > linux,code = <152>; > label = "RLOCK"; > gpios = <&iofpga_gpio0 2 0x4>; > }; > - button at 4 { > + button4 { > debounce_interval = <50>; > wakeup-source; > linux,code = <115>; > label = "VOL+"; > gpios = <&iofpga_gpio0 3 0x4>; > }; > - button at 5 { > + button5 { > debounce_interval = <50>; > wakeup-source; > linux,code = <114>; > label = "VOL-"; > gpios = <&iofpga_gpio0 4 0x4>; > }; > - button at 6 { > + button6 { > debounce_interval = <50>; > wakeup-source; > linux,code = <99>; > @@ -159,7 +159,7 @@ > compatible = "syscon", "simple-mfd"; > reg = <0x010000 0x1000>; > > - led at 08.0 { > + led0 { In hindsight, we probably should have done "reg = <0x8 0>" for register and bit offsets. Is "0" the best description of this led (i.e. is there some h/w defined name)? > compatible = "register-bit-led"; > offset = <0x08>; > mask = <0x01>; ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings 2016-03-17 21:44 ` [PATCH 1/2] arm64: dts: juno/vexpress: " Rob Herring @ 2016-03-18 10:32 ` Jon Medhurst (Tixy) 2016-03-18 13:09 ` Rob Herring 0 siblings, 1 reply; 7+ messages in thread From: Jon Medhurst (Tixy) @ 2016-03-18 10:32 UTC (permalink / raw) To: linux-arm-kernel On Thu, 2016-03-17 at 16:44 -0500, Rob Herring wrote: > On Mon, Mar 7, 2016 at 6:12 AM, Sudeep Holla <sudeep.holla@arm.com> wrote: > > Commit fa38a82096a1 ("scripts/dtc: Update to upstream version > > 53bf130b1cdd") added warnings on node name unit-address presence/absence > > mismatch in device trees. > > > > This patch fixes those warning on all the juno/vexpress platforms where > > unit-address is present in node name while the reg/ranges property is > > not present. > > > > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > > --- > > arch/arm64/boot/dts/arm/foundation-v8.dtsi | 2 +- > > arch/arm64/boot/dts/arm/juno-base.dtsi | 14 +++++----- > > arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 30 +++++++++++----------- > > arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 2 +- > > arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 14 +++++----- > > .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 10 ++++---- > > 6 files changed, 36 insertions(+), 36 deletions(-) > > > > Hi Rob, > > > > I am not sure if the intention of commit fa38a82096a1 is to fix even > > existing warnings or not. I saw warning with today's -next branch. > > Yes. I'm dropping it for 4.6 though. > > > Let me know. > > > > Regards, > > Sudeep > > > > diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi > > index 9314f3943269..ba03c934a861 100644 > > --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi > > +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi > > @@ -89,7 +89,7 @@ > > <0 63 4>; > > }; > > > > - smb { > > + smb at 0,08000000 { > > Drop the comma and leading zeros. Comma is for distinct fields like > bus,dev,func on PCI. So what is the correct way of representing 2 cell addresses? Not just those that are logically 64-bit addresses, (which I guess could be just a single number), but things like vexpress motherboard where we have Chip-select and Offset values? I looked at ePAPR but it just says 'The unit-address must match the first address specified in the reg property of the node.' and lists valid characters for unit address, which includes ,._+- -- Tixy ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings 2016-03-18 10:32 ` Jon Medhurst (Tixy) @ 2016-03-18 13:09 ` Rob Herring 2016-03-18 14:15 ` Jon Medhurst (Tixy) 0 siblings, 1 reply; 7+ messages in thread From: Rob Herring @ 2016-03-18 13:09 UTC (permalink / raw) To: linux-arm-kernel On Fri, Mar 18, 2016 at 5:32 AM, Jon Medhurst (Tixy) <tixy@linaro.org> wrote: > On Thu, 2016-03-17 at 16:44 -0500, Rob Herring wrote: >> On Mon, Mar 7, 2016 at 6:12 AM, Sudeep Holla <sudeep.holla@arm.com> wrote: >> > Commit fa38a82096a1 ("scripts/dtc: Update to upstream version >> > 53bf130b1cdd") added warnings on node name unit-address presence/absence >> > mismatch in device trees. >> > >> > This patch fixes those warning on all the juno/vexpress platforms where >> > unit-address is present in node name while the reg/ranges property is >> > not present. >> > >> > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> >> > --- >> > arch/arm64/boot/dts/arm/foundation-v8.dtsi | 2 +- >> > arch/arm64/boot/dts/arm/juno-base.dtsi | 14 +++++----- >> > arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 30 +++++++++++----------- >> > arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 2 +- >> > arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 14 +++++----- >> > .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 10 ++++---- >> > 6 files changed, 36 insertions(+), 36 deletions(-) >> > >> > Hi Rob, >> > >> > I am not sure if the intention of commit fa38a82096a1 is to fix even >> > existing warnings or not. I saw warning with today's -next branch. >> >> Yes. I'm dropping it for 4.6 though. >> >> > Let me know. >> > >> > Regards, >> > Sudeep >> > >> > diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi >> > index 9314f3943269..ba03c934a861 100644 >> > --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi >> > +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi >> > @@ -89,7 +89,7 @@ >> > <0 63 4>; >> > }; >> > >> > - smb { >> > + smb at 0,08000000 { >> >> Drop the comma and leading zeros. Comma is for distinct fields like >> bus,dev,func on PCI. > > So what is the correct way of representing 2 cell addresses? Not just > those that are logically 64-bit addresses, (which I guess could be just > a single number), but things like vexpress motherboard where we have > Chip-select and Offset values? 64-bit address is just a single number. 2 cells with distinct fields should generally be ...@<cell1>,<cell2> If you have your own bus type, you can devise whatever you like as long as it is reviewed. > I looked at ePAPR but it just says 'The unit-address must > match the first address specified in the reg property of the node.' and > lists valid characters for unit address, which includes ,._+- Yes, we need to clarify this some. Rob ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings 2016-03-18 13:09 ` Rob Herring @ 2016-03-18 14:15 ` Jon Medhurst (Tixy) 2016-03-18 14:52 ` Rob Herring 0 siblings, 1 reply; 7+ messages in thread From: Jon Medhurst (Tixy) @ 2016-03-18 14:15 UTC (permalink / raw) To: linux-arm-kernel On Fri, 2016-03-18 at 08:09 -0500, Rob Herring wrote: > On Fri, Mar 18, 2016 at 5:32 AM, Jon Medhurst (Tixy) <tixy@linaro.org> wrote: > > On Thu, 2016-03-17 at 16:44 -0500, Rob Herring wrote: > >> On Mon, Mar 7, 2016 at 6:12 AM, Sudeep Holla <sudeep.holla@arm.com> wrote: [...] > >> > Let me know. > >> > > >> > Regards, > >> > Sudeep > >> > > >> > diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi > >> > index 9314f3943269..ba03c934a861 100644 > >> > --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi > >> > +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi > >> > @@ -89,7 +89,7 @@ > >> > <0 63 4>; > >> > }; > >> > > >> > - smb { > >> > + smb at 0,08000000 { > >> > >> Drop the comma and leading zeros. Comma is for distinct fields like > >> bus,dev,func on PCI. > > > > So what is the correct way of representing 2 cell addresses? Not just > > those that are logically 64-bit addresses, (which I guess could be just > > a single number), but things like vexpress motherboard where we have > > Chip-select and Offset values? > > 64-bit address is just a single number. > 2 cells with distinct fields should generally be ...@<cell1>,<cell2> > > If you have your own bus type, you can devise whatever you like as > long as it is reviewed. > > > I looked at ePAPR but it just says 'The unit-address must > > match the first address specified in the reg property of the node.' and > > lists valid characters for unit address, which includes ,._+- > > Yes, we need to clarify this some. Yes, because there is already quite a bit of use of @X,Y for two cell 64-bit addresses (Tegra mostly, I assume they're 64-bit addresses). And for 32-bit addresses lots of use of leading zeros to pad address to consistence number of digits, both in unit names and in reg properties. $ grep '@0[^ ^,]' -R arch/arm/boot/dts | wc -l 1300 -- Tixy ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings 2016-03-18 14:15 ` Jon Medhurst (Tixy) @ 2016-03-18 14:52 ` Rob Herring 0 siblings, 0 replies; 7+ messages in thread From: Rob Herring @ 2016-03-18 14:52 UTC (permalink / raw) To: linux-arm-kernel On Fri, Mar 18, 2016 at 9:15 AM, Jon Medhurst (Tixy) <tixy@linaro.org> wrote: > On Fri, 2016-03-18 at 08:09 -0500, Rob Herring wrote: >> On Fri, Mar 18, 2016 at 5:32 AM, Jon Medhurst (Tixy) <tixy@linaro.org> wrote: >> > On Thu, 2016-03-17 at 16:44 -0500, Rob Herring wrote: >> >> On Mon, Mar 7, 2016 at 6:12 AM, Sudeep Holla <sudeep.holla@arm.com> wrote: > [...] >> >> > Let me know. >> >> > >> >> > Regards, >> >> > Sudeep >> >> > >> >> > diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi >> >> > index 9314f3943269..ba03c934a861 100644 >> >> > --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi >> >> > +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi >> >> > @@ -89,7 +89,7 @@ >> >> > <0 63 4>; >> >> > }; >> >> > >> >> > - smb { >> >> > + smb at 0,08000000 { >> >> >> >> Drop the comma and leading zeros. Comma is for distinct fields like >> >> bus,dev,func on PCI. >> > >> > So what is the correct way of representing 2 cell addresses? Not just >> > those that are logically 64-bit addresses, (which I guess could be just >> > a single number), but things like vexpress motherboard where we have >> > Chip-select and Offset values? >> >> 64-bit address is just a single number. >> 2 cells with distinct fields should generally be ...@<cell1>,<cell2> >> >> If you have your own bus type, you can devise whatever you like as >> long as it is reviewed. >> >> > I looked at ePAPR but it just says 'The unit-address must >> > match the first address specified in the reg property of the node.' and >> > lists valid characters for unit address, which includes ,._+- >> >> Yes, we need to clarify this some. > > Yes, because there is already quite a bit of use of @X,Y for two cell > 64-bit addresses (Tegra mostly, I assume they're 64-bit addresses). That is because briefly we were telling folks to do that until Ben H clarified when commas are appropriate. > And for 32-bit addresses lots of use of leading zeros to pad address to > consistence number of digits, both in unit names and in reg properties. > > $ grep '@0[^ ^,]' -R arch/arm/boot/dts | wc -l > 1300 I'm working on dtc checks for both. I also learned yesterday some TI DTs use the full address rather than the local untranslated address. Rob ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-03-18 14:52 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-03-07 12:12 [PATCH 1/2] arm64: dts: juno/vexpress: fix node name unit-address presence warnings Sudeep Holla 2016-03-07 12:12 ` [PATCH 2/2] ARM: dts: vexpress: " Sudeep Holla 2016-03-17 21:44 ` [PATCH 1/2] arm64: dts: juno/vexpress: " Rob Herring 2016-03-18 10:32 ` Jon Medhurst (Tixy) 2016-03-18 13:09 ` Rob Herring 2016-03-18 14:15 ` Jon Medhurst (Tixy) 2016-03-18 14:52 ` Rob Herring
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).