Improve the DTS files by removing all the leading "0x" and zeros to fix the
following dtc warnings:
Warning (unit_address_format): Node /XXX unit name should not have leading "0x"
and
Warning (unit_address_format): Node /XXX unit name should not have leading 0s
Converted using the following command:
find . -type f \( -iname *.dts -o -iname *.dtsi \) -exec sed -i -e
"s/@\([0-9a-fA-FxX\.;:#]+\)\s*{/@\L\1 {/g" -e "s/@0x\(.*\) {/@\1 {/g" -e
"s/@0+\(.*\) {/@\1 {/g" {} +^C
For simplicity, two sed expressions were used to solve each warnings separately.
To make the regex expression more robust a few other issues were resolved,
namely setting unit-address to lower case, and adding a whitespace before the
the opening curly brace:
https://elinux.org/Device_Tree_Linux#Linux_conventions
This will solve as a side effect warning:
Warning (simple_bus_reg): Node /XXX@<UPPER> simple-bus unit address format
error, expected "<lower>"
This is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x
from bindings notation")
Reported-by: David Daney <[email protected]>
Suggested-by: Rob Herring <[email protected]>
Signed-off-by: Mathieu Malaterre <[email protected]>
---
arch/arm/boot/dts/versatile-ab.dts | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/versatile-ab.dts
b/arch/arm/boot/dts/versatile-ab.dts
index 4a51612996bc..2f60ecd7741e 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -24,7 +24,7 @@
reg = <0x0 0x08000000>;
};
- xtal24mhz: xtal24mhz@24M {
+ xtal24mhz: xtal24mhz@24m {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <24000000>;
@@ -34,7 +34,7 @@
compatible = "arm,core-module-versatile", "syscon",
"simple-mfd";
reg = <0x10000000 0x200>;
- [email protected] {
+ [email protected] {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x01>;
@@ -42,7 +42,7 @@
linux,default-trigger = "heartbeat";
default-state = "on";
};
- [email protected] {
+ [email protected] {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x02>;
@@ -50,7 +50,7 @@
linux,default-trigger = "mmc0";
default-state = "off";
};
- [email protected] {
+ [email protected] {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x04>;
@@ -58,35 +58,35 @@
linux,default-trigger = "cpu0";
default-state = "off";
};
- [email protected] {
+ [email protected] {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x08>;
label = "versatile:3";
default-state = "off";
};
- [email protected] {
+ [email protected] {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x10>;
label = "versatile:4";
default-state = "off";
};
- [email protected] {
+ [email protected] {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x20>;
label = "versatile:5";
default-state = "off";
};
- [email protected] {
+ [email protected] {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x40>;
label = "versatile:6";
default-state = "off";
};
- [email protected] {
+ [email protected] {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x80>;
@@ -95,14 +95,14 @@
};
/* OSC1 on AB, OSC4 on PB */
- osc1: cm_aux_osc@24M {
+ osc1: cm_aux_osc@24m {
#clock-cells = <0>;
compatible = "arm,versatile-cm-auxosc";
clocks = <&xtal24mhz>;
};
/* The timer clock is the 24 MHz oscillator divided to 1MHz */
- timclk: timclk@1M {
+ timclk: timclk@1m {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <24>;
@@ -110,7 +110,7 @@
clocks = <&xtal24mhz>;
};
- pclk: pclk@24M {
+ pclk: pclk@24m {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clock-div = <1>;
--
2.11.0
