aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch)
treec76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch
parent3951f9492f31b59602a9a7c46fbb041be0929be0 (diff)
downloadupstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
Diffstat (limited to 'target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch')
-rw-r--r--target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch b/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch
index f2d7f6ca17..c93662a420 100644
--- a/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch
+++ b/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch
@@ -97,11 +97,10 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
};
uart4 {
-@@ -1106,6 +1157,15 @@
- >;
+@@ -1107,6 +1158,15 @@
};
};
-+
+
+ uart5 {
+ pinctrl_uart5_1: uart5grp-1 {
+ fsl,pins = <
@@ -110,6 +109,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+ >;
+ };
+ };
-
++
usbotg {
pinctrl_usbotg_1: usbotggrp-1 {
+ fsl,pins = <