mips: dts: Remove leading 0x and 0s from bindings notation
PATCH 1/1 mips: 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")
--- arch/mips/boot/dts/img/boston.dts | 2 +- arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/mips/boot/dts/img/boston.dts +1 -1
@@ -157,7 +157,7 @@ #address-cells = <1>; #size-cells = <0>; - rtc@0x68 { + rtc@68 { compatible = "st,m41t81s"; reg = <0x68>; };
arch/mips/boot/dts/ingenic/ci20.dts +4 -4
@@ -110,22 +110,22 @@ reg = <0x0 0x0 0x0 0x800000>; }; - partition@0x800000 { + partition@800000 { label = "u-boot"; reg = <0x0 0x800000 0x0 0x200000>; }; - partition@0xa00000 { + partition@a00000 { label = "u-boot-env"; reg = <0x0 0xa00000 0x0 0x200000>; }; - partition@0xc00000 { + partition@c00000 { label = "boot"; reg = <0x0 0xc00000 0x0 0x4000000>; }; - partition@0x8c00000 { + partition@8c00000 { label = "system"; reg = <0x0 0x4c00000 0x1 0xfb400000>; };
Signature · 1 line
2.11.0
Quoted 64 lines · Mathieu Malaterre
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 0sConverted 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 <[email protected]>Suggested-by Rob Herring <[email protected]>Signed-off-by Mathieu Malaterre <[email protected]>--- arch/mips/boot/dts/img/boston.dts | 2 +- arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)arch/mips/boot/dts/img/boston.dts +1
-1@@ -157,7 +157,7 @@ #address-cells = <1>; #size-cells = <0>; - rtc@0x68 { + rtc@68 { compatible = "st,m41t81s"; reg = <0x68>; };arch/mips/boot/dts/ingenic/ci20.dts +2
-2@@ -110,22 +110,22 @@ reg = <0x0 0x0 0x0 0x800000>; }; - partition@0x800000 { + partition@800000 { label = "u-boot"; reg = <0x0 0x800000 0x0 0x200000>; }; - partition@0xa00000 { + partition@a00000 { label = "u-boot-env"; reg = <0x0 0xa00000 0x0 0x200000>; };
arch/mips/boot/dts/ingenic/ci20.dts line 130
Quoted 10 lines
arch/mips/boot/dts/ingenic/ci20.dts +2
-2- partition@0xc00000 { + partition@c00000 { label = "boot"; reg = <0x0 0xc00000 0x0 0x4000000>; }; - partition@0x8c00000 { + partition@8c00000 { label = "system"; reg = <0x0 0x4c00000 0x1 0xfb400000>;
should that one actually be called partition@4c00000?
Cheers
James
Quoted 5 lines
arch/mips/boot/dts/ingenic/ci20.dts +0
-0};Signature · 1 line
2.11.0
PATCH v2 1/2 mips: dts: Remove leading 0x and 0s from bindings notation
In reply to Mathieu MalaterreImprove 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")
--- arch/mips/boot/dts/img/boston.dts | 2 +- arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/mips/boot/dts/img/boston.dts +1 -1
@@ -157,7 +157,7 @@ #address-cells = <1>; #size-cells = <0>; - rtc@0x68 { + rtc@68 { compatible = "st,m41t81s"; reg = <0x68>; };
arch/mips/boot/dts/ingenic/ci20.dts +4 -4
@@ -110,22 +110,22 @@ reg = <0x0 0x0 0x0 0x800000>; }; - partition@0x800000 { + partition@800000 { label = "u-boot"; reg = <0x0 0x800000 0x0 0x200000>; }; - partition@0xa00000 { + partition@a00000 { label = "u-boot-env"; reg = <0x0 0xa00000 0x0 0x200000>; }; - partition@0xc00000 { + partition@c00000 { label = "boot"; reg = <0x0 0xc00000 0x0 0x4000000>; }; - partition@0x8c00000 { + partition@8c00000 { label = "system"; reg = <0x0 0x4c00000 0x1 0xfb400000>; };
Signature · 6 lines
2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 2/2 mips: dts: Fix a typo in the node unit name
The unit name was 8c00000 but since the reg property is declared as:
reg = <0x0 0x4c00000 0x1 0xfb400000>;
the unit name should have been instead 4c00000.
Tested on MIPS Creator CI20 (v1):
$ cat /sys/firmware/devicetree/.../partitions/partition@4c00000/label;echo system
--- arch/mips/boot/dts/ingenic/ci20.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/boot/dts/ingenic/ci20.dts +1 -1
@@ -125,7 +125,7 @@ reg = <0x0 0xc00000 0x0 0x4000000>; }; - partition@8c00000 { + partition@4c00000 { label = "system"; reg = <0x0 0x4c00000 0x1 0xfb400000>; };
Signature · 1 line
2.11.0