lkml.org 
[lkml]   [2018]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] pinctrl: meson-axg: correct the pin expansion of UART_AO_B
    Date
    The 'uart_ao_b_groups' for the UART_AO_B pins is already defined which is
    living inside the AO domain, for these pins which are routed out from EE domain,
    we need to correct them with the 'FUNCTION_EX' macro, otherwise there is
    a conflict in the code level.

    Also slightly adjust the name to make it short and more consistent.

    Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
    ---
    drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
    index 1fda9d6c7ea3..308e5433bd04 100644
    --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
    +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
    @@ -716,7 +716,7 @@ static const char * const uart_b_groups[] = {
    "uart_tx_b_x", "uart_rx_b_x", "uart_cts_b_x", "uart_rts_b_x",
    };

    -static const char * const uart_ao_b_gpioz_groups[] = {
    +static const char * const uart_ao_b_z_groups[] = {
    "uart_ao_tx_b_z", "uart_ao_rx_b_z",
    "uart_ao_cts_b_z", "uart_ao_rts_b_z",
    };
    @@ -855,7 +855,7 @@ static struct meson_pmx_func meson_axg_periphs_functions[] = {
    FUNCTION(nand),
    FUNCTION(uart_a),
    FUNCTION(uart_b),
    - FUNCTION(uart_ao_b_gpioz),
    + FUNCTION_EX(uart_ao_b, _z),
    FUNCTION(i2c0),
    FUNCTION(i2c1),
    FUNCTION(i2c2),
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-01-14 23:16    [W:4.844 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site