Re: [PATCH] mips: dts: Remove leading 0x and 0s from bindings notation
From: James Hogan
Date: Tue Jan 23 2018 - 06:44:19 EST
On Thu, Dec 14, 2017 at 05:53:56PM +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 -E -i -e "s/@0x([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" -e "s/@0+([0-9a-fA-F\.]+)\s?\{/@\L\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
> 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")
>
> Reported-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
> Suggested-by: Rob Herring <robh@xxxxxxxxxx>
> Signed-off-by: Mathieu Malaterre <malat@xxxxxxxxxx>
> ---
> arch/mips/boot/dts/img/boston.dts | 2 +-
> arch/mips/boot/dts/ingenic/ci20.dts | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/mips/boot/dts/img/boston.dts b/arch/mips/boot/dts/img/boston.dts
> index 2cd49b60e030..1bd105428f61 100644
> --- a/arch/mips/boot/dts/img/boston.dts
> +++ b/arch/mips/boot/dts/img/boston.dts
> @@ -157,7 +157,7 @@
> #address-cells = <1>;
> #size-cells = <0>;
>
> - rtc@0x68 {
> + rtc@68 {
> compatible = "st,m41t81s";
> reg = <0x68>;
> };
> diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
> index a4cc52214dbd..7d5e49e40b0d 100644
> --- a/arch/mips/boot/dts/ingenic/ci20.dts
> +++ b/arch/mips/boot/dts/ingenic/ci20.dts
> @@ -110,22 +110,22 @@
> reg = <0x0 0x0 0x0 0x800000>;
> };
>
> - partition@0x800000 {
> + partition@800000 {
> label = "u-boot";
> reg = <0x0 0x800000 0x0 0x200000>;
> };
>
> - partition@0xa00000 {
> + partition@a00000 {
> label = "u-boot-env";
> reg = <0x0 0xa00000 0x0 0x200000>;
> };
>
> - partition@0xc00000 {
> + partition@c00000 {
> label = "boot";
> reg = <0x0 0xc00000 0x0 0x4000000>;
> };
>
> - partition@0x8c00000 {
> + partition@8c00000 {
> label = "system";
> reg = <0x0 0x4c00000 0x1 0xfb400000>;
should that one actually be called partition@4c00000?
Cheers
James
> };
> --
> 2.11.0
>
>
Attachment:
signature.asc
Description: Digital signature