| Message ID | 20200226035914.23582-1-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f215c5ef7c404c1926f5dd9bd2e6d58055268af3 |
| Headers | show |
| Series | [1/2] ARM: dts: uniphier: rename NAND node names to follow json-schema | expand |
On Wed, Feb 26, 2020 at 1:00 PM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > Follow the standard nodename pattern "^nand-controller(@.*)?" defined > in Documentation/devicetree/bindings/mtd/nand-controller.yaml > > Otherwise, after the dt-binding is converted to json-schema, > 'make ARCH=arm dtbs_check' will show a warning like this: > > nand@68000000: $nodename:0: 'nand@68000000' does not match '^nand-controller(@.*)?' > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Applied to linux-uniphier. > arch/arm/boot/dts/uniphier-ld4.dtsi | 2 +- > arch/arm/boot/dts/uniphier-pro4.dtsi | 2 +- > arch/arm/boot/dts/uniphier-pro5.dtsi | 2 +- > arch/arm/boot/dts/uniphier-pxs2.dtsi | 2 +- > arch/arm/boot/dts/uniphier-sld8.dtsi | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi > index 23b8fd627c00..197bee7d8b7f 100644 > --- a/arch/arm/boot/dts/uniphier-ld4.dtsi > +++ b/arch/arm/boot/dts/uniphier-ld4.dtsi > @@ -398,7 +398,7 @@ > }; > }; > > - nand: nand@68000000 { > + nand: nand-controller@68000000 { > compatible = "socionext,uniphier-denali-nand-v5a"; > status = "disabled"; > reg-names = "nand_data", "denali_reg"; > diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi > index eb06c353970f..b02bc8a6346b 100644 > --- a/arch/arm/boot/dts/uniphier-pro4.dtsi > +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi > @@ -588,7 +588,7 @@ > }; > }; > > - nand: nand@68000000 { > + nand: nand-controller@68000000 { > compatible = "socionext,uniphier-denali-nand-v5a"; > status = "disabled"; > reg-names = "nand_data", "denali_reg"; > diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi > index c95eb44c816d..f84a43a10f38 100644 > --- a/arch/arm/boot/dts/uniphier-pro5.dtsi > +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi > @@ -453,7 +453,7 @@ > }; > }; > > - nand: nand@68000000 { > + nand: nand-controller@68000000 { > compatible = "socionext,uniphier-denali-nand-v5b"; > status = "disabled"; > reg-names = "nand_data", "denali_reg"; > diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi > index c054d0175df9..989b2a241822 100644 > --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi > +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi > @@ -761,7 +761,7 @@ > }; > }; > > - nand: nand@68000000 { > + nand: nand-controller@68000000 { > compatible = "socionext,uniphier-denali-nand-v5b"; > status = "disabled"; > reg-names = "nand_data", "denali_reg"; > diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi > index a05061038e78..fbfd25050a04 100644 > --- a/arch/arm/boot/dts/uniphier-sld8.dtsi > +++ b/arch/arm/boot/dts/uniphier-sld8.dtsi > @@ -402,7 +402,7 @@ > }; > }; > > - nand: nand@68000000 { > + nand: nand-controller@68000000 { > compatible = "socionext,uniphier-denali-nand-v5a"; > status = "disabled"; > reg-names = "nand_data", "denali_reg"; > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi index 23b8fd627c00..197bee7d8b7f 100644 --- a/arch/arm/boot/dts/uniphier-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ld4.dtsi @@ -398,7 +398,7 @@ }; }; - nand: nand@68000000 { + nand: nand-controller@68000000 { compatible = "socionext,uniphier-denali-nand-v5a"; status = "disabled"; reg-names = "nand_data", "denali_reg"; diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi index eb06c353970f..b02bc8a6346b 100644 --- a/arch/arm/boot/dts/uniphier-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi @@ -588,7 +588,7 @@ }; }; - nand: nand@68000000 { + nand: nand-controller@68000000 { compatible = "socionext,uniphier-denali-nand-v5a"; status = "disabled"; reg-names = "nand_data", "denali_reg"; diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi index c95eb44c816d..f84a43a10f38 100644 --- a/arch/arm/boot/dts/uniphier-pro5.dtsi +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi @@ -453,7 +453,7 @@ }; }; - nand: nand@68000000 { + nand: nand-controller@68000000 { compatible = "socionext,uniphier-denali-nand-v5b"; status = "disabled"; reg-names = "nand_data", "denali_reg"; diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi index c054d0175df9..989b2a241822 100644 --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi @@ -761,7 +761,7 @@ }; }; - nand: nand@68000000 { + nand: nand-controller@68000000 { compatible = "socionext,uniphier-denali-nand-v5b"; status = "disabled"; reg-names = "nand_data", "denali_reg"; diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi index a05061038e78..fbfd25050a04 100644 --- a/arch/arm/boot/dts/uniphier-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-sld8.dtsi @@ -402,7 +402,7 @@ }; }; - nand: nand@68000000 { + nand: nand-controller@68000000 { compatible = "socionext,uniphier-denali-nand-v5a"; status = "disabled"; reg-names = "nand_data", "denali_reg";
Follow the standard nodename pattern "^nand-controller(@.*)?" defined in Documentation/devicetree/bindings/mtd/nand-controller.yaml Otherwise, after the dt-binding is converted to json-schema, 'make ARCH=arm dtbs_check' will show a warning like this: nand@68000000: $nodename:0: 'nand@68000000' does not match '^nand-controller(@.*)?' Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/boot/dts/uniphier-ld4.dtsi | 2 +- arch/arm/boot/dts/uniphier-pro4.dtsi | 2 +- arch/arm/boot/dts/uniphier-pro5.dtsi | 2 +- arch/arm/boot/dts/uniphier-pxs2.dtsi | 2 +- arch/arm/boot/dts/uniphier-sld8.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)