[PATCH 05/25] arm: imx: dts: Remove leading 0x and 0s from bindings notation

Shawn Guo shawnguo at kernel.org
Mon Dec 25 20:17:34 PST 2017


On Fri, Dec 15, 2017 at 12:15:55PM +0100, Mathieu Malaterre wrote:
> 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 at caviumnetworks.com>
> Suggested-by: Rob Herring <robh at kernel.org>
> Signed-off-by: Mathieu Malaterre <malat at debian.org>
> ---
>  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(-)
> 
> diff --git a/arch/arm/boot/dts/imx6q-display5.dtsi b/arch/arm/boot/dts/imx6q-display5.dtsi
> index 4084de43d4d9..09085fde3341 100644
> --- a/arch/arm/boot/dts/imx6q-display5.dtsi
> +++ b/arch/arm/boot/dts/imx6q-display5.dtsi
> @@ -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>;
> diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
> index 4d308d17f040..369d5a166b3e 100644
> --- a/arch/arm/boot/dts/imx7d.dtsi
> +++ b/arch/arm/boot/dts/imx7d.dtsi
> @@ -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>;
> diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
> index 82ad26e766eb..a00ba897e58d 100644
> --- a/arch/arm/boot/dts/imx7s.dtsi
> +++ b/arch/arm/boot/dts/imx7s.dtsi
> @@ -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 {

I think this is broken, as IMX7_POWER_DOMAIN_PCIE_PHY is a define here.

Shawn

>  						#power-domain-cells = <0>;
>  						reg = <IMX7_POWER_DOMAIN_PCIE_PHY>;
>  						power-supply = <&reg_1p0d>;
> -- 
> 2.11.0
> 



More information about the Linux-rockchip mailing list