ipq806x: remove spi-nor from r7800 dts

There's no spi-nor in R7800, so disable unequipped interfaces.

Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
[slh: rebase for kernel v4.14 as well]
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index c8b3f2023654cef711d299b610fc8814edfa782b..fbacc039d6c3895c316a733b70c598205ca2a334 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -215,51 +215,6 @@
                         */
                };
 
-               gsbi5: gsbi@1a200000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "ok";
-
-                       spi5: spi@1a280000 {
-                               status = "ok";
-
-                               pinctrl-0 = <&spi_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-                               flash: m25p80@0 {
-                                       compatible = "jedec,spi-nor";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       spi-max-frequency = <50000000>;
-                                       reg = <0>;
-
-                                       partitions {
-                                               compatible = "qcom,smem";
-                                       };
-                               };
-                       };
-               };
-
-               gsbi6: gsbi@16500000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "ok";
-                       spi6: spi@16580000 {
-                               status = "ok";
-
-                               pinctrl-0 = <&spi6_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>;
-
-                               spi-nor@0 {
-                                       compatible = "jedec,spi-nor";
-                                       reg = <0>;
-                                       spi-max-frequency = <6000000>;
-                               };
-                       };
-               };
-
                sata-phy@1b400000 {
                        status = "ok";
                };

diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index c8b3f2023654cef711d299b610fc8814edfa782b..fbacc039d6c3895c316a733b70c598205ca2a334 100644 (file)
--- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -215,51 +215,6 @@
                         */
                };
 
-               gsbi5: gsbi@1a200000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "ok";
-
-                       spi5: spi@1a280000 {
-                               status = "ok";
-
-                               pinctrl-0 = <&spi_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-                               flash: m25p80@0 {
-                                       compatible = "jedec,spi-nor";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       spi-max-frequency = <50000000>;
-                                       reg = <0>;
-
-                                       partitions {
-                                               compatible = "qcom,smem";
-                                       };
-                               };
-                       };
-               };
-
-               gsbi6: gsbi@16500000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "ok";
-                       spi6: spi@16580000 {
-                               status = "ok";
-
-                               pinctrl-0 = <&spi6_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>;
-
-                               spi-nor@0 {
-                                       compatible = "jedec,spi-nor";
-                                       reg = <0>;
-                                       spi-max-frequency = <6000000>;
-                               };
-                       };
-               };
-
                sata-phy@1b400000 {
                        status = "ok";
                };