pinctrl: meson: update pin groups for tl1 [1/1]

PD#172587

Problem:
some pin groups are not supported

Solution:
update pin groups according to pinmux document v8.

Verify:
TL1 skt board.

Change-Id: I88750e307208fd30c20343c1c5418c1035961b4e
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>

diff --git a/drivers/amlogic/pinctrl/pinctrl-meson-tl1.c b/drivers/amlogic/pinctrl/pinctrl-meson-tl1.c
index 6a2d9bc..df67f90 100644 (file)
--- a/drivers/amlogic/pinctrl/pinctrl-meson-tl1.c
+++ b/drivers/amlogic/pinctrl/pinctrl-meson-tl1.c
@@ -250,9 +250,6 @@ static const unsigned int uart_ao_a_rx_w7_pins[] = {GPIOW_7};
 static const unsigned int uart_ao_a_tx_w10_pins[] = {GPIOW_10};
 static const unsigned int uart_ao_a_rx_w11_pins[] = {GPIOW_11};
 
-static const unsigned int uart_ao_a_tx_c_pins[] = {GPIOC_3};
-static const unsigned int uart_ao_a_rx_c_pins[] = {GPIOC_2};
-
 /* iso7816 */
 static const unsigned int iso7816_clk_pins[] = {GPIODV_4};
 static const unsigned int iso7816_data_pins[] = {GPIODV_5};
@@ -303,12 +300,6 @@ static const unsigned int pwm_f_z_pins[] = {GPIOZ_10};
 static const unsigned int pwm_vs_z5_pins[] = {GPIOZ_5};
 static const unsigned int pwm_vs_z6_pins[] = {GPIOZ_6};
 
-/* jtag_b */
-static const unsigned int jtag_b_tdo_pins[] = {GPIOC_0};
-static const unsigned int jtag_b_tdi_pins[] = {GPIOC_1};
-static const unsigned int jtag_b_clk_pins[] = {GPIOC_4};
-static const unsigned int jtag_b_tms_pins[] = {GPIOC_5};
-
 /* bt656 */
 static const unsigned int bt656_a_clk_pins[] = {GPIOH_2};
 static const unsigned int bt656_a_vs_pins[] = {GPIOH_3};
@@ -418,8 +409,10 @@ static const unsigned int pdm_din3_pins[] = {GPIOC_10};
 
 static const unsigned int pdm_dclk_z_pins[] = {GPIOZ_7};
 static const unsigned int pdm_din0_z_pins[] = {GPIOZ_8};
-static const unsigned int pdm_din1_z_pins[] = {GPIOZ_9};
-static const unsigned int pdm_din2_z_pins[] = {GPIOZ_10};
+static const unsigned int pdm_din1_z0_pins[] = {GPIOZ_0};
+static const unsigned int pdm_din1_z9_pins[] = {GPIOZ_9};
+static const unsigned int pdm_din2_z4_pins[] = {GPIOZ_4};
+static const unsigned int pdm_din2_z10_pins[] = {GPIOZ_10};
 
 /* spdif_in */
 static const unsigned int spdif_in_pins[] = {GPIODV_5};
@@ -668,13 +661,7 @@ static struct meson_pmx_group meson_tl1_periphs_groups[] = {
        GROUP(uart_a_rx,        1),
        GROUP(uart_a_cts,       1),
        GROUP(uart_a_rts,       1),
-       GROUP(uart_ao_a_tx_c,   2),
-       GROUP(uart_ao_a_rx_c,   2),
        GROUP(pwm_b_c,          1),
-       GROUP(jtag_b_tdo,       2),
-       GROUP(jtag_b_tdi,       2),
-       GROUP(jtag_b_clk,       2),
-       GROUP(jtag_b_tms,       2),
        GROUP(tsout_clk,        4),
        GROUP(tsout_sop,        4),
        GROUP(tsout_valid,      4),
@@ -881,8 +868,10 @@ static struct meson_pmx_group meson_tl1_periphs_groups[] = {
        GROUP(pwm_vs_z6,        3),
        GROUP(pdm_dclk_z,       3),
        GROUP(pdm_din0_z,       3),
-       GROUP(pdm_din1_z,       3),
-       GROUP(pdm_din2_z,       3),
+       GROUP(pdm_din1_z0,      2),
+       GROUP(pdm_din1_z9,      3),
+       GROUP(pdm_din2_z4,      2),
+       GROUP(pdm_din2_z10,     3),
        GROUP(spdif_out_z,      1),
        GROUP(mclk0_z,          1),
        GROUP(mclk1_z,          1),
@@ -1168,7 +1157,6 @@ static const char * const uart_c_groups[] = {
 };
 
 static const char * const uart_ao_a_ee_groups[] = {
-       "uart_ao_a_rx_c", "uart_ao_a_tx_c",
        "uart_ao_a_rx_w3", "uart_ao_a_tx_w2",
        "uart_ao_a_rx_w7", "uart_ao_a_tx_w6",
        "uart_ao_a_rx_w11", "uart_ao_a_tx_w10",
@@ -1214,10 +1202,6 @@ static const char * const pwm_vs_groups[] = {
        "pwm_vs_z5", "pwm_vs_z6",
 };
 
-static const char * const jtag_b_groups[] = {
-       "jtag_b_tdi", "jtag_b_tdo", "jtag_b_clk", "jtag_b_tms",
-};
-
 static const char * const tsout_groups[] = {
        "tsout_clk", "tsout_sop", "tsout_valid",
        "tsout_dout0", "tsout_dout1", "tsout_dout2",
@@ -1277,7 +1261,8 @@ static const char * const hdmirx_c_groups[] = {
 static const char * const pdm_groups[] = {
        "pdm_din0_c", "pdm_din1_c", "pdm_din2_c", "pdm_dclk_c",
        "pdm_din3",
-       "pdm_din0_z", "pdm_din1_z", "pdm_din2_z", "pdm_dclk_z",
+       "pdm_din0_z", "pdm_din1_z0", "pdm_din1_z9", "pdm_din2_z4",
+       "pdm_din2_z10", "pdm_dclk_z",
 };
 
 static const char * const spdif_in_groups[] = {
@@ -1468,7 +1453,6 @@ static struct meson_pmx_func meson_tl1_periphs_functions[] = {
        FUNCTION(pwm_e),
        FUNCTION(pwm_f),
        FUNCTION(pwm_vs),
-       FUNCTION(jtag_b),
        FUNCTION(tsout),
        FUNCTION(tcon),
        FUNCTION(bt656),