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. Reported-by: Kristian Evensen <kristian.evensen@gmail.com> Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
parent
9ebce69611
commit
d6ce04dad8
1 changed files with 29 additions and 0 deletions
|
@ -0,0 +1,29 @@
|
||||||
|
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[] = {
|
Loading…
Reference in a new issue