ipq806x: remove spi-nor from r7800 dts

[oweals/openwrt.git] / target / linux / ipq806x / files-4.9 / arch / arm / boot / dts / qcom-ipq8065-r7800.dts

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 403054cc97fe4be1909f600fe94c785e2c98bd1b..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
@@ -1,4 +1,4 @@
-#include "qcom-ipq8065-v1.0.dtsi"
+#include "qcom-ipq8065.dtsi"
 
 #include <dt-bindings/input/input.h>
 
@@ -215,49 +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>;
-
-                                       linux,part-probe = "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";
                };
@@ -299,12 +256,11 @@
 
                pcie0: pci@1b500000 {
                        status = "ok";
-                       phy-tx0-term-offset = <7>;
                };
 
                pcie1: pci@1b700000 {
                        status = "ok";
-                       phy-tx0-term-offset = <7>;
+                       force_gen1 = <1>;
                };
 
                nand@1ac00000 {
@@ -358,12 +314,12 @@
 
                                        kernel@1480000 {
                                                label = "kernel";
-                                               reg = <0x1480000 0x0200000>;
+                                               reg = <0x1480000 0x0400000>;
                                        };
 
-                                       ubi@1680000 {
+                                       ubi@1880000 {
                                                label = "ubi";
-                                               reg = <0x1680000 0x1E00000>;
+                                               reg = <0x1880000 0x1C00000>;
                                        };
 
                                        netgear@3480000 {
@@ -479,11 +435,6 @@
                                full-duplex;
                        };
                };
-
-               rpm@108000 {
-                       pinctrl-0 = <&i2c4_pins>;
-                       pinctrl-names = "default";
-               };
        };
 
        gpio-keys {