diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:16:23 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:16:23 +0000 |
| commit | e9390dcf233733ec269c30e922d285523d068ffc (patch) | |
| tree | d480e8f801d79116ce1cd4d69be4c62650ac82bc | |
| parent | f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 (diff) | |
| download | upstream-e9390dcf233733ec269c30e922d285523d068ffc.tar.gz upstream-e9390dcf233733ec269c30e922d285523d068ffc.tar.bz2 upstream-e9390dcf233733ec269c30e922d285523d068ffc.zip | |
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
4 files changed, 24 insertions, 8 deletions
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 032b01c684..abd7cf631d 100644 --- 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 dcd320c07a..49203f1cea 100644 --- 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 78a46e8b08..1f5eba8377 100644 --- 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 d143118fd4..37dfaabf05 100644 --- 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 { |