| Message ID | 20220103154616.308376-2-gary.bisson@boundarydevices.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | meson-g12: add pwm and uart pin muxing options | expand |
On 03/01/2022 16:46, Gary Bisson wrote: > Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12. > > Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> > --- > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Neil Armstrong <narmstrong@baylibre.com> > Cc: Kevin Hilman <khilman@baylibre.com> > Cc: Jerome Brunet <jbrunet@baylibre.com> > Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > Cc: linux-gpio@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c > index cd9656b13836..d182a575981e 100644 > --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c > +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c > @@ -283,6 +283,8 @@ static const unsigned int pwm_d_x6_pins[] = { GPIOX_6 }; > static const unsigned int pwm_e_pins[] = { GPIOX_16 }; > > /* pwm_f */ > +static const unsigned int pwm_f_z_pins[] = { GPIOZ_12 }; > +static const unsigned int pwm_f_a_pins[] = { GPIOA_11 }; > static const unsigned int pwm_f_x_pins[] = { GPIOX_7 }; > static const unsigned int pwm_f_h_pins[] = { GPIOH_5 }; > > @@ -618,6 +620,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = { > GROUP(tdm_c_dout2_z, 4), > GROUP(tdm_c_dout3_z, 4), > GROUP(mclk1_z, 4), > + GROUP(pwm_f_z, 5), > > /* bank GPIOX */ > GROUP(sdio_d0, 1), > @@ -768,6 +771,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = { > GROUP(tdm_c_dout3_a, 2), > GROUP(mclk0_a, 1), > GROUP(mclk1_a, 2), > + GROUP(pwm_f_a, 3), > }; > > /* uart_ao_a */ > @@ -1069,7 +1073,7 @@ static const char * const pwm_e_groups[] = { > }; > > static const char * const pwm_f_groups[] = { > - "pwm_f_x", "pwm_f_h", > + "pwm_f_z", "pwm_f_a", "pwm_f_x", "pwm_f_h", > }; > > static const char * const cec_ao_a_h_groups[] = { > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
On Mon, Jan 3, 2022 at 4:46 PM Gary Bisson <gary.bisson@boundarydevices.com> wrote: > Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12. > > Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> This patch 1/3 applied for v5.18. Yours, Linus Walleij
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c index cd9656b13836..d182a575981e 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -283,6 +283,8 @@ static const unsigned int pwm_d_x6_pins[] = { GPIOX_6 }; static const unsigned int pwm_e_pins[] = { GPIOX_16 }; /* pwm_f */ +static const unsigned int pwm_f_z_pins[] = { GPIOZ_12 }; +static const unsigned int pwm_f_a_pins[] = { GPIOA_11 }; static const unsigned int pwm_f_x_pins[] = { GPIOX_7 }; static const unsigned int pwm_f_h_pins[] = { GPIOH_5 }; @@ -618,6 +620,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = { GROUP(tdm_c_dout2_z, 4), GROUP(tdm_c_dout3_z, 4), GROUP(mclk1_z, 4), + GROUP(pwm_f_z, 5), /* bank GPIOX */ GROUP(sdio_d0, 1), @@ -768,6 +771,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = { GROUP(tdm_c_dout3_a, 2), GROUP(mclk0_a, 1), GROUP(mclk1_a, 2), + GROUP(pwm_f_a, 3), }; /* uart_ao_a */ @@ -1069,7 +1073,7 @@ static const char * const pwm_e_groups[] = { }; static const char * const pwm_f_groups[] = { - "pwm_f_x", "pwm_f_h", + "pwm_f_z", "pwm_f_a", "pwm_f_x", "pwm_f_h", }; static const char * const cec_ao_a_h_groups[] = {
Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12. Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> --- Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Kevin Hilman <khilman@baylibre.com> Cc: Jerome Brunet <jbrunet@baylibre.com> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Cc: linux-gpio@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)