]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: dts: lpc32xx: Remove leading 0x and 0s from bindings notation
authorMathieu Malaterre <malat@debian.org>
Fri, 15 Dec 2017 12:46:39 +0000 (13:46 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Apr 2019 20:33:12 +0000 (22:33 +0200)
[ Upstream commit 3e3380d0675d5e20b0af067d60cb947a4348bf9b ]

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" {} +

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 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>
[vzapolskiy: fixed commit message to pass checkpatch.pl test]
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/lpc32xx.dtsi

index abff7ef7c9cd6a571a5966ff75f473215c737233..4981741377f3add795d403e8afa3588593d916c7 100644 (file)
                                status = "disabled";
                        };
 
-                       i2s1: i2s@2009C000 {
+                       i2s1: i2s@2009c000 {
                                compatible = "nxp,lpc3220-i2s";
                                reg = <0x2009C000 0x1000>;
                        };
                                status = "disabled";
                        };
 
-                       i2c1: i2c@400A0000 {
+                       i2c1: i2c@400a0000 {
                                compatible = "nxp,pnx-i2c";
                                reg = <0x400A0000 0x100>;
                                interrupt-parent = <&sic1>;
                                clocks = <&clk LPC32XX_CLK_I2C1>;
                        };
 
-                       i2c2: i2c@400A8000 {
+                       i2c2: i2c@400a8000 {
                                compatible = "nxp,pnx-i2c";
                                reg = <0x400A8000 0x100>;
                                interrupt-parent = <&sic1>;
                                clocks = <&clk LPC32XX_CLK_I2C2>;
                        };
 
-                       mpwm: mpwm@400E8000 {
+                       mpwm: mpwm@400e8000 {
                                compatible = "nxp,lpc3220-motor-pwm";
                                reg = <0x400E8000 0x78>;
                                status = "disabled";
                                #gpio-cells = <3>; /* bank, pin, flags */
                        };
 
-                       timer4: timer@4002C000 {
+                       timer4: timer@4002c000 {
                                compatible = "nxp,lpc3220-timer";
                                reg = <0x4002C000 0x1000>;
                                interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
                                status = "disabled";
                        };
 
-                       watchdog: watchdog@4003C000 {
+                       watchdog: watchdog@4003c000 {
                                compatible = "nxp,pnx4008-wdt";
                                reg = <0x4003C000 0x1000>;
                                clocks = <&clk LPC32XX_CLK_WDOG>;
                                status = "disabled";
                        };
 
-                       timer1: timer@4004C000 {
+                       timer1: timer@4004c000 {
                                compatible = "nxp,lpc3220-timer";
                                reg = <0x4004C000 0x1000>;
                                interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
                                status = "disabled";
                        };
 
-                       pwm1: pwm@4005C000 {
+                       pwm1: pwm@4005c000 {
                                compatible = "nxp,lpc3220-pwm";
                                reg = <0x4005C000 0x4>;
                                clocks = <&clk LPC32XX_CLK_PWM1>;
                                status = "disabled";
                        };
 
-                       pwm2: pwm@4005C004 {
+                       pwm2: pwm@4005c004 {
                                compatible = "nxp,lpc3220-pwm";
                                reg = <0x4005C004 0x4>;
                                clocks = <&clk LPC32XX_CLK_PWM2>;