kernel: update 3.14 to 3.14.18

[openwrt/staging/wigyori.git] / target / linux / sunxi / patches-3.14 / 201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch

diff --git a/target/linux/sunxi/patches-3.14/201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch b/target/linux/sunxi/patches-3.14/201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch
index a6261cda8e689472ab1520cc34eff94209949807..10d4d5823b2f4f51670497d0e6186e9bd9c87356 100644 (file)
--- a/target/linux/sunxi/patches-3.14/201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch
+++ b/target/linux/sunxi/patches-3.14/201-dt-sun4i-add-mmc-nodes_NEED_REFRESH.patch
@@ -14,10 +14,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  arch/arm/boot/dts/sun4i-a10.dtsi           | 58 ++++++++++++++++++++++++++++++
  3 files changed, 74 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
-index fa746aea..68b687e 100644
-diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
-index 4684cbe..13088f0 100644
 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
 +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
 @@ -34,6 +34,14 @@
@@ -35,8 +31,6 @@ index 4684cbe..13088f0 100644
                usbphy: phy@01c13400 {
                        usb1_vbus-supply = <&reg_usb1_vbus>;
                        usb2_vbus-supply = <&reg_usb2_vbus>;
-diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
-index 27dc6ee..7014518 100644
 --- a/arch/arm/boot/dts/sun4i-a10.dtsi
 +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
 @@ -377,6 +377,50 @@
@@ -111,29 +105,6 @@ index 27dc6ee..7014518 100644
                };
  
                timer@01c20c00 {
--- 
-2.0.3
-
-From c0b8d688678e4a652895ce5f0cd48917a9a4f6ba Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Sat, 11 Jan 2014 04:33:23 +0100
-Subject: [PATCH] ARM: sun4i: dt: Add mmc node to a few more boards
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- arch/arm/boot/dts/sun4i-a10-hackberry.dts      | 9 +++++++++
- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts      | 9 +++++++++
- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts     | 8 ++++++++
- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 9 +++++++++
- arch/arm/boot/dts/sun4i-a10-pcduino.dts        | 8 ++++++++
- 5 files changed, 43 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
-index d7c17e4..a4b05d6 100644
-diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
-index fe9272e..b73a070 100644
-diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
-index dd84a9e3..c906171 100644
 --- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
 +++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
 @@ -20,6 +20,14 @@
@@ -151,8 +122,6 @@ index dd84a9e3..c906171 100644
                usbphy: phy@01c13400 {
                        usb1_vbus-supply = <&reg_usb1_vbus>;
                        usb2_vbus-supply = <&reg_usb2_vbus>;
-diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
-index 66cf0c7..e5a2765 100644
 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
 +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
 @@ -33,6 +33,15 @@
@@ -171,8 +140,6 @@ index 66cf0c7..e5a2765 100644
                usbphy: phy@01c13400 {
                        usb1_vbus-supply = <&reg_usb1_vbus>;
                        usb2_vbus-supply = <&reg_usb2_vbus>;
-diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
-index 255b47e..2820229 100644
 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
 +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
 @@ -34,6 +34,14 @@
@@ -190,6 +157,3 @@ index 255b47e..2820229 100644
                usbphy: phy@01c13400 {
                        usb1_vbus-supply = <&reg_usb1_vbus>;
                        usb2_vbus-supply = <&reg_usb2_vbus>;
--- 
-2.0.3
-