Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e906a5f6 authored by John Crispin's avatar John Crispin Committed by Ralf Baechle
Browse files

MIPS: ralink: MT7688 pinmux fixes 



A few fixes to the pinmux data, 2 new muxes and a minor whitespace
cleanup.

Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11991/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1df7addb

arch/mips/ralink/mt7620.c

+50 −30
Original line number Diff line number Diff line
@@ -107,31 +107,31 @@ static struct rt2880_pmx_group mt7620a_pinmux_data[] = { 
};



static struct rt2880_pmx_func pwm1_grp_mt7628[] = {

	FUNC("sdcx", 3, 19, 1),

	FUNC("sdxc d6", 3, 19, 1),

	FUNC("utif", 2, 19, 1),

	FUNC("gpio", 1, 19, 1),

	FUNC("pwm", 0, 19, 1),

	FUNC("pwm1", 0, 19, 1),

};



static struct rt2880_pmx_func pwm0_grp_mt7628[] = {

	FUNC("sdcx", 3, 18, 1),

	FUNC("sdxc d7", 3, 18, 1),

	FUNC("utif", 2, 18, 1),

	FUNC("gpio", 1, 18, 1),

	FUNC("pwm", 0, 18, 1),

	FUNC("pwm0", 0, 18, 1),

};



static struct rt2880_pmx_func uart2_grp_mt7628[] = {

	FUNC("sdcx", 3, 20, 2),

	FUNC("sdxc d5 d4", 3, 20, 2),

	FUNC("pwm", 2, 20, 2),

	FUNC("gpio", 1, 20, 2),

	FUNC("uart", 0, 20, 2),

	FUNC("uart2", 0, 20, 2),

};



static struct rt2880_pmx_func uart1_grp_mt7628[] = {

	FUNC("sdcx", 3, 45, 2),

	FUNC("sw_r", 3, 45, 2),

	FUNC("pwm", 2, 45, 2),

	FUNC("gpio", 1, 45, 2),

	FUNC("uart", 0, 45, 2),

	FUNC("uart1", 0, 45, 2),

};



static struct rt2880_pmx_func i2c_grp_mt7628[] = {
@@ -143,21 +143,21 @@ static struct rt2880_pmx_func i2c_grp_mt7628[] = { 


static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 36, 1) };

static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 37, 1) };

static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 15, 38) };

static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) };

static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) };



static struct rt2880_pmx_func sd_mode_grp_mt7628[] = {

	FUNC("jtag", 3, 22, 8),

	FUNC("utif", 2, 22, 8),

	FUNC("gpio", 1, 22, 8),

	FUNC("sdcx", 0, 22, 8),

	FUNC("sdxc", 0, 22, 8),

};



static struct rt2880_pmx_func uart0_grp_mt7628[] = {

	FUNC("-", 3, 12, 2),

	FUNC("-", 2, 12, 2),

	FUNC("gpio", 1, 12, 2),

	FUNC("uart", 0, 12, 2),

	FUNC("uart0", 0, 12, 2),

};



static struct rt2880_pmx_func i2s_grp_mt7628[] = {
@@ -171,7 +171,7 @@ static struct rt2880_pmx_func spi_cs1_grp_mt7628[] = { 
	FUNC("-", 3, 6, 1),

	FUNC("refclk", 2, 6, 1),

	FUNC("gpio", 1, 6, 1),

	FUNC("spi", 0, 6, 1),

	FUNC("spi cs1", 0, 6, 1),

};



static struct rt2880_pmx_func spis_grp_mt7628[] = {
@@ -188,8 +188,24 @@ static struct rt2880_pmx_func gpio_grp_mt7628[] = { 
	FUNC("gpio", 0, 11, 1),

};



static struct rt2880_pmx_func wled_kn_grp_mt7628[] = {

	FUNC("rsvd", 3, 35, 1),

	FUNC("rsvd", 2, 35, 1),

	FUNC("gpio", 1, 35, 1),

	FUNC("wled_kn", 0, 35, 1),

};



static struct rt2880_pmx_func wled_an_grp_mt7628[] = {

	FUNC("rsvd", 3, 35, 1),

	FUNC("rsvd", 2, 35, 1),

	FUNC("gpio", 1, 35, 1),

	FUNC("wled_an", 0, 35, 1),

};



#define MT7628_GPIO_MODE_MASK		0x3



#define MT7628_GPIO_MODE_WLED_KN	48

#define MT7628_GPIO_MODE_WLED_AN	32

#define MT7628_GPIO_MODE_PWM1		30

#define MT7628_GPIO_MODE_PWM0		28

#define MT7628_GPIO_MODE_UART2		26
@@ -209,7 +225,7 @@ static struct rt2880_pmx_func gpio_grp_mt7628[] = { 
static struct rt2880_pmx_group mt7628an_pinmux_data[] = {

	GRP_G("pmw1", pwm1_grp_mt7628, MT7628_GPIO_MODE_MASK,

				1, MT7628_GPIO_MODE_PWM1),

	GRP_G("pmw1", pwm0_grp_mt7628, MT7628_GPIO_MODE_MASK,

	GRP_G("pmw0", pwm0_grp_mt7628, MT7628_GPIO_MODE_MASK,

				1, MT7628_GPIO_MODE_PWM0),

	GRP_G("uart2", uart2_grp_mt7628, MT7628_GPIO_MODE_MASK,

				1, MT7628_GPIO_MODE_UART2),
@@ -233,6 +249,10 @@ static struct rt2880_pmx_group mt7628an_pinmux_data[] = { 
				1, MT7628_GPIO_MODE_SPIS),

	GRP_G("gpio", gpio_grp_mt7628, MT7628_GPIO_MODE_MASK,

				1, MT7628_GPIO_MODE_GPIO),

	GRP_G("wled_an", wled_an_grp_mt7628, MT7628_GPIO_MODE_MASK,

				1, MT7628_GPIO_MODE_WLED_AN),

	GRP_G("wled_kn", wled_kn_grp_mt7628, MT7628_GPIO_MODE_MASK,

				1, MT7628_GPIO_MODE_WLED_KN),

	{ 0 }

};