Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed4ced0c authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Alexandre Belloni
Browse files

ARM: dts: at91: 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 avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 42ed5355
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@
			status = "disabled";
			status = "disabled";
		};
		};


		fb0: fb@0x00600000 {
		fb0: fb@600000 {
			compatible = "atmel,at91sam9261-lcdc";
			compatible = "atmel,at91sam9261-lcdc";
			reg = <0x00600000 0x1000>;
			reg = <0x00600000 0x1000>;
			interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
			interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@
			status = "okay";
			status = "okay";
		};
		};


		fb0: fb@0x00600000 {
		fb0: fb@600000 {
			display = <&display0>;
			display = <&display0>;
			atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>;
			atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>;
			status = "okay";
			status = "okay";
+1 −1
Original line number Original line Diff line number Diff line
@@ -999,7 +999,7 @@
			};
			};
		};
		};


		fb0: fb@0x00700000 {
		fb0: fb@700000 {
			compatible = "atmel,at91sam9263-lcdc";
			compatible = "atmel,at91sam9263-lcdc";
			reg = <0x00700000 0x1000>;
			reg = <0x00700000 0x1000>;
			interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;
			interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;
+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@
			};
			};
		};
		};


		fb0: fb@0x00700000 {
		fb0: fb@700000 {
			display = <&display0>;
			display = <&display0>;
			status = "okay";
			status = "okay";


+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@
			};
			};


			i2c0: i2c@f8010000 {
			i2c0: i2c@f8010000 {
				ov2640: camera@0x30 {
				ov2640: camera@30 {
					compatible = "ovti,ov2640";
					compatible = "ovti,ov2640";
					reg = <0x30>;
					reg = <0x30>;
					pinctrl-names = "default";
					pinctrl-names = "default";
Loading