OSDN Git Service

ARM: dts: am3/am4/dra7/omap: Remove leading 0x and 0s from bindings notation
authorMathieu Malaterre <malat@debian.org>
Fri, 15 Dec 2017 12:46:51 +0000 (13:46 +0100)
committerTony Lindgren <tony@atomide.com>
Fri, 15 Dec 2017 16:36:06 +0000 (08:36 -0800)
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 <ddaney@caviumnetworks.com>
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am3517.dtsi
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/dra62x-j5eco-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/omap3-cm-t3x.dtsi
arch/arm/boot/dts/omap3-evm-37xx.dts
arch/arm/boot/dts/omap3-lilly-a83x.dtsi

index d37f950..6699fcb 100644 (file)
                        status = "disabled";
                };
 
-               mailbox: mailbox@480C8000 {
+               mailbox: mailbox@480c8000 {
                        compatible = "ti,omap4-mailbox";
                        reg = <0x480C8000 0x200>;
                        interrupts = <77>;
                        dma-names = "tx", "rx";
                };
 
-               mcasp1: mcasp@4803C000 {
+               mcasp1: mcasp@4803c000 {
                        compatible = "ti,am33xx-mcasp-audio";
                        ti,hwmods = "mcasp1";
                        reg = <0x4803C000 0x2000>,
index 00da3f2..7699416 100644 (file)
@@ -26,7 +26,7 @@
                        interrupt-names = "mc";
                };
 
-               davinci_emac: ethernet@0x5c000000 {
+               davinci_emac: ethernet@5c000000 {
                        compatible = "ti,am3517-emac";
                        ti,hwmods = "davinci_emac";
                        status = "disabled";
@@ -41,7 +41,7 @@
                        local-mac-address = [ 00 00 00 00 00 00 ];
                };
 
-               davinci_mdio: ethernet@0x5c030000 {
+               davinci_mdio: ethernet@5c030000 {
                        compatible = "ti,davinci_mdio";
                        ti,hwmods = "davinci_mdio";
                        status = "disabled";
index 4714a59..5aff7f0 100644 (file)
                        status = "disabled";
                };
 
-               mailbox: mailbox@480C8000 {
+               mailbox: mailbox@480c8000 {
                        compatible = "ti,omap4-mailbox";
                        reg = <0x480C8000 0x200>;
                        interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
                        dma-names = "tx", "rx";
                };
 
-               mcasp1: mcasp@4803C000 {
+               mcasp1: mcasp@4803c000 {
                        compatible = "ti,am33xx-mcasp-audio";
                        ti,hwmods = "mcasp1";
                        reg = <0x4803C000 0x2000>,
index 155eb32..fee0547 100644 (file)
                        label = "X-Loader";
                        reg = <0 0x80000>;
                };
-               partition@0x80000 {
+               partition@80000 {
                        label = "U-Boot";
                        reg = <0x80000 0x1c0000>;
                };
-               partition@0x1c0000 {
+               partition@1c0000 {
                        label = "Environment";
                        reg = <0x240000 0x40000>;
                };
-               partition@0x280000 {
+               partition@280000 {
                        label = "Kernel";
                        reg = <0x280000 0x500000>;
                };
-               partition@0x780000 {
+               partition@780000 {
                        label = "Filesystem";
                        reg = <0x780000 0xf880000>;
                };
index 0ed9fb2..d8eb163 100644 (file)
                        ranges;
                        reg = <0x4a090000 0x20>;
                        ti,hwmods = "ocp2scp3";
-                       sata_phy: phy@4A096000 {
+                       sata_phy: phy@4a096000 {
                                compatible = "ti,phy-pipe3-sata";
                                reg = <0x4A096000 0x80>, /* phy_rx */
                                      <0x4A096400 0x64>, /* phy_tx */
index ab6003f..9dcb18d 100644 (file)
                        label = "xloader";
                        reg = <0 0x80000>;
                };
-               partition@0x80000 {
+               partition@80000 {
                        label = "uboot";
                        reg = <0x80000 0x1e0000>;
                };
-               partition@0x260000 {
+               partition@260000 {
                        label = "uboot environment";
                        reg = <0x260000 0x40000>;
                };
-               partition@0x2a0000 {
+               partition@2a0000 {
                        label = "linux";
                        reg = <0x2a0000 0x400000>;
                };
-               partition@0x6a0000 {
+               partition@6a0000 {
                        label = "rootfs";
                        reg = <0x6a0000 0x1f880000>;
                };
index 5a4ba0a..a14303b 100644 (file)
                        label = "X-Loader";
                        reg = <0 0x80000>;
                };
-               partition@0x80000 {
+               partition@80000 {
                        label = "U-Boot";
                        reg = <0x80000 0x1c0000>;
                };
-               partition@0x1c0000 {
+               partition@1c0000 {
                        label = "Environment";
                        reg = <0x240000 0x40000>;
                };
-               partition@0x280000 {
+               partition@280000 {
                        label = "Kernel";
                        reg = <0x280000 0x500000>;
                };
-               partition@0x780000 {
+               partition@780000 {
                        label = "Filesystem";
                        reg = <0x780000 0x1f880000>;
                };
index 7ada1e9..cf7a2a7 100644 (file)
                        reg = <0 0x80000>;
                };
 
-               partition@0x80000 {
+               partition@80000 {
                        label = "u-boot";
                        reg = <0x80000 0x1e0000>;
                };
 
-               partition@0x260000 {
+               partition@260000 {
                        label = "u-boot-environment";
                        reg = <0x260000 0x20000>;
                };
 
-               partition@0x280000 {
+               partition@280000 {
                        label = "kernel";
                        reg = <0x280000 0x500000>;
                };
 
-               partition@0x780000 {
+               partition@780000 {
                        label = "filesystem";
                        reg = <0x780000 0xf880000>;
                };