Commit e519eedb authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Arnd Bergmann

arm: zx: 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 -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 4c9847b7 ("dt-bindings: Remove leading 0x from bindings notation")
Reported-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Suggested-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarMathieu Malaterre <malat@debian.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 9977a8c3
...@@ -56,7 +56,7 @@ global_timer: timer@8000200 { ...@@ -56,7 +56,7 @@ global_timer: timer@8000200 {
clocks = <&topclk ZX296702_A9_PERIPHCLK>; clocks = <&topclk ZX296702_A9_PERIPHCLK>;
}; };
l2cc: l2-cache-controller@0x00c00000 { l2cc: l2-cache-controller@c00000 {
compatible = "arm,pl310-cache"; compatible = "arm,pl310-cache";
reg = <0x00c00000 0x1000>; reg = <0x00c00000 0x1000>;
cache-unified; cache-unified;
...@@ -67,30 +67,30 @@ l2cc: l2-cache-controller@0x00c00000 { ...@@ -67,30 +67,30 @@ l2cc: l2-cache-controller@0x00c00000 {
arm,double-linefill-incr = <0>; arm,double-linefill-incr = <0>;
}; };
pcu: pcu@0xa0008000 { pcu: pcu@a0008000 {
compatible = "zte,zx296702-pcu"; compatible = "zte,zx296702-pcu";
reg = <0xa0008000 0x1000>; reg = <0xa0008000 0x1000>;
}; };
topclk: topclk@0x09800000 { topclk: topclk@9800000 {
compatible = "zte,zx296702-topcrm-clk"; compatible = "zte,zx296702-topcrm-clk";
reg = <0x09800000 0x1000>; reg = <0x09800000 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;
}; };
lsp1clk: lsp1clk@0x09400000 { lsp1clk: lsp1clk@9400000 {
compatible = "zte,zx296702-lsp1crpm-clk"; compatible = "zte,zx296702-lsp1crpm-clk";
reg = <0x09400000 0x1000>; reg = <0x09400000 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;
}; };
lsp0clk: lsp0clk@0x0b000000 { lsp0clk: lsp0clk@b000000 {
compatible = "zte,zx296702-lsp0crpm-clk"; compatible = "zte,zx296702-lsp0crpm-clk";
reg = <0x0b000000 0x1000>; reg = <0x0b000000 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;
}; };
uart0: serial@0x09405000 { uart0: serial@9405000 {
compatible = "zte,zx296702-uart"; compatible = "zte,zx296702-uart";
reg = <0x09405000 0x1000>; reg = <0x09405000 0x1000>;
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
...@@ -98,7 +98,7 @@ uart0: serial@0x09405000 { ...@@ -98,7 +98,7 @@ uart0: serial@0x09405000 {
status = "disabled"; status = "disabled";
}; };
uart1: serial@0x09406000 { uart1: serial@9406000 {
compatible = "zte,zx296702-uart"; compatible = "zte,zx296702-uart";
reg = <0x09406000 0x1000>; reg = <0x09406000 0x1000>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
...@@ -106,7 +106,7 @@ uart1: serial@0x09406000 { ...@@ -106,7 +106,7 @@ uart1: serial@0x09406000 {
status = "disabled"; status = "disabled";
}; };
mmc0: mmc@0x09408000 { mmc0: mmc@9408000 {
compatible = "snps,dw-mshc"; compatible = "snps,dw-mshc";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -119,7 +119,7 @@ mmc0: mmc@0x09408000 { ...@@ -119,7 +119,7 @@ mmc0: mmc@0x09408000 {
status = "disabled"; status = "disabled";
}; };
mmc1: mmc@0x0b003000 { mmc1: mmc@b003000 {
compatible = "snps,dw-mshc"; compatible = "snps,dw-mshc";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -132,7 +132,7 @@ mmc1: mmc@0x0b003000 { ...@@ -132,7 +132,7 @@ mmc1: mmc@0x0b003000 {
status = "disabled"; status = "disabled";
}; };
sysctrl: sysctrl@0xa0007000 { sysctrl: sysctrl@a0007000 {
compatible = "zte,sysctrl", "syscon"; compatible = "zte,sysctrl", "syscon";
reg = <0xa0007000 0x1000>; reg = <0xa0007000 0x1000>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment