| Message ID | 1564465410-9165-3-git-send-email-hayashi.kunihiko@socionext.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f686867266c4d65b49036dbd85110a1300e2d42e |
| Headers | show |
| Series | pinctrl: uniphier: Add some improvements and new settings | expand |
On Tue, Jul 30, 2019 at 2:43 PM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > > This adds support for pinmux settings of aout1b group. This group includes > audio I/O signals derived from xirq pins, and it is equivalent to "aout1" > in functionality. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
On Tue, Jul 30, 2019 at 7:43 AM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > This adds support for pinmux settings of aout1b group. This group includes > audio I/O signals derived from xirq pins, and it is equivalent to "aout1" > in functionality. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Patch applied with Masahiro's ACK. Yours, Linus Walleij
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 28e54b3..8d4fb65 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -544,6 +544,8 @@ static const struct pinctrl_pin_desc uniphier_ld20_pins[] = { static const unsigned aout1_pins[] = {137, 138, 139, 140, 141, 142}; static const int aout1_muxvals[] = {0, 0, 0, 0, 0, 0}; +static const unsigned aout1b_pins[] = {150, 151, 152, 153, 154, 155, 156}; +static const int aout1b_muxvals[] = {1, 1, 1, 1, 1, 1, 1}; static const unsigned aoutiec1_pins[] = {135, 136}; static const int aoutiec1_muxvals[] = {0, 0}; static const unsigned int emmc_pins[] = {19, 20, 21, 22, 23, 24, 25}; @@ -664,6 +666,7 @@ static const unsigned int gpio_range2_pins[] = { static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { UNIPHIER_PINCTRL_GROUP(aout1), + UNIPHIER_PINCTRL_GROUP(aout1b), UNIPHIER_PINCTRL_GROUP(aoutiec1), UNIPHIER_PINCTRL_GROUP(emmc), UNIPHIER_PINCTRL_GROUP(emmc_dat8), @@ -707,7 +710,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range2), }; -static const char * const aout1_groups[] = {"aout1"}; +static const char * const aout1_groups[] = {"aout1", "aout1b"}; static const char * const aoutiec1_groups[] = {"aoutiec1"}; static const char * const emmc_groups[] = {"emmc", "emmc_dat8"}; static const char * const ether_rgmii_groups[] = {"ether_rgmii"};
This adds support for pinmux settings of aout1b group. This group includes audio I/O signals derived from xirq pins, and it is equivalent to "aout1" in functionality. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)