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

Commit 9b490b3d authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Tony Lindgren
Browse files

ARM: dts: am3/am4/dra7/omap: 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 avatarTony Lindgren <tony@atomide.com>
parent a3886730
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@
			status = "disabled";
		};

		mailbox: mailbox@480C8000 {
		mailbox: mailbox@480c8000 {
			compatible = "ti,omap4-mailbox";
			reg = <0x480C8000 0x200>;
			interrupts = <77>;
@@ -991,7 +991,7 @@
			dma-names = "tx", "rx";
		};

		mcasp1: mcasp@4803C000 {
		mcasp1: mcasp@4803c000 {
			compatible = "ti,am33xx-mcasp-audio";
			ti,hwmods = "mcasp1";
			reg = <0x4803C000 0x2000>,
+2 −2
Original line number Diff line number Diff line
@@ -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";
+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@
			status = "disabled";
		};

		mailbox: mailbox@480C8000 {
		mailbox: mailbox@480c8000 {
			compatible = "ti,omap4-mailbox";
			reg = <0x480C8000 0x200>;
			interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
@@ -936,7 +936,7 @@
			dma-names = "tx", "rx";
		};

		mcasp1: mcasp@4803C000 {
		mcasp1: mcasp@4803c000 {
			compatible = "ti,am33xx-mcasp-audio";
			ti,hwmods = "mcasp1";
			reg = <0x4803C000 0x2000>,
+4 −4
Original line number Diff line number Diff line
@@ -74,19 +74,19 @@
			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>;
		};
+1 −1
Original line number Diff line number Diff line
@@ -1373,7 +1373,7 @@
			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 */
Loading