diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-10 15:45:27 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-10 16:32:22 +0100 |
| commit | f6e9f2377119965d4db164568b4a90c4e895cd3d (patch) | |
| tree | c5783e4acff70de9b194a5dec1bc49331867f7a0 /target/linux/ramips | |
| parent | 861dcd717f021cdabf93c26d295dc96a879572b1 (diff) | |
| download | upstream-f6e9f2377119965d4db164568b4a90c4e895cd3d.tar.gz upstream-f6e9f2377119965d4db164568b4a90c4e895cd3d.tar.bz2 upstream-f6e9f2377119965d4db164568b4a90c4e895cd3d.zip | |
kernel: bump 4.14 to 4.14.87
Refreshed all patches.
Remove upstreamed:
- 0008-MIPS-ralink-Fix-mt7620-nd_sd-pinmux.patch
Compile-tested: cns3xxx, imx6
Runtime-tested: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/patches-4.14/0008-MIPS-ralink-Fix-mt7620-nd_sd-pinmux.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/target/linux/ramips/patches-4.14/0008-MIPS-ralink-Fix-mt7620-nd_sd-pinmux.patch b/target/linux/ramips/patches-4.14/0008-MIPS-ralink-Fix-mt7620-nd_sd-pinmux.patch deleted file mode 100644 index acfda58f3d..0000000000 --- a/target/linux/ramips/patches-4.14/0008-MIPS-ralink-Fix-mt7620-nd_sd-pinmux.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d41237229464ae03fe116b591e8a2fda4ffea48e Mon Sep 17 00:00:00 2001 -From: Mathias Kresin <dev@kresin.me> -Date: Sun, 28 Oct 2018 12:46:55 +0100 -Subject: [PATCH] MIPS: ralink: Fix mt7620 nd_sd pinmux - -In case the nd_sd group is set to the sd-card function, Pins 45 + 46 are -configured as GPIOs. If they are blocked by the sd function, they can't -be used as GPIOs. - -Signed-off-by: Mathias Kresin <dev@kresin.me> -Reported-by: Kristian Evensen <kristian.evensen@gmail.com> -Fixes: f576fb6a0700 ("MIPS: ralink: cleanup the soc specific pinmux -data") -Cc: stable@vger.kernel.org # v3.18+ ---- - arch/mips/ralink/mt7620.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/ralink/mt7620.c -+++ b/arch/mips/ralink/mt7620.c -@@ -84,7 +84,7 @@ static struct rt2880_pmx_func pcie_rst_g - }; - static struct rt2880_pmx_func nd_sd_grp[] = { - FUNC("nand", MT7620_GPIO_MODE_NAND, 45, 15), -- FUNC("sd", MT7620_GPIO_MODE_SD, 45, 15) -+ FUNC("sd", MT7620_GPIO_MODE_SD, 47, 13) - }; - - static struct rt2880_pmx_group mt7620a_pinmux_data[] = { |