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
This commit is contained in:
parent
f0a5f24217
commit
e9390dcf23
4 changed files with 24 additions and 8 deletions
|
@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
qcom-msm8974-sony-xperia-honami.dtb
|
qcom-msm8974-sony-xperia-honami.dtb
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
|
+++ b/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
|
||||||
@@ -0,0 +1,338 @@
|
@@ -0,0 +1,342 @@
|
||||||
+#include "qcom-ipq8064-v1.0.dtsi"
|
+#include "qcom-ipq8064-v1.0.dtsi"
|
||||||
+
|
+
|
||||||
+#include <dt-bindings/input/input.h>
|
+#include <dt-bindings/input/input.h>
|
||||||
|
@ -257,13 +257,17 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
+ gmac1: ethernet@37200000 {
|
+ gmac1: ethernet@37200000 {
|
||||||
+ status = "ok";
|
+ status = "ok";
|
||||||
+ phy-mode = "rgmii";
|
+ phy-mode = "rgmii";
|
||||||
+ phy-handle = <&phy4>;
|
|
||||||
+ qcom,id = <1>;
|
+ qcom,id = <1>;
|
||||||
+
|
+
|
||||||
+ pinctrl-0 = <&rgmii2_pins>;
|
+ pinctrl-0 = <&rgmii2_pins>;
|
||||||
+ pinctrl-names = "default";
|
+ pinctrl-names = "default";
|
||||||
+
|
+
|
||||||
+ mtd-mac-address = <&art 6>;
|
+ mtd-mac-address = <&art 6>;
|
||||||
|
+
|
||||||
|
+ fixed-link {
|
||||||
|
+ speed = <1000>;
|
||||||
|
+ full-duplex;
|
||||||
|
+ };
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ gmac2: ethernet@37400000 {
|
+ gmac2: ethernet@37400000 {
|
||||||
|
|
|
@ -29,7 +29,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
};
|
};
|
||||||
|
|
||||||
gsbi@16300000 {
|
gsbi@16300000 {
|
||||||
@@ -200,6 +210,27 @@
|
@@ -200,6 +210,31 @@
|
||||||
reg = <4>;
|
reg = <4>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -37,11 +37,15 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
+ gmac1: ethernet@37200000 {
|
+ gmac1: ethernet@37200000 {
|
||||||
+ status = "ok";
|
+ status = "ok";
|
||||||
+ phy-mode = "rgmii";
|
+ phy-mode = "rgmii";
|
||||||
+ phy-handle = <&phy4>;
|
|
||||||
+ qcom,id = <1>;
|
+ qcom,id = <1>;
|
||||||
+
|
+
|
||||||
+ pinctrl-0 = <&rgmii2_pins>;
|
+ pinctrl-0 = <&rgmii2_pins>;
|
||||||
+ pinctrl-names = "default";
|
+ pinctrl-names = "default";
|
||||||
|
+
|
||||||
|
+ fixed-link {
|
||||||
|
+ speed = <1000>;
|
||||||
|
+ full-duplex;
|
||||||
|
+ };
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ gmac2: ethernet@37400000 {
|
+ gmac2: ethernet@37400000 {
|
||||||
|
|
|
@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
qcom-msm8974-sony-xperia-honami.dtb
|
qcom-msm8974-sony-xperia-honami.dtb
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
|
+++ b/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
|
||||||
@@ -0,0 +1,338 @@
|
@@ -0,0 +1,342 @@
|
||||||
+#include "qcom-ipq8064-v1.0.dtsi"
|
+#include "qcom-ipq8064-v1.0.dtsi"
|
||||||
+
|
+
|
||||||
+#include <dt-bindings/input/input.h>
|
+#include <dt-bindings/input/input.h>
|
||||||
|
@ -257,13 +257,17 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
+ gmac1: ethernet@37200000 {
|
+ gmac1: ethernet@37200000 {
|
||||||
+ status = "ok";
|
+ status = "ok";
|
||||||
+ phy-mode = "rgmii";
|
+ phy-mode = "rgmii";
|
||||||
+ phy-handle = <&phy4>;
|
|
||||||
+ qcom,id = <1>;
|
+ qcom,id = <1>;
|
||||||
+
|
+
|
||||||
+ pinctrl-0 = <&rgmii2_pins>;
|
+ pinctrl-0 = <&rgmii2_pins>;
|
||||||
+ pinctrl-names = "default";
|
+ pinctrl-names = "default";
|
||||||
+
|
+
|
||||||
+ mtd-mac-address = <&art 6>;
|
+ mtd-mac-address = <&art 6>;
|
||||||
|
+
|
||||||
|
+ fixed-link {
|
||||||
|
+ speed = <1000>;
|
||||||
|
+ full-duplex;
|
||||||
|
+ };
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ gmac2: ethernet@37400000 {
|
+ gmac2: ethernet@37400000 {
|
||||||
|
|
|
@ -29,7 +29,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
};
|
};
|
||||||
|
|
||||||
gsbi@16300000 {
|
gsbi@16300000 {
|
||||||
@@ -173,6 +183,27 @@
|
@@ -173,6 +183,31 @@
|
||||||
reg = <4>;
|
reg = <4>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -37,11 +37,15 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
||||||
+ gmac1: ethernet@37200000 {
|
+ gmac1: ethernet@37200000 {
|
||||||
+ status = "ok";
|
+ status = "ok";
|
||||||
+ phy-mode = "rgmii";
|
+ phy-mode = "rgmii";
|
||||||
+ phy-handle = <&phy4>;
|
|
||||||
+ qcom,id = <1>;
|
+ qcom,id = <1>;
|
||||||
+
|
+
|
||||||
+ pinctrl-0 = <&rgmii2_pins>;
|
+ pinctrl-0 = <&rgmii2_pins>;
|
||||||
+ pinctrl-names = "default";
|
+ pinctrl-names = "default";
|
||||||
|
+
|
||||||
|
+ fixed-link {
|
||||||
|
+ speed = <1000>;
|
||||||
|
+ full-duplex;
|
||||||
|
+ };
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ gmac2: ethernet@37400000 {
|
+ gmac2: ethernet@37400000 {
|
||||||
|
|
Loading…
Reference in a new issue