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 | 5fa26ab96ae22c215e2a86812a2c04bfd50a5fc3 (patch) | |
tree | 07b8cf2320086aed60e83252c03145fbfa772cf5 /target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch | |
parent | c07d8fffd3bda085f52cf4f2c2a3f7fb43417f4b (diff) | |
download | upstream-5fa26ab96ae22c215e2a86812a2c04bfd50a5fc3.tar.gz upstream-5fa26ab96ae22c215e2a86812a2c04bfd50a5fc3.tar.bz2 upstream-5fa26ab96ae22c215e2a86812a2c04bfd50a5fc3.zip |
mvebu: refresh 3.18 patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44462 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 - |