kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 145-1-dt-sun7i-add-a20-spi.patch

diff --git a/target/linux/sunxi/patches-3.14/145-1-dt-sun7i-add-a20-spi.patch b/target/linux/sunxi/patches-3.14/145-1-dt-sun7i-add-a20-spi.patch
index 47e342c66a588f729ea16f6fcda6e35d4d6f06a1..45dc8ba733ed2fd9af92d04f9e2dd1577e6f1506 100644 (file)
--- a/target/linux/sunxi/patches-3.14/145-1-dt-sun7i-add-a20-spi.patch
+++ b/target/linux/sunxi/patches-3.14/145-1-dt-sun7i-add-a20-spi.patch
@@ -11,8 +11,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  arch/arm/boot/dts/sun7i-a20.dtsi | 44 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index d00fbf8..0f0ee58 100644
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
 @@ -401,6 +401,28 @@
@@ -44,10 +42,12 @@ index d00fbf8..0f0ee58 100644
                emac: ethernet@01c0b000 {
                        compatible = "allwinner,sun4i-a10-emac";
                        reg = <0x01c0b000 0x1000>;
-@@ -417,6 +439,28 @@
+@@ -415,6 +437,28 @@
+                       status = "disabled";
+                       #address-cells = <1>;
                        #size-cells = <0>;
-               };
- 
++              };
++
 +              spi2: spi@01c17000 {
 +                      compatible = "allwinner,sun4i-a10-spi";
 +                      reg = <0x01c17000 0x1000>;
@@ -68,11 +68,6 @@ index d00fbf8..0f0ee58 100644
 +                      status = "disabled";
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
-+              };
-+
+               };
+ 
                pio: pinctrl@01c20800 {
-                       compatible = "allwinner,sun7i-a20-pinctrl";
-                       reg = <0x01c20800 0x400>;
--- 
-2.0.3
-