diff options
author | Mathieu Malaterre <malat@debian.org> | 2018-02-11 09:59:18 -0500 |
---|---|---|
committer | Ley Foon Tan <ley.foon.tan@intel.com> | 2018-02-11 10:04:47 -0500 |
commit | 5d13c73179983f8692adf397e65f2f57c613a917 (patch) | |
tree | 80458c02e8798b906aa83f621a8d354ca161fe22 | |
parent | d8a5b80568a9cb66810e75b182018e9edb68e8ff (diff) |
nios2: dts: Remove leading 0x and 0s from bindings notation
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 -E -i -e "s/@0x([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" -e "s/@0+([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" {} +
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 is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")
Reported-by: David Daney <ddaney@caviumnetworks.com>
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
Acked-by: Ley Foon Tan <ley.foon.tan@intel.com>
-rw-r--r-- | arch/nios2/boot/dts/3c120_devboard.dts | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/nios2/boot/dts/3c120_devboard.dts b/arch/nios2/boot/dts/3c120_devboard.dts index 36ccdf05837d..56f4b5df6d65 100644 --- a/arch/nios2/boot/dts/3c120_devboard.dts +++ b/arch/nios2/boot/dts/3c120_devboard.dts | |||
@@ -29,7 +29,7 @@ | |||
29 | #address-cells = <1>; | 29 | #address-cells = <1>; |
30 | #size-cells = <0>; | 30 | #size-cells = <0>; |
31 | 31 | ||
32 | cpu: cpu@0x0 { | 32 | cpu: cpu@0 { |
33 | device_type = "cpu"; | 33 | device_type = "cpu"; |
34 | compatible = "altr,nios2-1.0"; | 34 | compatible = "altr,nios2-1.0"; |
35 | reg = <0x00000000>; | 35 | reg = <0x00000000>; |
@@ -69,7 +69,7 @@ | |||
69 | compatible = "altr,avalon", "simple-bus"; | 69 | compatible = "altr,avalon", "simple-bus"; |
70 | bus-frequency = <125000000>; | 70 | bus-frequency = <125000000>; |
71 | 71 | ||
72 | pb_cpu_to_io: bridge@0x8000000 { | 72 | pb_cpu_to_io: bridge@8000000 { |
73 | compatible = "simple-bus"; | 73 | compatible = "simple-bus"; |
74 | reg = <0x08000000 0x00800000>; | 74 | reg = <0x08000000 0x00800000>; |
75 | #address-cells = <1>; | 75 | #address-cells = <1>; |
@@ -83,7 +83,7 @@ | |||
83 | <0x00008000 0x08008000 0x00000020>, | 83 | <0x00008000 0x08008000 0x00000020>, |
84 | <0x00400000 0x08400000 0x00000020>; | 84 | <0x00400000 0x08400000 0x00000020>; |
85 | 85 | ||
86 | timer_1ms: timer@0x400000 { | 86 | timer_1ms: timer@400000 { |
87 | compatible = "altr,timer-1.0"; | 87 | compatible = "altr,timer-1.0"; |
88 | reg = <0x00400000 0x00000020>; | 88 | reg = <0x00400000 0x00000020>; |
89 | interrupt-parent = <&cpu>; | 89 | interrupt-parent = <&cpu>; |
@@ -91,7 +91,7 @@ | |||
91 | clock-frequency = <125000000>; | 91 | clock-frequency = <125000000>; |
92 | }; | 92 | }; |
93 | 93 | ||
94 | timer_0: timer@0x8000 { | 94 | timer_0: timer@8000 { |
95 | compatible = "altr,timer-1.0"; | 95 | compatible = "altr,timer-1.0"; |
96 | reg = < 0x00008000 0x00000020 >; | 96 | reg = < 0x00008000 0x00000020 >; |
97 | interrupt-parent = < &cpu >; | 97 | interrupt-parent = < &cpu >; |
@@ -99,14 +99,14 @@ | |||
99 | clock-frequency = < 125000000 >; | 99 | clock-frequency = < 125000000 >; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | jtag_uart: serial@0x4d50 { | 102 | jtag_uart: serial@4d50 { |
103 | compatible = "altr,juart-1.0"; | 103 | compatible = "altr,juart-1.0"; |
104 | reg = <0x00004d50 0x00000008>; | 104 | reg = <0x00004d50 0x00000008>; |
105 | interrupt-parent = <&cpu>; | 105 | interrupt-parent = <&cpu>; |
106 | interrupts = <1>; | 106 | interrupts = <1>; |
107 | }; | 107 | }; |
108 | 108 | ||
109 | tse_mac: ethernet@0x4000 { | 109 | tse_mac: ethernet@4000 { |
110 | compatible = "altr,tse-1.0"; | 110 | compatible = "altr,tse-1.0"; |
111 | reg = <0x00004000 0x00000400>, | 111 | reg = <0x00004000 0x00000400>, |
112 | <0x00004400 0x00000040>, | 112 | <0x00004400 0x00000040>, |
@@ -133,7 +133,7 @@ | |||
133 | }; | 133 | }; |
134 | }; | 134 | }; |
135 | 135 | ||
136 | uart: serial@0x4c80 { | 136 | uart: serial@4c80 { |
137 | compatible = "altr,uart-1.0"; | 137 | compatible = "altr,uart-1.0"; |
138 | reg = <0x00004c80 0x00000020>; | 138 | reg = <0x00004c80 0x00000020>; |
139 | interrupt-parent = <&cpu>; | 139 | interrupt-parent = <&cpu>; |
@@ -143,7 +143,7 @@ | |||
143 | }; | 143 | }; |
144 | }; | 144 | }; |
145 | 145 | ||
146 | cfi_flash_64m: flash@0x0 { | 146 | cfi_flash_64m: flash@0 { |
147 | compatible = "cfi-flash"; | 147 | compatible = "cfi-flash"; |
148 | reg = <0x00000000 0x04000000>; | 148 | reg = <0x00000000 0x04000000>; |
149 | bank-width = <2>; | 149 | bank-width = <2>; |