kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 150-dt-sun4i-add-ahci.patch

diff --git a/target/linux/sunxi/patches-3.14/150-dt-sun4i-add-ahci.patch b/target/linux/sunxi/patches-3.14/150-dt-sun4i-add-ahci.patch
index f82261d52d16257a7e541b5530aefcf88eae7e61..6c10a98d776dc15f8d9433804f7ea862e1ad6aa5 100644 (file)
--- a/target/linux/sunxi/patches-3.14/150-dt-sun4i-add-ahci.patch
+++ b/target/linux/sunxi/patches-3.14/150-dt-sun4i-add-ahci.patch
@@ -15,8 +15,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  arch/arm/boot/dts/sun4i-a10.dtsi           |  8 ++++++++
  3 files changed, 22 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
-index cbd2e13..d6ec839 100644
 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
 +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
 @@ -35,6 +35,10 @@
@@ -30,8 +28,6 @@ index cbd2e13..d6ec839 100644
                pinctrl@01c20800 {
                        emac_power_pin_a1000: emac_power_pin@0 {
                                allwinner,pins = "PH15";
-diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
-index b139ee6..20407ac 100644
 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
 +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
 @@ -12,6 +12,7 @@
@@ -63,8 +59,6 @@ index b139ee6..20407ac 100644
 +              status = "okay";
 +      };
  };
-diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
-index 157bc09..18e09b41 100644
 --- a/arch/arm/boot/dts/sun4i-a10.dtsi
 +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
 @@ -388,6 +388,14 @@
@@ -82,6 +76,3 @@ index 157bc09..18e09b41 100644
                spi3: spi@01c1f000 {
                        compatible = "allwinner,sun4i-a10-spi";
                        reg = <0x01c1f000 0x1000>;
--- 
-2.0.3
-