kernel: update kernel 3.18 to 3.18.26

[oweals/openwrt.git] / target / linux / ipq806x / patches-3.18 / 708-ARM-dts-qcom-add-gmac-nodes-to-ipq806x-platforms.patch

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 8e66b8d1204d03227ededefed419a73620800f4d..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
@@ -12,7 +12,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
 
 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
-@@ -96,6 +96,16 @@
+@@ -78,6 +78,16 @@
                                        bias-disable;
                                };
                        };
@@ -29,7 +29,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
                };
  
                gsbi@16300000 {
-@@ -243,6 +253,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 {
@@ -59,7 +63,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
  
 --- a/arch/arm/boot/dts/qcom-ipq8064-db149.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-db149.dts
-@@ -75,6 +75,14 @@
+@@ -48,6 +48,14 @@
                                        bias-disable;
                                };
                        };
@@ -74,7 +78,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
                };
  
                gsbi2: gsbi@12480000 {
-@@ -225,5 +233,40 @@
+@@ -189,5 +197,40 @@
                                reg = <7>;
                        };
                };
@@ -117,7 +121,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
  };
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -698,6 +698,92 @@
+@@ -741,6 +741,92 @@
                        status = "disabled";
                };