ipq806x: ap148/r7500: fix eth0 for non gige speeds

Eth0 is attached to mac0 of the switch with a fixed link and and not to
phy4 in single phy mode, so configuring it to anything but 1000FD will
break the connection, which will happen if a only 100 Mbit capapble device
is plugged into the wan port.

Fix this by not taking the state from phy4 and just configuring a fixed link
for eth0.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 47695

diff --git a/target/linux/ipq806x/patches-3.18/301-ARM-qcom-add-Netgear-Nighthawk-X4-R7500-device-tree.patch b/target/linux/ipq806x/patches-3.18/301-ARM-qcom-add-Netgear-Nighthawk-X4-R7500-device-tree.patch
index 032b01c684fa77e76fae27c24a3f9e7d494c1af1..abd7cf631de5c432fc2d8bec52945b994632a19d 100644 (file)
--- a/target/linux/ipq806x/patches-3.18/301-ARM-qcom-add-Netgear-Nighthawk-X4-R7500-device-tree.patch
+++ b/target/linux/ipq806x/patches-3.18/301-ARM-qcom-add-Netgear-Nighthawk-X4-R7500-device-tree.patch
@@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
        qcom-msm8974-sony-xperia-honami.dtb
 --- /dev/null
 +++ b/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
-@@ -0,0 +1,338 @@
+@@ -0,0 +1,342 @@
 +#include "qcom-ipq8064-v1.0.dtsi"
 +
 +#include <dt-bindings/input/input.h>
@@ -257,13 +257,17 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +              gmac1: ethernet@37200000 {
 +                      status = "ok";
 +                      phy-mode = "rgmii";
-+                      phy-handle = <&phy4>;
 +                      qcom,id = <1>;
 +
 +                      pinctrl-0 = <&rgmii2_pins>;
 +                      pinctrl-names = "default";
 +
 +                      mtd-mac-address = <&art 6>;
++
++                      fixed-link {
++                              speed = <1000>;
++                              full-duplex;
++                      };
 +              };
 +
 +              gmac2: ethernet@37400000 {

diff --git a/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
index dcd320c07a3ebf6caca891b9fd38a23fc20db981..49203f1cea09a9d86588bd5ab5e828ffd2ad7d33 100644 (file)
--- a/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
+++ b/target/linux/ipq806x/patches-3.18/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
@@ -29,7 +29,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
                };
  
                gsbi@16300000 {
-@@ -200,6 +210,27 @@
+@@ -200,6 +210,31 @@
                                reg = <4>;
                        };
                };
@@ -37,11 +37,15 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
 +              gmac1: ethernet@37200000 {
 +                      status = "ok";
 +                      phy-mode = "rgmii";
-+                      phy-handle = <&phy4>;
 +                      qcom,id = <1>;
 +
 +                      pinctrl-0 = <&rgmii2_pins>;
 +                      pinctrl-names = "default";
++
++                      fixed-link {
++                              speed = <1000>;
++                              full-duplex;
++                      };
 +              };
 +
 +              gmac2: ethernet@37400000 {

diff --git a/target/linux/ipq806x/patches-4.1/301-ARM-qcom-add-Netgear-Nighthawk-X4-R7500-device-tree.patch b/target/linux/ipq806x/patches-4.1/301-ARM-qcom-add-Netgear-Nighthawk-X4-R7500-device-tree.patch
index 78a46e8b08ba708913737c8a88e41e1d995617a9..1f5eba8377d22132e1d8aa66e21ebcd44f999fed 100644 (file)
--- a/target/linux/ipq806x/patches-4.1/301-ARM-qcom-add-Netgear-Nighthawk-X4-R7500-device-tree.patch
+++ b/target/linux/ipq806x/patches-4.1/301-ARM-qcom-add-Netgear-Nighthawk-X4-R7500-device-tree.patch
@@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
        qcom-msm8974-sony-xperia-honami.dtb
 --- /dev/null
 +++ b/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
-@@ -0,0 +1,338 @@
+@@ -0,0 +1,342 @@
 +#include "qcom-ipq8064-v1.0.dtsi"
 +
 +#include <dt-bindings/input/input.h>
@@ -257,13 +257,17 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +              gmac1: ethernet@37200000 {
 +                      status = "ok";
 +                      phy-mode = "rgmii";
-+                      phy-handle = <&phy4>;
 +                      qcom,id = <1>;
 +
 +                      pinctrl-0 = <&rgmii2_pins>;
 +                      pinctrl-names = "default";
 +
 +                      mtd-mac-address = <&art 6>;
++
++                      fixed-link {
++                              speed = <1000>;
++                              full-duplex;
++                      };
 +              };
 +
 +              gmac2: ethernet@37400000 {

diff --git a/target/linux/ipq806x/patches-4.1/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch b/target/linux/ipq806x/patches-4.1/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
index d143118fd4128818ab9ddbb1bf734f407f63c0a1..37dfaabf05c585a711734248ac84ec82951baa71 100644 (file)
--- a/target/linux/ipq806x/patches-4.1/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
+++ b/target/linux/ipq806x/patches-4.1/708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch
@@ -29,7 +29,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
                };
  
                gsbi@16300000 {
-@@ -173,6 +183,27 @@
+@@ -173,6 +183,31 @@
                                reg = <4>;
                        };
                };
@@ -37,11 +37,15 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
 +              gmac1: ethernet@37200000 {
 +                      status = "ok";
 +                      phy-mode = "rgmii";
-+                      phy-handle = <&phy4>;
 +                      qcom,id = <1>;
 +
 +                      pinctrl-0 = <&rgmii2_pins>;
 +                      pinctrl-names = "default";
++
++                      fixed-link {
++                              speed = <1000>;
++                              full-duplex;
++                      };
 +              };
 +
 +              gmac2: ethernet@37400000 {