ipq806x: fixes for R7800 and C2600

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

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index 43ee572ac65ba3ba5a3a114383843aa2d6faa07c..8566995ef5e1663bfb65dbaecb4e41541a7899c1 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -110,14 +110,60 @@
                                mux {
                                        pins = "gpio18", "gpio19", "gpio21";
                                        function = "gsbi5";
+                                       bias-pull-down;
+                               };
+
+                               data {
+                                       pins = "gpio18", "gpio19";
                                        drive-strength = <10>;
-                                       bias-none;
                                };
 
                                cs {
                                        pins = "gpio20";
+                                       drive-strength = <10>;
+                                       bias-pull-up;
+                               };
+
+                               clk {
+                                       pins = "gpio21";
+                                       drive-strength = <12>;
+                               };
+                       };
+
+                       spi6_pins: spi6_pins {
+                               mux {
+                                       pins = "gpio55", "gpio56", "gpio58";
+                                       function = "gsbi6";
+                                       bias-pull-down;
+                               };
+
+                               mosi {
+                                       pins = "gpio55";
+                                       drive-strength = <12>;
+                               };
+
+                               miso {
+                                       pins = "gpio56";
+                                       drive-strength = <14>;
+                               };
+
+                               cs {
+                                       pins = "gpio57";
+                                       drive-strength = <12>;
+                                       bias-pull-up;
+                               };
+
+                               clk {
+                                       pins = "gpio58";
                                        drive-strength = <12>;
                                };
+
+                               reset {
+                                       pins = "gpio33";
+                                       drive-strength = <10>;
+                                       bias-pull-down;
+                                       output-high;
+                               };
                        };
                };
 
@@ -139,7 +185,7 @@
                        qcom,mode = <GSBI_PROT_SPI>;
                        status = "ok";
 
-                       spi4: spi@1a280000 {
+                       spi5: spi@1a280000 {
                                status = "ok";
                                spi-max-frequency = <50000000>;
                                pinctrl-0 = <&spi_pins>;
@@ -148,10 +194,10 @@
                                cs-gpios = <&qcom_pinmux 20 0>;
 
                                flash: m25p80@0 {
-                                       compatible = "s25fl512s";
+                                       compatible = "jedec,spi-nor";
                                        #address-cells = <1>;
                                        #size-cells = <1>;
-                                       spi-max-frequency = <51200000>;
+                                       spi-max-frequency = <50000000>;
                                        reg = <0>;
 
                                        linux,part-probe = "qcom-smem";
@@ -159,6 +205,25 @@
                        };
                };
 
+               gsbi6: gsbi@16500000 {
+                       qcom,mode = <GSBI_PROT_SPI>;
+                       status = "ok";
+                       spi6: spi@16580000 {
+                               status = "ok";
+                               spi-max-frequency = <6000000>;
+                               pinctrl-0 = <&spi6_pins>;
+                               pinctrl-names = "default";
+
+                               cs-gpios = <&qcom_pinmux 57 0>;
+
+                               spi-nor@0 {
+                                       compatible = "spi-nor";
+                                       reg = <0>;
+                                       spi-max-frequency = <6000000>;
+                               };
+                       };
+               };
+
                sata-phy@1b400000 {
                        status = "ok";
                };
@@ -306,6 +371,10 @@
                                        0x009a0 0x1e864443  /* QM_PORT6_CTRL0 */
                                        0x009a4 0x000001c6  /* QM_PORT6_CTRL1 */
                                        >;
+                               qca,ar8327-vlans = <
+                                       0x1     0x5e        /* VLAN1 Ports 1/2/3/4/6 */
+                                       0x2     0x21        /* VLAN2 Ports 0/5 */
+                               >;
                        };
 
                        phy4: ethernet-phy@4 {
@@ -371,18 +440,24 @@
                        label = "wifi";
                        gpios = <&qcom_pinmux 6 1>;
                        linux,code = <KEY_RFKILL>;
+                       debounce-interval = <60>;
+                       wakeup-source;
                };
 
                reset {
                        label = "reset";
                        gpios = <&qcom_pinmux 54 1>;
                        linux,code = <KEY_RESTART>;
+                       debounce-interval = <60>;
+                       wakeup-source;
                };
 
                wps {
                        label = "wps";
                        gpios = <&qcom_pinmux 65 1>;
                        linux,code = <KEY_WPS_BUTTON>;
+                       debounce-interval = <60>;
+                       wakeup-source;
                };
        };
 
@@ -445,17 +520,23 @@
                compatible = "gpio-export";
                #size-cells = <0>;
 
-               display_data {
-                       gpio-export,name = "usb0";
+               usb1-power {
+                       gpio-export,name = "usb1";
                        gpio-export,output = <1>;
                        gpios = <&qcom_pinmux 15 0>;
                };
 
-               display_clock {
-                       gpio-export,name = "usb1";
+               usb2-power {
+                       gpio-export,name = "usb2";
                        gpio-export,output = <1>;
                        gpios = <&qcom_pinmux 16 0>;
                };
+
+               usb-power {
+                       gpio-export,name = "usb_p";
+                       gpio-export,output = <1>;
+                       gpios = <&qcom_pinmux 68 0>;
+               };
        };
 };