diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-08-08 13:38:22 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-08-08 13:38:22 +0000 |
| commit | 7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555 (patch) | |
| tree | e591d51d709aeecdd91d06bcb00461180e084209 /target/linux/mxs/patches-3.14/120-dt-add-i2c.patch | |
| parent | f34aeeedd4dd6ebb07500c67a0bdad6fe88a44b4 (diff) | |
| download | upstream-7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555.tar.gz upstream-7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555.tar.bz2 upstream-7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555.zip | |
kernel: update 3.14 to 3.14.16
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42070 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mxs/patches-3.14/120-dt-add-i2c.patch')
| -rw-r--r-- | target/linux/mxs/patches-3.14/120-dt-add-i2c.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mxs/patches-3.14/120-dt-add-i2c.patch b/target/linux/mxs/patches-3.14/120-dt-add-i2c.patch index 3f89fff706..50bd8666b4 100644 --- a/target/linux/mxs/patches-3.14/120-dt-add-i2c.patch +++ b/target/linux/mxs/patches-3.14/120-dt-add-i2c.patch @@ -40,7 +40,7 @@ auart0_pins_a: auart0@0 { reg = <0>; fsl,pinmux-ids = < -@@ -443,7 +476,12 @@ +@@ -444,7 +477,12 @@ }; i2c@80058000 { @@ -55,7 +55,7 @@ status = "disabled"; --- a/arch/arm/boot/dts/imx23-olinuxino.dts +++ b/arch/arm/boot/dts/imx23-olinuxino.dts -@@ -79,6 +79,12 @@ +@@ -73,6 +73,12 @@ status = "okay"; }; @@ -68,7 +68,7 @@ duart: serial@80070000 { pinctrl-names = "default"; pinctrl-0 = <&duart_pins_a>; -@@ -94,7 +100,7 @@ +@@ -88,7 +94,7 @@ usbphy0: usbphy@8007c000 { status = "okay"; }; |