diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-05-29 11:20:22 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-08-02 11:02:35 +0200 |
| commit | 799778946157283b374559a0640bea22e6821656 (patch) | |
| tree | f308e484930413d7e32de6d93a45ff90f8ee6716 /arch | |
| parent | d1e63c947a6fa4f61253343d9bbd834394a6c364 (diff) | |
| download | linux-stable-799778946157283b374559a0640bea22e6821656.tar.gz linux-stable-799778946157283b374559a0640bea22e6821656.tar.bz2 linux-stable-799778946157283b374559a0640bea22e6821656.zip | |
MIPS: ralink: fix spis group pinmux
pwm function for spis conflicts with uart2 and uart1, fix this by changing it
to pwm_uart2, which reflects the real use of these pins with these pinmux
(2 for pwm and 2 for uart).
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Cc: john@phrozen.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13369/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/ralink/mt7620.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c index d40edda0ca3b..3c7c9bf57bf3 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -175,7 +175,7 @@ static struct rt2880_pmx_func spi_cs1_grp_mt7628[] = { }; static struct rt2880_pmx_func spis_grp_mt7628[] = { - FUNC("pwm", 3, 14, 4), + FUNC("pwm_uart2", 3, 14, 4), FUNC("util", 2, 14, 4), FUNC("gpio", 1, 14, 4), FUNC("spis", 0, 14, 4), |