aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-17 09:54:55 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-17 09:54:55 +0000
commit72d1d554f3f6cb6132831a2c716f91f81619339f (patch)
tree4a3f56e2ebf8f1a7727e46823869007241bef383 /target/linux/mxs
parentb0364064f437100a45a81cbbb636cbf4260ce5ff (diff)
downloadmaster-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.tar.gz
master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.tar.bz2
master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.zip
kernel: update 3.18 to 3.18.16
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46011 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mxs')
-rw-r--r--target/linux/mxs/patches-3.18/101-soc-audio-dts.patch6
-rw-r--r--target/linux/mxs/patches-3.18/120-dt-add-i2c.patch4
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mxs/patches-3.18/101-soc-audio-dts.patch b/target/linux/mxs/patches-3.18/101-soc-audio-dts.patch
index 36ae89ceca..3c3ad8678b 100644
--- a/target/linux/mxs/patches-3.18/101-soc-audio-dts.patch
+++ b/target/linux/mxs/patches-3.18/101-soc-audio-dts.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
-@@ -88,6 +88,25 @@
+@@ -89,6 +89,25 @@
usbphy0: usbphy@8007c000 {
status = "okay";
};
@@ -26,8 +26,8 @@
};
};
-@@ -125,4 +144,10 @@
- gpios = <&gpio2 1 1>;
+@@ -127,4 +146,10 @@
+ gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
};
};
+
diff --git a/target/linux/mxs/patches-3.18/120-dt-add-i2c.patch b/target/linux/mxs/patches-3.18/120-dt-add-i2c.patch
index 43a07e8f16..43b42cedc8 100644
--- a/target/linux/mxs/patches-3.18/120-dt-add-i2c.patch
+++ b/target/linux/mxs/patches-3.18/120-dt-add-i2c.patch
@@ -55,7 +55,7 @@
status = "disabled";
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
-@@ -73,6 +73,12 @@
+@@ -74,6 +74,12 @@
status = "okay";
};
@@ -68,7 +68,7 @@
duart: serial@80070000 {
pinctrl-names = "default";
pinctrl-0 = <&duart_pins_a>;
-@@ -88,7 +94,7 @@
+@@ -89,7 +95,7 @@
usbphy0: usbphy@8007c000 {
status = "okay";
};