diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-03-19 16:59:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-03-19 17:00:01 +0100 |
| commit | 4654eba8cbb3fcf48c6fc24fbaffa0623d9faea2 (patch) | |
| tree | 0b3056c04bda1988a3705f315680224387d5a68b /drivers/pinctrl/meson/pinctrl-meson-axg.c | |
| parent | 09b9ddfaa18317f463085d602cf5f60a5fa88665 (diff) | |
| parent | a6618f4aedb2b60932d766bd82ae7ce866e842aa (diff) | |
Merge branch 'for-linus' into for-next
Back-merge of for-linus branch for applying the further UAC3 patches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/pinctrl/meson/pinctrl-meson-axg.c')
| -rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 |
1 files 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..4b91ff74779b 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(uart_ao_b_z), FUNCTION(i2c0), FUNCTION(i2c1), FUNCTION(i2c2), |