From: Pavel Kubelun <be.dissent@gmail.com>
Date: Thu, 18 Jan 2018 12:03:57 +0000 (+0300)
Subject: ipq806x: remove spi-nor from r7800 dts
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1df8281737a33e34cdb327b76d4c25db54676504;p=librecmc%2Flibrecmc.git

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>

(cherry picked from commit 8c1c1c4874c3bcaa16a21257a8fe15c2f6ec4012)
---

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 c8b3f20236..fbacc039d6 100644
--- 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 c8b3f20236..fbacc039d6 100644
--- 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";
 		};