diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-12 10:38:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-12 10:38:54 +0000 |
| commit | 7c7e5c4276090357f57d9a43ba0d25a167b2a83c (patch) | |
| tree | 4935c53a401a00be6a8092cfadfc2a69cef47df4 /target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch | |
| parent | b2314679b639ddc338ef69d27ce4d959b250f754 (diff) | |
| download | upstream-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.tar.gz upstream-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.tar.bz2 upstream-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.zip | |
mvebu: make patches apply against 3.18.18 again
commit r46299 broke the mvebu target because one patch does not apply
any more. This commit closes #20070.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46303
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 | 5 |
1 files changed, 2 insertions, 3 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 fd75366e38..07f8e2994d 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 @@ -17,9 +17,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- 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_ +@@ -146,13 +146,15 @@ 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(3, "ge0", "txerr", V_88F6810_PLUS), MPP_VAR_FUNCTION(4, "sata1", "prsnt", V_88F6810_PLUS), - MPP_VAR_FUNCTION(5, "ua0", "cts", V_88F6810_PLUS)), + MPP_VAR_FUNCTION(5, "ua0", "cts", V_88F6810_PLUS), @@ -28,7 +28,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS), MPP_VAR_FUNCTION(1, "ge0", "txclk", V_88F6810_PLUS), MPP_VAR_FUNCTION(2, "ptp", "clk", V_88F6810_PLUS), - MPP_VAR_FUNCTION(3, "pcie1", "rstout", V_88F6820_PLUS), MPP_VAR_FUNCTION(4, "sata0", "prsnt", V_88F6810_PLUS), - MPP_VAR_FUNCTION(5, "ua0", "rts", V_88F6810_PLUS)), + MPP_VAR_FUNCTION(5, "ua0", "rts", V_88F6810_PLUS), |