| Message ID | 20180118141757.41290-1-yixun.lan@amlogic.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Yixun Lan <yixun.lan@amlogic.com> writes: > Simply adjust the pin group to _x _y _z style, as to > keep the consistency in DT with previous naming scheme. > > Fixes: 83c566806a68 ("pinctrl: meson-axg: Add new pinctrl driver for Meson AXG SoC") > Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> Reviewed-by: Kevin Hilman <khilman@baylibre.com> Thanks for cleaning this up before we have any DT users. Kevin > --- > Hi Linus, > > Please also consider merging this patch into 'for-next', since it > fixes issue added in the same cycle. > This patch will also obsolete previous one patches [1] > > [1] pinctrl: meson: use one uniform 'function' name > http://lkml.kernel.org/r/20180108073328.205769-1-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..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),
On Thu, Jan 18, 2018 at 3:17 PM, Yixun Lan <yixun.lan@amlogic.com> wrote: > Simply adjust the pin group to _x _y _z style, as to > keep the consistency in DT with previous naming scheme. > > Fixes: 83c566806a68 ("pinctrl: meson-axg: Add new pinctrl driver for Meson AXG SoC") > Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> Patch applied for fixes. Yours, Linus Walleij
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),
Simply adjust the pin group to _x _y _z style, as to keep the consistency in DT with previous naming scheme. Fixes: 83c566806a68 ("pinctrl: meson-axg: Add new pinctrl driver for Meson AXG SoC") Signed-off-by: Yixun Lan <yixun.lan@amlogic.com> --- Hi Linus, Please also consider merging this patch into 'for-next', since it fixes issue added in the same cycle. This patch will also obsolete previous one patches [1] [1] pinctrl: meson: use one uniform 'function' name http://lkml.kernel.org/r/20180108073328.205769-1-yixun.lan@amlogic.com --- drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)