Skip to contentSkip to conversation

arm: imx: dts: Remove leading 0x and 0s from bindings notation

PATCH Applied Mathieu Malaterre 3 participants 7 messages Dec 15, 2017 – Dec 26, 2017

Subsystems (2)

v1 of 3 Applied Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 5/25 arm: imx: 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 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")

---
 arch/arm/boot/dts/imx6q-display5.dtsi | 2 +-
 arch/arm/boot/dts/imx7d.dtsi          | 2 +-
 arch/arm/boot/dts/imx7s.dtsi          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx6q-display5.dtsi +1 -1
index 4084de43d4d9..09085fde3341 100644
@@ -255,7 +255,7 @@
 	pinctrl-0 = <&pinctrl_i2c1>;
 	status = "okay";
 
-	codec: tfa9879 at 6C {
+	codec: tfa9879 at 6c {
 		#sound-dai-cells = <0>;
 		compatible = "nxp,tfa9879";
 		reg = <0x6C>;
arch/arm/boot/dts/imx7d.dtsi +1 -1
index 4d308d17f040..369d5a166b3e 100644
@@ -129,7 +129,7 @@
 		status = "disabled";
 	};
 
-	pcie: pcie at 0x33800000 {
+	pcie: pcie at 33800000 {
 		compatible = "fsl,imx7d-pcie", "snps,dw-pcie";
 		reg = <0x33800000 0x4000>,
 		      <0x4ff00000 0x80000>;
arch/arm/boot/dts/imx7s.dtsi +1 -1
index 82ad26e766eb..a00ba897e58d 100644
@@ -583,7 +583,7 @@
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					pgc_pcie_phy: pgc-power-domain at IMX7_POWER_DOMAIN_PCIE_PHY {
+					pgc_pcie_phy: pgc-power-domain at imx7_power_domain_pcie_phy {
 						#power-domain-cells = <0>;
 						reg = <IMX7_POWER_DOMAIN_PCIE_PHY>;
 						power-supply = <&reg_1p0d>;
Signature · 1 line
2.11.0
reviewer
#1 lore raw

Hi Mathieu,

On Fri, Dec 15, 2017 at 10:46 AM, Mathieu Malaterre <[email protected]> wrote:

                 reg = <0x6C>;

arch/arm/boot/dts/imx7d.dtsi line 132

Quoted 10 lines
arch/arm/boot/dts/imx7d.dtsi +1 -1
index 4d308d17f040..369d5a166b3e 100644
@@ -129,7 +129,7 @@
                status = "disabled";
        };
 
-       pcie: pcie at 0x33800000 {
+       pcie: pcie at 33800000 {

I have already sent a fix for this one.

arch/arm/boot/dts/imx7s.dtsi line 586

Quoted 13 lines
arch/arm/boot/dts/imx7d.dtsi +0 -0
                compatible = "fsl,imx7d-pcie", "snps,dw-pcie";
                reg = <0x33800000 0x4000>,
                      <0x4ff00000 0x80000>;
arch/arm/boot/dts/imx7s.dtsi +1 -1
index 82ad26e766eb..a00ba897e58d 100644
@@ -583,7 +583,7 @@
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       pgc_pcie_phy: pgc-power-domain at IMX7_POWER_DOMAIN_PCIE_PHY {
+                                       pgc_pcie_phy: pgc-power-domain at imx7_power_domain_pcie_phy {

Original code was correct.

#2 lore raw

PATCH v2 1/1 arm: imx: dts: Remove leading 0x and 0s from bindings notation

In reply to Mathieu Malaterre

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")

---
v2: Remove invalid patch for imx7s.dtsi, remove duplicate patch for imx7d.dtsi

 arch/arm/boot/dts/imx6q-display5.dtsi | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/boot/dts/imx6q-display5.dtsi +1 -1
index 4084de43d4d9..09085fde3341 100644
@@ -255,7 +255,7 @@
 	pinctrl-0 = <&pinctrl_i2c1>;
 	status = "okay";
 
-	codec: tfa9879 at 6C {
+	codec: tfa9879 at 6c {
 		#sound-dai-cells = <0>;
 		compatible = "nxp,tfa9879";
 		reg = <0x6C>;
Signature · 1 line
2.11.0
reviewer
#3 lore raw

HI Mathieu,

arch/arm/boot/dts/imx6q-display5.dtsi line 258

Quoted 10 lines · Mathieu Malaterre
arch/arm/boot/dts/imx6q-display5.dtsi +1 -1
index 4084de43d4d9..09085fde3341 100644
@@ -255,7 +255,7 @@
        pinctrl-0 = <&pinctrl_i2c1>;
        status = "okay";
 
-       codec: tfa9879 at 6C {
+       codec: tfa9879 at 6c {

This change is fine, but it no longer matches the Subject and commit log.

#4 lore raw

PATCH v3 1/1 arm: imx: dts: Use lower case for bindings notation

In reply to Mathieu Malaterre

Improve the DTS files using lower case to fix the following dtc warnings:

Warning (simple_bus_reg): Node /XXX@<UPPER> simple-bus unit address format error, expected "<lower>"

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 is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")

---
v2: Remove invalid patch for imx7s.dtsi, remove duplicate patch for imx7d.dtsi
v3: Clarify the commit message

 arch/arm/boot/dts/imx6q-display5.dtsi | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/boot/dts/imx6q-display5.dtsi +1 -1
index 4084de43d4d9..09085fde3341 100644
@@ -255,7 +255,7 @@
 	pinctrl-0 = <&pinctrl_i2c1>;
 	status = "okay";
 
-	codec: tfa9879 at 6C {
+	codec: tfa9879 at 6c {
 		#sound-dai-cells = <0>;
 		compatible = "nxp,tfa9879";
 		reg = <0x6C>;
Signature · 1 line
2.11.0
reviewer Reviewed-by on v3 1/1
#5 lore raw

Re: [PATCH v3] arm: imx: dts: Use lower case for bindings notation

Quoted 14 lines · Mathieu Malaterre

Improve the DTS files using lower case to fix the following dtc warnings:

Warning (simple_bus_reg): Node /XXX@<UPPER> simple-bus unit address format error, expected "<lower>"

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:

Quoted 7 lines

https://elinux.org/Device_Tree_Linux#Linux_conventions

This is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")

Applied
#6 lore raw

Re: [PATCH v3] arm: imx: dts: Use lower case for bindings notation

In reply to Mathieu Malaterre
Quoted 14 lines · Mathieu Malaterre

Improve the DTS files using lower case to fix the following dtc warnings:

Warning (simple_bus_reg): Node /XXX@<UPPER> simple-bus unit address format error, expected "<lower>"

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:

Quoted 7 lines

https://elinux.org/Device_Tree_Linux#Linux_conventions

This is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")

Applied, thanks.