dt-bindings: mtd: nand-controller: Fix matching with size-cells==1
PATCH 1/4 dt-bindings: mtd: nand-controller: Fix matching with size-cells==1
Most of Freescale/NXP GPMI device trees use size-cells==1 (even when actually not needed except few boards). This fixes dtbs_check warnings like:
arch/arm64/boot/dts/freescale/imx8mm-beacon-kit.dt.yaml: nand-controller@33002000: #size-cells:0:0: 0 was expected
--- Documentation/devicetree/bindings/mtd/nand-controller.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mtd/nand-controller.yaml +4 -1
@@ -34,7 +34,10 @@ properties: const: 1 "#size-cells": - const: 0 + description: + Depends on your controller. Put zero unless you need a mapping between CS + lines and dedicated memory regions. + enum: [0, 1] ranges: true
Signature · 1 line
2.17.1
PATCH 2/4 ARM: dts: imx23: Align GPMI NAND node name with schema
Device tree schema expects NAND controller to be named "nand-controller", otherwise dtbs_check complain with a warning like:
arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dt.yaml: gpmi-nand@8000c000:
$nodename:0: 'gpmi-nand@8000c000' does not match '^nand-controller(@.*)?'--- arch/arm/boot/dts/imx23-evk.dts | 2 +- arch/arm/boot/dts/imx23.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx23-evk.dts +1 -1
@@ -53,7 +53,7 @@ apb@80000000 { apbh@80000000 { - gpmi-nand@8000c000 { + nand-controller@8000c000 { pinctrl-names = "default"; pinctrl-0 = <&gpmi_pins_a &gpmi_pins_fixup>; status = "okay";
arch/arm/boot/dts/imx23.dtsi +1 -1
@@ -76,7 +76,7 @@ status = "disabled"; }; - gpmi-nand@8000c000 { + nand-controller@8000c000 { compatible = "fsl,imx23-gpmi-nand"; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.17.1
PATCH 3/4 ARM: dts: imx28: Align GPMI NAND node name with schema
In reply to Krzysztof KozlowskiDevice tree schema expects NAND controller to be named "nand-controller", otherwise dtbs_check complain with a warning like:
arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dt.yaml: gpmi-nand@8000c000:
$nodename:0: 'gpmi-nand@8000c000' does not match '^nand-controller(@.*)?'--- arch/arm/boot/dts/imx28-apf28.dts | 2 +- arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +- arch/arm/boot/dts/imx28-evk.dts | 2 +- arch/arm/boot/dts/imx28-m28.dtsi | 2 +- arch/arm/boot/dts/imx28-m28cu3.dts | 2 +- arch/arm/boot/dts/imx28.dtsi | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx28-apf28.dts +1 -1
@@ -17,7 +17,7 @@ apb@80000000 { apbh@80000000 { - gpmi-nand@8000c000 { + nand-controller@8000c000 { pinctrl-names = "default"; pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; status = "okay";
arch/arm/boot/dts/imx28-apx4devkit.dts +1 -1
@@ -13,7 +13,7 @@ apb@80000000 { apbh@80000000 { - gpmi-nand@8000c000 { + nand-controller@8000c000 { pinctrl-names = "default"; pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; status = "okay";
arch/arm/boot/dts/imx28-evk.dts +1 -1
@@ -97,7 +97,7 @@ apb@80000000 { apbh@80000000 { - gpmi-nand@8000c000 { + nand-controller@8000c000 { pinctrl-names = "default"; pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg &gpmi_pins_evk>;
arch/arm/boot/dts/imx28-m28.dtsi +1 -1
@@ -16,7 +16,7 @@ apb@80000000 { apbh@80000000 { - gpmi-nand@8000c000 { + nand-controller@8000c000 { #address-cells = <1>; #size-cells = <1>; pinctrl-names = "default";
arch/arm/boot/dts/imx28-m28cu3.dts +1 -1
@@ -17,7 +17,7 @@ apb@80000000 { apbh@80000000 { - gpmi-nand@8000c000 { + nand-controller@8000c000 { #address-cells = <1>; #size-cells = <1>; pinctrl-names = "default";
arch/arm/boot/dts/imx28.dtsi +1 -1
@@ -100,7 +100,7 @@ status = "disabled"; }; - gpmi: gpmi-nand@8000c000 { + gpmi: nand-controller@8000c000 { compatible = "fsl,imx28-gpmi-nand"; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.17.1
PATCH 4/4 ARM: dts: imx: Align GPMI NAND node name with schema
In reply to Krzysztof KozlowskiDevice tree schema expects NAND controller to be named "nand-controller", otherwise dtbs_check complain with a warning like:
arch/arm/boot/dts/imx6dl-apf6dev.dt.yaml: gpmi-nand@112000:
$nodename:0: 'gpmi-nand@112000' does not match '^nand-controller(@.*)?'--- arch/arm/boot/dts/imx6sx.dtsi | 2 +- arch/arm/boot/dts/imx6ul.dtsi | 2 +- arch/arm/boot/dts/imx7s.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx6sx.dtsi +1 -1
@@ -213,7 +213,7 @@ clocks = <&clks IMX6SX_CLK_APBH_DMA>; }; - gpmi: gpmi-nand@1806000{ + gpmi: nand-controller@1806000{ compatible = "fsl,imx6sx-gpmi-nand"; #address-cells = <1>; #size-cells = <1>;
arch/arm/boot/dts/imx6ul.dtsi +1 -1
@@ -174,7 +174,7 @@ clocks = <&clks IMX6UL_CLK_APBHDMA>; }; - gpmi: gpmi-nand@1806000 { + gpmi: nand-controller@1806000 { compatible = "fsl,imx6q-gpmi-nand"; #address-cells = <1>; #size-cells = <1>;
arch/arm/boot/dts/imx7s.dtsi +1 -1
@@ -1208,7 +1208,7 @@ clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; }; - gpmi: gpmi-nand@33002000{ + gpmi: nand-controller@33002000{ compatible = "fsl,imx7d-gpmi-nand"; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.17.1
Re: [PATCH 2/4] ARM: dts: imx23: Align GPMI NAND node name with schema
In reply to Krzysztof KozlowskiQuoted 7 lines · Krzysztof Kozlowski
Device tree schema expects NAND controller to be named "nand-controller", otherwise
dtbs_checkcomplain with a warning like:arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dt.yaml: gpmi-nand@8000c000: $nodename:0: 'gpmi-nand@8000c000' does not match '^nand-controller(@.*)?'Signed-off-by Krzysztof Kozlowski <[email protected]>
I already applied one patch from Anson [1].
Shawn