diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-02-16 12:48:05 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-02-16 12:48:05 +0000 |
| commit | 29130d39e3f002b684d4fdbcb3dff4ecc202be2c (patch) | |
| tree | 481f328f8e8475fbd2b56a0a375da99e187d1cb9 /target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch | |
| parent | 00d422fc600232d02f70877305288501d15ed07d (diff) | |
| download | upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.tar.gz upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.tar.bz2 upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.zip | |
mvebu: refresh 3.18 patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44462
Diffstat (limited to 'target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch b/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch index cd85d9d155..fd75366e38 100644 --- a/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch +++ b/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch @@ -15,11 +15,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c -index 224c6cff6aa2..7302f66f4f19 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c -@@ -145,14 +145,16 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = { +@@ -145,14 +145,16 @@ static struct mvebu_mpp_mode armada_38x_ MPP_VAR_FUNCTION(2, "ptp", "event_req", V_88F6810_PLUS), MPP_VAR_FUNCTION(3, "pcie0", "clkreq", V_88F6810_PLUS), MPP_VAR_FUNCTION(4, "sata1", "prsnt", V_88F6810_PLUS), @@ -38,6 +36,3 @@ index 224c6cff6aa2..7302f66f4f19 100644 MPP_MODE(21, MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS), MPP_VAR_FUNCTION(1, "spi0", "cs1", V_88F6810_PLUS), --- -2.2.1 - |