| Message ID | 20200226035914.23582-2-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | fcb0e53c226e20626890e885c3542f3fe4a26133 |
| 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=arm64 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/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 2 +- > arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 +- > arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi > index 2e53daca9f5c..d61da3a62712 100644 > --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi > +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi > @@ -621,7 +621,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/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi > index be984200a70e..98f0f4eb0649 100644 > --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi > +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi > @@ -925,7 +925,7 @@ > socionext,syscon = <&soc_glue>; > }; > > - 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/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi > index 994fea7b12c1..4c6cd3ec541d 100644 > --- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi > +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi > @@ -783,7 +783,7 @@ > socionext,syscon = <&soc_glue>; > }; > > - nand: nand@68000000 { > + nand: nand-controller@68000000 { > compatible = "socionext,uniphier-denali-nand-v5b"; > status = "disabled"; > reg-names = "nand_data", "denali_reg"; > -- > 2.17.1 >
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi index 2e53daca9f5c..d61da3a62712 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -621,7 +621,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/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index be984200a70e..98f0f4eb0649 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -925,7 +925,7 @@ socionext,syscon = <&soc_glue>; }; - 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/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi index 994fea7b12c1..4c6cd3ec541d 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi @@ -783,7 +783,7 @@ socionext,syscon = <&soc_glue>; }; - nand: nand@68000000 { + nand: nand-controller@68000000 { compatible = "socionext,uniphier-denali-nand-v5b"; 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=arm64 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/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)