diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-01-11 01:28:32 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-01-11 01:28:32 +0000 |
| commit | 725f724cc86cf6dea41eff8f2eb32b1499fd5385 (patch) | |
| tree | 6116f84c29d3abfc8f4af16af03b25dd0e638510 /target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch | |
| parent | e8a287dda63fe7065ba5aa14ba9c155401402f0b (diff) | |
| download | master-187ad058-725f724cc86cf6dea41eff8f2eb32b1499fd5385.tar.gz master-187ad058-725f724cc86cf6dea41eff8f2eb32b1499fd5385.tar.bz2 master-187ad058-725f724cc86cf6dea41eff8f2eb32b1499fd5385.zip | |
kernel: update 3.14 to 3.14.28
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43929 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 8 |
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 c93662a420..f2d7f6ca17 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,10 +97,11 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org> }; uart4 { -@@ -1107,6 +1158,15 @@ +@@ -1106,6 +1157,15 @@ + >; }; }; - ++ + uart5 { + pinctrl_uart5_1: uart5grp-1 { + fsl,pins = < @@ -109,7 +110,6 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org> + >; + }; + }; -+ + usbotg { pinctrl_usbotg_1: usbotggrp-1 { - fsl,pins = < |