Patch "MIPS: ralink: MT7688 pinmux fixes" has been added to the 4.4-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
MIPS: ralink: MT7688 pinmux fixes
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mips-ralink-mt7688-pinmux-fixes.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
e906a5f67e5a3337d696ec848e9c28fc68b39aa3Mon Sep 17 00:00:00 2001
From: John Crispin <[email protected]>
Date: Mon, 4 Jan 2016 20:23:56 +0100
Subject: MIPS: ralink: MT7688 pinmux fixes
From: John Crispin <[email protected]>
commit e906a5f67e5a3337d696ec848e9c28fc68b39aa3 upstream.
A few fixes to the pinmux data, 2 new muxes and a minor whitespace cleanup.
Patchwork: https://patchwork.linux-mips.org/patch/11991/
--- arch/mips/ralink/mt7620.c | 80 ++++++++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 30 deletions(-)
arch/mips/ralink/mt7620.c +50 -30
@@ -107,31 +107,31 @@ static struct rt2880_pmx_group mt7620a_p };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_mtstatic 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_grFUNC ("-" ,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,28 +188,44 @@ static struct rt2880_pmx_func gpio_grp_m FUNC("gpio", 0, 11, 1), }; -#define MT7628_GPIO_MODE_MASK 0x3 - -#define MT7628_GPIO_MODE_PWM1 30 -#define MT7628_GPIO_MODE_PWM0 28 -#define MT7628_GPIO_MODE_UART2 26 -#define MT7628_GPIO_MODE_UART1 24 -#define MT7628_GPIO_MODE_I2C 20 -#define MT7628_GPIO_MODE_REFCLK 18 -#define MT7628_GPIO_MODE_PERST 16 -#define MT7628_GPIO_MODE_WDT 14 -#define MT7628_GPIO_MODE_SPI 12 -#define MT7628_GPIO_MODE_SDMODE 10 -#define MT7628_GPIO_MODE_UART0 8 -#define MT7628_GPIO_MODE_I2S 6 -#define MT7628_GPIO_MODE_CS1 4 -#define MT7628_GPIO_MODE_SPIS 2 -#define MT7628_GPIO_MODE_GPIO 0 +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 +#define MT7628_GPIO_MODE_UART1 24 +#define MT7628_GPIO_MODE_I2C 20 +#define MT7628_GPIO_MODE_REFCLK 18 +#define MT7628_GPIO_MODE_PERST 16 +#define MT7628_GPIO_MODE_WDT 14 +#define MT7628_GPIO_MODE_SPI 12 +#define MT7628_GPIO_MODE_SDMODE 10 +#define MT7628_GPIO_MODE_UART0 8 +#define MT7628_GPIO_MODE_I2S 6 +#define MT7628_GPIO_MODE_CS1 4 +#define MT7628_GPIO_MODE_SPIS 2 +#define MT7628_GPIO_MODE_GPIO 0static 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_ 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 } };
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/mips-ralink-fix-invalid-assignment-of-soc-type.patch queue-4.4/mips-ralink-mt7688-pinmux-fixes.patch queue-4.4/mips-ralink-fix-usb-frequency-scaling.patch