* [PATCH 1/2] pinctrl: mediatek: mt7981: add additional uart group
@ 2024-01-17 12:42 ` Jean Thomas
0 siblings, 0 replies; 9+ messages in thread
From: Jean Thomas @ 2024-01-17 12:42 UTC (permalink / raw)
To: sean.wang, linus.walleij, matthias.bgg,
angelogioacchino.delregno, linux-mediatek, linux-gpio,
linux-kernel, linux-arm-kernel
Cc: Jean Thomas
Add uart1_3 (pins 26, 27) group to the pinctrl driver for the
MediaTek MT7981 SoC.
Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
---
drivers/pinctrl/mediatek/pinctrl-mt7981.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
index 7e59a4407859..ca667ed25a4d 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
@@ -737,6 +737,9 @@ static int mt7981_uart1_1_funcs[] = { 2, 2, 2, 2, };
static int mt7981_uart1_2_pins[] = { 9, 10, };
static int mt7981_uart1_2_funcs[] = { 2, 2, };
+static int mt7981_uart1_3_pins[] = { 26, 27, };
+static int mt7981_uart1_3_funcs[] = { 2, 2, };
+
/* UART2 */
static int mt7981_uart2_1_pins[] = { 22, 23, 24, 25, };
static int mt7981_uart2_1_funcs[] = { 3, 3, 3, 3, };
@@ -871,6 +874,8 @@ static const struct group_desc mt7981_groups[] = {
PINCTRL_PIN_GROUP("uart1_1", mt7981_uart1_1),
/* @GPIO(9,10): UART1(2) */
PINCTRL_PIN_GROUP("uart1_2", mt7981_uart1_2),
+ /* @GPIO(26,27): UART1(2) */
+ PINCTRL_PIN_GROUP("uart1_3", mt7981_uart1_3),
/* @GPIO(22,25): UART1(3) */
PINCTRL_PIN_GROUP("uart2_1", mt7981_uart2_1),
/* @GPIO(22,24) PTA_EXT(4) */
@@ -933,7 +938,7 @@ static const struct group_desc mt7981_groups[] = {
static const char *mt7981_wa_aice_groups[] = { "wa_aice1", "wa_aice2", "wm_aice1_1",
"wa_aice3", "wm_aice1_2", };
static const char *mt7981_uart_groups[] = { "net_wo0_uart_txd_0", "net_wo0_uart_txd_1",
- "net_wo0_uart_txd_2", "uart0", "uart1_0", "uart1_1", "uart1_2", "uart2_0",
+ "net_wo0_uart_txd_2", "uart0", "uart1_0", "uart1_1", "uart1_2", "uart1_3", "uart2_0",
"uart2_0_tx_rx", "uart2_1", "wm_uart_0", "wm_aurt_1", "wm_aurt_2", };
static const char *mt7981_dfd_groups[] = { "dfd", "dfd_ntrst", };
static const char *mt7981_wdt_groups[] = { "watchdog", "watchdog1", };
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/2] pinctrl: mediatek: mt7981: add additional uart group
@ 2024-01-17 12:42 ` Jean Thomas
0 siblings, 0 replies; 9+ messages in thread
From: Jean Thomas @ 2024-01-17 12:42 UTC (permalink / raw)
To: sean.wang, linus.walleij, matthias.bgg,
angelogioacchino.delregno, linux-mediatek, linux-gpio,
linux-kernel, linux-arm-kernel
Cc: Jean Thomas
Add uart1_3 (pins 26, 27) group to the pinctrl driver for the
MediaTek MT7981 SoC.
Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
---
drivers/pinctrl/mediatek/pinctrl-mt7981.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
index 7e59a4407859..ca667ed25a4d 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
@@ -737,6 +737,9 @@ static int mt7981_uart1_1_funcs[] = { 2, 2, 2, 2, };
static int mt7981_uart1_2_pins[] = { 9, 10, };
static int mt7981_uart1_2_funcs[] = { 2, 2, };
+static int mt7981_uart1_3_pins[] = { 26, 27, };
+static int mt7981_uart1_3_funcs[] = { 2, 2, };
+
/* UART2 */
static int mt7981_uart2_1_pins[] = { 22, 23, 24, 25, };
static int mt7981_uart2_1_funcs[] = { 3, 3, 3, 3, };
@@ -871,6 +874,8 @@ static const struct group_desc mt7981_groups[] = {
PINCTRL_PIN_GROUP("uart1_1", mt7981_uart1_1),
/* @GPIO(9,10): UART1(2) */
PINCTRL_PIN_GROUP("uart1_2", mt7981_uart1_2),
+ /* @GPIO(26,27): UART1(2) */
+ PINCTRL_PIN_GROUP("uart1_3", mt7981_uart1_3),
/* @GPIO(22,25): UART1(3) */
PINCTRL_PIN_GROUP("uart2_1", mt7981_uart2_1),
/* @GPIO(22,24) PTA_EXT(4) */
@@ -933,7 +938,7 @@ static const struct group_desc mt7981_groups[] = {
static const char *mt7981_wa_aice_groups[] = { "wa_aice1", "wa_aice2", "wm_aice1_1",
"wa_aice3", "wm_aice1_2", };
static const char *mt7981_uart_groups[] = { "net_wo0_uart_txd_0", "net_wo0_uart_txd_1",
- "net_wo0_uart_txd_2", "uart0", "uart1_0", "uart1_1", "uart1_2", "uart2_0",
+ "net_wo0_uart_txd_2", "uart0", "uart1_0", "uart1_1", "uart1_2", "uart1_3", "uart2_0",
"uart2_0_tx_rx", "uart2_1", "wm_uart_0", "wm_aurt_1", "wm_aurt_2", };
static const char *mt7981_dfd_groups[] = { "dfd", "dfd_ntrst", };
static const char *mt7981_wdt_groups[] = { "watchdog", "watchdog1", };
--
2.39.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] pinctrl: mediatek: mt7981: add additional emmc groups
2024-01-17 12:42 ` Jean Thomas
@ 2024-01-17 12:42 ` Jean Thomas
-1 siblings, 0 replies; 9+ messages in thread
From: Jean Thomas @ 2024-01-17 12:42 UTC (permalink / raw)
To: sean.wang, linus.walleij, matthias.bgg,
angelogioacchino.delregno, linux-mediatek, linux-gpio,
linux-kernel, linux-arm-kernel
Cc: Jean Thomas
Add new emmc groups in the pinctrl driver for the
MediaTek MT7981 SoC:
* emmc reset, with pin 15.
* emmc 4-bit bus-width, with pins 16 to 19, and 24 to 25.
* emmc 8-bit bus-width, with pins 16 to 25.
The existing emmc_45 group is kept for legacy reasons, even
if this is the union of emmc_reset and emmc_8 groups.
Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
---
drivers/pinctrl/mediatek/pinctrl-mt7981.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
index ca667ed25a4d..ef6123765885 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
@@ -700,6 +700,15 @@ static int mt7981_drv_vbus_pins[] = { 14, };
static int mt7981_drv_vbus_funcs[] = { 1, };
/* EMMC */
+static int mt7981_emmc_reset_pins[] = { 15, };
+static int mt7981_emmc_reset_funcs[] = { 2, };
+
+static int mt7981_emmc_4_pins[] = { 16, 17, 18, 19, 24, 25, };
+static int mt7981_emmc_4_funcs[] = { 2, 2, 2, 2, 2, 2, };
+
+static int mt7981_emmc_8_pins[] = { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
+static int mt7981_emmc_8_funcs[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
+
static int mt7981_emmc_45_pins[] = { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
static int mt7981_emmc_45_funcs[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
@@ -854,6 +863,12 @@ static const struct group_desc mt7981_groups[] = {
PINCTRL_PIN_GROUP("udi", mt7981_udi),
/* @GPIO(14) DRV_VBUS(1) */
PINCTRL_PIN_GROUP("drv_vbus", mt7981_drv_vbus),
+ /* @GPIO(15): EMMC_RSTB(2) */
+ PINCTRL_PIN_GROUP("emmc_reset", mt7981_emmc_reset),
+ /* @GPIO(16,17,18,19,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
+ PINCTRL_PIN_GROUP("emmc_4", mt7981_emmc_4),
+ /* @GPIO(16,17,18,19,20,21,22,23,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
+ PINCTRL_PIN_GROUP("emmc_8", mt7981_emmc_8),
/* @GPIO(15,25): EMMC(2) */
PINCTRL_PIN_GROUP("emmc_45", mt7981_emmc_45),
/* @GPIO(16,21): SNFI(3) */
@@ -957,7 +972,7 @@ static const char *mt7981_i2c_groups[] = { "i2c0_0", "i2c0_1", "u2_phy_i2c",
static const char *mt7981_pcm_groups[] = { "pcm", };
static const char *mt7981_udi_groups[] = { "udi", };
static const char *mt7981_usb_groups[] = { "drv_vbus", };
-static const char *mt7981_flash_groups[] = { "emmc_45", "snfi", };
+static const char *mt7981_flash_groups[] = { "emmc_reset", "emmc_4", "emmc_8", "emmc_45", "snfi", };
static const char *mt7981_ethernet_groups[] = { "smi_mdc_mdio", "gbe_ext_mdc_mdio",
"wf0_mode1", "wf0_mode3", "mt7531_int", };
static const char *mt7981_ant_groups[] = { "ant_sel", };
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] pinctrl: mediatek: mt7981: add additional emmc groups
@ 2024-01-17 12:42 ` Jean Thomas
0 siblings, 0 replies; 9+ messages in thread
From: Jean Thomas @ 2024-01-17 12:42 UTC (permalink / raw)
To: sean.wang, linus.walleij, matthias.bgg,
angelogioacchino.delregno, linux-mediatek, linux-gpio,
linux-kernel, linux-arm-kernel
Cc: Jean Thomas
Add new emmc groups in the pinctrl driver for the
MediaTek MT7981 SoC:
* emmc reset, with pin 15.
* emmc 4-bit bus-width, with pins 16 to 19, and 24 to 25.
* emmc 8-bit bus-width, with pins 16 to 25.
The existing emmc_45 group is kept for legacy reasons, even
if this is the union of emmc_reset and emmc_8 groups.
Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
---
drivers/pinctrl/mediatek/pinctrl-mt7981.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
index ca667ed25a4d..ef6123765885 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
@@ -700,6 +700,15 @@ static int mt7981_drv_vbus_pins[] = { 14, };
static int mt7981_drv_vbus_funcs[] = { 1, };
/* EMMC */
+static int mt7981_emmc_reset_pins[] = { 15, };
+static int mt7981_emmc_reset_funcs[] = { 2, };
+
+static int mt7981_emmc_4_pins[] = { 16, 17, 18, 19, 24, 25, };
+static int mt7981_emmc_4_funcs[] = { 2, 2, 2, 2, 2, 2, };
+
+static int mt7981_emmc_8_pins[] = { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
+static int mt7981_emmc_8_funcs[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
+
static int mt7981_emmc_45_pins[] = { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
static int mt7981_emmc_45_funcs[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
@@ -854,6 +863,12 @@ static const struct group_desc mt7981_groups[] = {
PINCTRL_PIN_GROUP("udi", mt7981_udi),
/* @GPIO(14) DRV_VBUS(1) */
PINCTRL_PIN_GROUP("drv_vbus", mt7981_drv_vbus),
+ /* @GPIO(15): EMMC_RSTB(2) */
+ PINCTRL_PIN_GROUP("emmc_reset", mt7981_emmc_reset),
+ /* @GPIO(16,17,18,19,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
+ PINCTRL_PIN_GROUP("emmc_4", mt7981_emmc_4),
+ /* @GPIO(16,17,18,19,20,21,22,23,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
+ PINCTRL_PIN_GROUP("emmc_8", mt7981_emmc_8),
/* @GPIO(15,25): EMMC(2) */
PINCTRL_PIN_GROUP("emmc_45", mt7981_emmc_45),
/* @GPIO(16,21): SNFI(3) */
@@ -957,7 +972,7 @@ static const char *mt7981_i2c_groups[] = { "i2c0_0", "i2c0_1", "u2_phy_i2c",
static const char *mt7981_pcm_groups[] = { "pcm", };
static const char *mt7981_udi_groups[] = { "udi", };
static const char *mt7981_usb_groups[] = { "drv_vbus", };
-static const char *mt7981_flash_groups[] = { "emmc_45", "snfi", };
+static const char *mt7981_flash_groups[] = { "emmc_reset", "emmc_4", "emmc_8", "emmc_45", "snfi", };
static const char *mt7981_ethernet_groups[] = { "smi_mdc_mdio", "gbe_ext_mdc_mdio",
"wf0_mode1", "wf0_mode3", "mt7531_int", };
static const char *mt7981_ant_groups[] = { "ant_sel", };
--
2.39.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] pinctrl: mediatek: mt7981: add additional uart group
2024-01-17 12:42 ` Jean Thomas
(?)
(?)
@ 2024-01-17 13:47 ` Daniel Golle
-1 siblings, 0 replies; 9+ messages in thread
From: Daniel Golle @ 2024-01-17 13:47 UTC (permalink / raw)
To: linux-mediatek
On 17 January 2024 12:42:33 UTC, Jean Thomas <jean.thomas@wifirst.fr> wrote:
>Add uart1_3 (pins 26, 27) group to the pinctrl driver for the
>MediaTek MT7981 SoC.
>
>Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
>---
> drivers/pinctrl/mediatek/pinctrl-mt7981.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>index 7e59a4407859..ca667ed25a4d 100644
>--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>@@ -737,6 +737,9 @@ static int mt7981_uart1_1_funcs[] = { 2, 2, 2, 2, };
> static int mt7981_uart1_2_pins[] = { 9, 10, };
> static int mt7981_uart1_2_funcs[] = { 2, 2, };
>
>+static int mt7981_uart1_3_pins[] = { 26, 27, };
>+static int mt7981_uart1_3_funcs[] = { 2, 2, };
>+
> /* UART2 */
> static int mt7981_uart2_1_pins[] = { 22, 23, 24, 25, };
> static int mt7981_uart2_1_funcs[] = { 3, 3, 3, 3, };
>@@ -871,6 +874,8 @@ static const struct group_desc mt7981_groups[] = {
> PINCTRL_PIN_GROUP("uart1_1", mt7981_uart1_1),
> /* @GPIO(9,10): UART1(2) */
> PINCTRL_PIN_GROUP("uart1_2", mt7981_uart1_2),
>+ /* @GPIO(26,27): UART1(2) */
>+ PINCTRL_PIN_GROUP("uart1_3", mt7981_uart1_3),
> /* @GPIO(22,25): UART1(3) */
> PINCTRL_PIN_GROUP("uart2_1", mt7981_uart2_1),
> /* @GPIO(22,24) PTA_EXT(4) */
>@@ -933,7 +938,7 @@ static const struct group_desc mt7981_groups[] = {
> static const char *mt7981_wa_aice_groups[] = { "wa_aice1", "wa_aice2", "wm_aice1_1",
> "wa_aice3", "wm_aice1_2", };
> static const char *mt7981_uart_groups[] = { "net_wo0_uart_txd_0", "net_wo0_uart_txd_1",
>- "net_wo0_uart_txd_2", "uart0", "uart1_0", "uart1_1", "uart1_2", "uart2_0",
>+ "net_wo0_uart_txd_2", "uart0", "uart1_0", "uart1_1", "uart1_2", "uart1_3", "uart2_0",
> "uart2_0_tx_rx", "uart2_1", "wm_uart_0", "wm_aurt_1", "wm_aurt_2", };
> static const char *mt7981_dfd_groups[] = { "dfd", "dfd_ntrst", };
> static const char *mt7981_wdt_groups[] = { "watchdog", "watchdog1", };
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] pinctrl: mediatek: mt7981: add additional emmc groups
2024-01-17 12:42 ` Jean Thomas
@ 2024-01-17 14:08 ` Daniel Golle
-1 siblings, 0 replies; 9+ messages in thread
From: Daniel Golle @ 2024-01-17 14:08 UTC (permalink / raw)
To: linux-mediatek, Jean Thomas, sean.wang, linus.walleij,
matthias.bgg, angelogioacchino.delregno, linux-gpio,
linux-kernel, linux-arm-kernel
On 17 January 2024 12:42:34 UTC, Jean Thomas <jean.thomas@wifirst.fr> wrote:
>Add new emmc groups in the pinctrl driver for the
>MediaTek MT7981 SoC:
>* emmc reset, with pin 15.
>* emmc 4-bit bus-width, with pins 16 to 19, and 24 to 25.
>* emmc 8-bit bus-width, with pins 16 to 25.
>
>The existing emmc_45 group is kept for legacy reasons, even
>if this is the union of emmc_reset and emmc_8 groups.
>
>Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
>---
> drivers/pinctrl/mediatek/pinctrl-mt7981.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>index ca667ed25a4d..ef6123765885 100644
>--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>@@ -700,6 +700,15 @@ static int mt7981_drv_vbus_pins[] = { 14, };
> static int mt7981_drv_vbus_funcs[] = { 1, };
>
> /* EMMC */
>+static int mt7981_emmc_reset_pins[] = { 15, };
>+static int mt7981_emmc_reset_funcs[] = { 2, };
>+
>+static int mt7981_emmc_4_pins[] = { 16, 17, 18, 19, 24, 25, };
>+static int mt7981_emmc_4_funcs[] = { 2, 2, 2, 2, 2, 2, };
>+
>+static int mt7981_emmc_8_pins[] = { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
>+static int mt7981_emmc_8_funcs[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
>+
> static int mt7981_emmc_45_pins[] = { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
> static int mt7981_emmc_45_funcs[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
>
>@@ -854,6 +863,12 @@ static const struct group_desc mt7981_groups[] = {
> PINCTRL_PIN_GROUP("udi", mt7981_udi),
> /* @GPIO(14) DRV_VBUS(1) */
> PINCTRL_PIN_GROUP("drv_vbus", mt7981_drv_vbus),
>+ /* @GPIO(15): EMMC_RSTB(2) */
>+ PINCTRL_PIN_GROUP("emmc_reset", mt7981_emmc_reset),
>+ /* @GPIO(16,17,18,19,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
>+ PINCTRL_PIN_GROUP("emmc_4", mt7981_emmc_4),
>+ /* @GPIO(16,17,18,19,20,21,22,23,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
>+ PINCTRL_PIN_GROUP("emmc_8", mt7981_emmc_8),
> /* @GPIO(15,25): EMMC(2) */
> PINCTRL_PIN_GROUP("emmc_45", mt7981_emmc_45),
> /* @GPIO(16,21): SNFI(3) */
>@@ -957,7 +972,7 @@ static const char *mt7981_i2c_groups[] = { "i2c0_0", "i2c0_1", "u2_phy_i2c",
> static const char *mt7981_pcm_groups[] = { "pcm", };
> static const char *mt7981_udi_groups[] = { "udi", };
> static const char *mt7981_usb_groups[] = { "drv_vbus", };
>-static const char *mt7981_flash_groups[] = { "emmc_45", "snfi", };
>+static const char *mt7981_flash_groups[] = { "emmc_reset", "emmc_4", "emmc_8", "emmc_45", "snfi", };
> static const char *mt7981_ethernet_groups[] = { "smi_mdc_mdio", "gbe_ext_mdc_mdio",
> "wf0_mode1", "wf0_mode3", "mt7531_int", };
> static const char *mt7981_ant_groups[] = { "ant_sel", };
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] pinctrl: mediatek: mt7981: add additional emmc groups
@ 2024-01-17 14:08 ` Daniel Golle
0 siblings, 0 replies; 9+ messages in thread
From: Daniel Golle @ 2024-01-17 14:08 UTC (permalink / raw)
To: linux-mediatek, Jean Thomas, sean.wang, linus.walleij,
matthias.bgg, angelogioacchino.delregno, linux-gpio,
linux-kernel, linux-arm-kernel
On 17 January 2024 12:42:34 UTC, Jean Thomas <jean.thomas@wifirst.fr> wrote:
>Add new emmc groups in the pinctrl driver for the
>MediaTek MT7981 SoC:
>* emmc reset, with pin 15.
>* emmc 4-bit bus-width, with pins 16 to 19, and 24 to 25.
>* emmc 8-bit bus-width, with pins 16 to 25.
>
>The existing emmc_45 group is kept for legacy reasons, even
>if this is the union of emmc_reset and emmc_8 groups.
>
>Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
>---
> drivers/pinctrl/mediatek/pinctrl-mt7981.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>index ca667ed25a4d..ef6123765885 100644
>--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
>@@ -700,6 +700,15 @@ static int mt7981_drv_vbus_pins[] = { 14, };
> static int mt7981_drv_vbus_funcs[] = { 1, };
>
> /* EMMC */
>+static int mt7981_emmc_reset_pins[] = { 15, };
>+static int mt7981_emmc_reset_funcs[] = { 2, };
>+
>+static int mt7981_emmc_4_pins[] = { 16, 17, 18, 19, 24, 25, };
>+static int mt7981_emmc_4_funcs[] = { 2, 2, 2, 2, 2, 2, };
>+
>+static int mt7981_emmc_8_pins[] = { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
>+static int mt7981_emmc_8_funcs[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
>+
> static int mt7981_emmc_45_pins[] = { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
> static int mt7981_emmc_45_funcs[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
>
>@@ -854,6 +863,12 @@ static const struct group_desc mt7981_groups[] = {
> PINCTRL_PIN_GROUP("udi", mt7981_udi),
> /* @GPIO(14) DRV_VBUS(1) */
> PINCTRL_PIN_GROUP("drv_vbus", mt7981_drv_vbus),
>+ /* @GPIO(15): EMMC_RSTB(2) */
>+ PINCTRL_PIN_GROUP("emmc_reset", mt7981_emmc_reset),
>+ /* @GPIO(16,17,18,19,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
>+ PINCTRL_PIN_GROUP("emmc_4", mt7981_emmc_4),
>+ /* @GPIO(16,17,18,19,20,21,22,23,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
>+ PINCTRL_PIN_GROUP("emmc_8", mt7981_emmc_8),
> /* @GPIO(15,25): EMMC(2) */
> PINCTRL_PIN_GROUP("emmc_45", mt7981_emmc_45),
> /* @GPIO(16,21): SNFI(3) */
>@@ -957,7 +972,7 @@ static const char *mt7981_i2c_groups[] = { "i2c0_0", "i2c0_1", "u2_phy_i2c",
> static const char *mt7981_pcm_groups[] = { "pcm", };
> static const char *mt7981_udi_groups[] = { "udi", };
> static const char *mt7981_usb_groups[] = { "drv_vbus", };
>-static const char *mt7981_flash_groups[] = { "emmc_45", "snfi", };
>+static const char *mt7981_flash_groups[] = { "emmc_reset", "emmc_4", "emmc_8", "emmc_45", "snfi", };
> static const char *mt7981_ethernet_groups[] = { "smi_mdc_mdio", "gbe_ext_mdc_mdio",
> "wf0_mode1", "wf0_mode3", "mt7531_int", };
> static const char *mt7981_ant_groups[] = { "ant_sel", };
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] pinctrl: mediatek: mt7981: add additional uart group
2024-01-17 12:42 ` Jean Thomas
@ 2024-01-27 23:52 ` Linus Walleij
-1 siblings, 0 replies; 9+ messages in thread
From: Linus Walleij @ 2024-01-27 23:52 UTC (permalink / raw)
To: Jean Thomas
Cc: sean.wang, matthias.bgg, angelogioacchino.delregno,
linux-mediatek, linux-gpio, linux-kernel, linux-arm-kernel
On Wed, Jan 17, 2024 at 1:43 PM Jean Thomas <jean.thomas@wifirst.fr> wrote:
> Add uart1_3 (pins 26, 27) group to the pinctrl driver for the
> MediaTek MT7981 SoC.
>
> Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] pinctrl: mediatek: mt7981: add additional uart group
@ 2024-01-27 23:52 ` Linus Walleij
0 siblings, 0 replies; 9+ messages in thread
From: Linus Walleij @ 2024-01-27 23:52 UTC (permalink / raw)
To: Jean Thomas
Cc: sean.wang, matthias.bgg, angelogioacchino.delregno,
linux-mediatek, linux-gpio, linux-kernel, linux-arm-kernel
On Wed, Jan 17, 2024 at 1:43 PM Jean Thomas <jean.thomas@wifirst.fr> wrote:
> Add uart1_3 (pins 26, 27) group to the pinctrl driver for the
> MediaTek MT7981 SoC.
>
> Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
Patch applied.
Yours,
Linus Walleij
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-01-27 23:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-17 12:42 [PATCH 1/2] pinctrl: mediatek: mt7981: add additional uart group Jean Thomas
2024-01-17 12:42 ` Jean Thomas
2024-01-17 12:42 ` [PATCH 2/2] pinctrl: mediatek: mt7981: add additional emmc groups Jean Thomas
2024-01-17 12:42 ` Jean Thomas
2024-01-17 14:08 ` Daniel Golle
2024-01-17 14:08 ` Daniel Golle
2024-01-17 13:47 ` [PATCH 1/2] pinctrl: mediatek: mt7981: add additional uart group Daniel Golle
2024-01-27 23:52 ` Linus Walleij
2024-01-27 23:52 ` Linus Walleij
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.