aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
committerLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
commite5441232a81d01e2ed46d88e340a30fd6b15b012 (patch)
treee008cc6bd24a0e2c9b283d94a69f7a027bcfb856 /target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch
parent048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff)
downloadupstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz
upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2
upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.zip
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch')
-rw-r--r--target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch13
1 files changed, 3 insertions, 10 deletions
diff --git a/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch b/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch
index af8ca023ea..0cc8f8b92c 100644
--- a/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch
+++ b/target/linux/sunxi/patches-3.14/214-3-dt-sun7i-add-axp209-to-cubietruck.patch
@@ -9,13 +9,11 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 10 ++++++++++
2 files changed, 20 insertions(+)
-diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-index 9a127d1..ebf6a2f 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-@@ -137,6 +137,16 @@
+@@ -89,6 +89,16 @@
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&uart0_pins_a>;
status = "okay";
+
+ axp: axp20x@34 {
@@ -29,9 +27,7 @@ index 9a127d1..ebf6a2f 100644
+ };
};
- i2c1: i2c@01c2b000 {
-diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
-index 15f1f3f..926f111 100644
+ gmac: ethernet@01c50000 {
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -127,6 +127,16 @@
@@ -51,6 +47,3 @@ index 15f1f3f..926f111 100644
};
i2c1: i2c@01c2b000 {
---
-2.0.3
-