diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
| commit | b9c13dc540403877ee43369ce0027f43c7cab928 (patch) | |
| tree | dec25a80e17d7c6d67b6daf822c22f5d10db3dd5 /target/linux/mxs | |
| parent | 966f1ab30128279f7b07acda088f4f3399718867 (diff) | |
| download | upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.gz upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.bz2 upstream-b9c13dc540403877ee43369ce0027f43c7cab928.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>
Backport of r46011.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46015 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mxs')
| -rw-r--r-- | target/linux/mxs/patches-3.18/101-soc-audio-dts.patch | 6 | ||||
| -rw-r--r-- | target/linux/mxs/patches-3.18/120-dt-add-i2c.patch | 4 |
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"; }; |