aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.13/174-3-dt-sun7i-add-ehci-cubieboard2.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-02-13 13:27:14 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-02-13 13:27:14 +0000
commit2aeabcb857e32494bdb8385a2fb5c8c529fe35be (patch)
tree7a8f6420d307615cbedc82fbc6ad2e498a5a1ca8 /target/linux/sunxi/patches-3.13/174-3-dt-sun7i-add-ehci-cubieboard2.patch
parent87573f9583f900bc82fe435ebbcff8dd72c88205 (diff)
downloadmaster-187ad058-2aeabcb857e32494bdb8385a2fb5c8c529fe35be.tar.gz
master-187ad058-2aeabcb857e32494bdb8385a2fb5c8c529fe35be.tar.bz2
master-187ad058-2aeabcb857e32494bdb8385a2fb5c8c529fe35be.zip
upgrade 3.13 targets to 3.13.2, refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39582 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.13/174-3-dt-sun7i-add-ehci-cubieboard2.patch')
-rw-r--r--target/linux/sunxi/patches-3.13/174-3-dt-sun7i-add-ehci-cubieboard2.patch13
1 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/sunxi/patches-3.13/174-3-dt-sun7i-add-ehci-cubieboard2.patch b/target/linux/sunxi/patches-3.13/174-3-dt-sun7i-add-ehci-cubieboard2.patch
index 0f00c2564e..2c6164e4ec 100644
--- a/target/linux/sunxi/patches-3.13/174-3-dt-sun7i-add-ehci-cubieboard2.patch
+++ b/target/linux/sunxi/patches-3.13/174-3-dt-sun7i-add-ehci-cubieboard2.patch
@@ -11,11 +11,9 @@ Conflicts:
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 45 +++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
-diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
-index a26711c..10ea99d 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
-@@ -54,6 +54,20 @@
+@@ -69,6 +69,20 @@
allwinner,drive = <0>;
allwinner,pull = <0>;
};
@@ -36,7 +34,7 @@ index a26711c..10ea99d 100644
};
uart0: serial@01c28000 {
-@@ -71,6 +85,15 @@
+@@ -86,6 +100,15 @@
i2c1: i2c@01c2b000 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
@@ -51,8 +49,8 @@ index a26711c..10ea99d 100644
+ vbus-supply = <&reg_usb2_vbus>;
status = "okay";
};
-
-@@ -112,5 +135,27 @@
+ };
+@@ -119,5 +142,27 @@
gpio = <&pio 1 8 0>;
enable-active-high;
};
@@ -80,6 +78,3 @@ index a26711c..10ea99d 100644
+ };
};
};
---
-1.8.5.1
-