From d4c95b5d5c31f966e73568d120f120678911d2ff Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sun, 26 Jan 2020 02:29:29 +0100 Subject: [PATCH] ipq806x: use correct definition for nand-controller node From kernel Documentation this should be called nand-controller Signed-off-by: Ansuel Smith --- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 6 +++--- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 6 +++--- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 2 +- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 4 ++-- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts | 2 +- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 4 ++-- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 4 ++-- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 4 ++-- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts | 2 +- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 2 +- .../arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 2 +- .../files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 2 +- .../files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index 02f60c90eee..ec4535b55f7 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -144,7 +144,7 @@ cs-gpios = <&qcom_pinmux 20 0>; - flash: m25p80@0 { + m25p80@0 { compatible = "s25fl256s1"; #address-cells = <1>; #size-cells = <1>; @@ -175,13 +175,13 @@ force_gen1 = <1>; }; -&nand { +&nand_controller { status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; - cs0 { + nand@0 { reg = <0>; compatible = "qcom,nandcs"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts index de347643dc9..5b181075c76 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts @@ -121,7 +121,7 @@ cs-gpios = <&qcom_pinmux 20 0>; - flash: m25p80@0 { + m25p80@0 { compatible = "s25fl256s1"; #address-cells = <1>; #size-cells = <1>; @@ -164,13 +164,13 @@ status = "okay"; }; - nand@1ac00000 { + nand-controller@1ac00000 { status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; - cs0 { + nand@0 { reg = <0>; compatible = "qcom,nandcs"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts index d90518bf22f..0c3d8192b4a 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts @@ -157,7 +157,7 @@ cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; - flash: m25p80@0 { + m25p80@0 { compatible = "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts index 241c00962a5..c3d8fab6527 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -184,7 +184,7 @@ force_gen1 = <1>; }; - nand@1ac00000 { + nand-controller@1ac00000 { status = "okay"; pinctrl-0 = <&nand_pins>; @@ -193,7 +193,7 @@ #address-cells = <1>; #size-cells = <0>; - cs0 { + nand@0 { reg = <0>; compatible = "qcom,nandcs"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts index 5da523a7281..9d14b658349 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts @@ -79,7 +79,7 @@ cs-gpios = <&qcom_pinmux 20 0>; - flash: m25p80@0 { + m25p80@0 { compatible = "s25fl256s1"; #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts index b052ca6fcb1..5cc4cf31d19 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts @@ -155,13 +155,13 @@ status = "okay"; }; - nand@1ac00000 { + nand-controller@1ac00000 { status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; - cs0 { + nand@0 { reg = <0>; compatible = "qcom,nandcs"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts index dd596f52b44..f0909d1a8f6 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -154,13 +154,13 @@ force_gen1 = <1>; }; - nand@1ac00000 { + nand-controller@1ac00000 { status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; - cs0 { + nand@0 { reg = <0>; compatible = "qcom,nandcs"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index 463c0abb401..da67e36c6bb 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -188,13 +188,13 @@ force_gen1 = <1>; }; - nand@1ac00000 { + nand-controller@1ac00000 { status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; - cs0 { + nand@0 { reg = <0>; compatible = "qcom,nandcs"; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts index bdcd302802f..afccef5fa2e 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts @@ -135,7 +135,7 @@ cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; - flash: W25Q128@0 { + W25Q128@0 { compatible = "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts index a1e7791d12d..c409b2d6599 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts @@ -62,7 +62,7 @@ pinctrl-names = "default"; }; - nand@1ac00000 { + nand-controller@1ac00000 { status = "okay"; pinctrl-0 = <&nand_pins>; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts index b4770102e27..21dfc9e9ebc 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts @@ -38,7 +38,7 @@ }; soc { - nand@1ac00000 { + nand-controller@1ac00000 { status = "okay"; pinctrl-0 = <&nand_pins>; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 378ea775b54..acecf9d3fa2 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -175,7 +175,7 @@ cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; - flash: m25p80@0 { + m25p80@0 { compatible = "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index f93039f7272..0af9e2746a6 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -281,13 +281,13 @@ }; }; - nand@1ac00000 { + nand-controller@1ac00000 { status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; - cs0 { + nand@0 { reg = <0>; compatible = "qcom,nandcs"; -- 2.30.2