# \[PATCH 1/2\] ARM: dts: uniphier: rename NAND node names to follow json-schema - Subsystems: THE REST - Maintainers: Linus Torvalds - List: linux-arm-kernel - 4 messages, 1 author - Page: https://ratatoskr.run/linux-arm-kernel/2020/02/5875421/t ## \[PATCH 1/2\] ARM: dts: uniphier: rename NAND node names to follow json-schema - From: Masahiro Yamada \ - Date: 2020-02-26 04:00:19 - Message: https://ratatoskr.run/linux-arm-kernel/2020/02/5875421.md ```text 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 --- 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 ``` ## \[PATCH 2/2\] arm64: dts: uniphier: rename NAND node names to follow json-schema - From: Masahiro Yamada \ - Date: 2020-02-26 04:00:21 - Message: https://ratatoskr.run/linux-arm-kernel/2020/02/5875422.md ```text 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 --- 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ``` ## Re: \[PATCH 1/2\] ARM: dts: uniphier: rename NAND node names to follow json-schema - From: Masahiro Yamada \ - Date: 2020-02-29 06:09:31 - Message: https://ratatoskr.run/linux-arm-kernel/2020/02/5880041.md ```text On Wed, Feb 26, 2020 at 1:00 PM Masahiro Yamada [ref] 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 > --- 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 -- Best Regards Masahiro Yamada _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ``` ## Re: \[PATCH 2/2\] arm64: dts: uniphier: rename NAND node names to follow json-schema - From: Masahiro Yamada \ - Date: 2020-02-29 06:09:59 - Message: https://ratatoskr.run/linux-arm-kernel/2020/02/5880042.md ```text On Wed, Feb 26, 2020 at 1:00 PM Masahiro Yamada [ref] 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 > --- 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 > -- Best Regards Masahiro Yamada _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ```