diff mbox series

[2/5] pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20

Message ID 1562668156-12927-3-git-send-email-hayashi.kunihiko@socionext.com (mailing list archive)
State New, archived
Headers show
Series pinctrl: uniphier: Add some improvements and new settings | expand

Commit Message

Kunihiko Hayashi July 9, 2019, 10:29 a.m. UTC 
This adds support for pinmux settings of aout1b groups. This group includes
aout1 signals derived from xirq pins.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Masahiro Yamada July 29, 2019, 1:44 p.m. UTC | #1 
On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
>
> This adds support for pinmux settings of aout1b groups. This group includes
> aout1 signals derived from xirq pins.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
>  drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
> index 28e54b3..2c66e70 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),
> @@ -708,6 +711,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = {
>  };
>
>  static const char * const aout1_groups[] = {"aout1"};
> +static const char * const aout1b_groups[] = {"aout1b"};

If this has the same functionality as "aout1",
shouldn't it be a part of aout1_groups?
Kunihiko Hayashi July 30, 2019, 2:22 a.m. UTC | #2 
Hello,

On Mon, 29 Jul 2019 22:44:27 +0900 <yamada.masahiro@socionext.com> wrote:

> On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi
> <hayashi.kunihiko@socionext.com> wrote:
> >
> > This adds support for pinmux settings of aout1b groups. This group includes
> > aout1 signals derived from xirq pins.
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> >  drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
> > index 28e54b3..2c66e70 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),
> > @@ -708,6 +711,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = {
> >  };
> >
> >  static const char * const aout1_groups[] = {"aout1"};
> > +static const char * const aout1b_groups[] = {"aout1b"};
> 
> If this has the same functionality as "aout1",
> shouldn't it be a part of aout1_groups?

Indeed.
I'll merge "aout1b" with aout1_groups.

> 
> 
> 
> 
> -- 
> Best Regards
> Masahiro Yamada

---
Best Regards,
Kunihiko Hayashi
diff mbox series

Patch

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index 28e54b3..2c66e70 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),
@@ -708,6 +711,7 @@  static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = {
 };
 
 static const char * const aout1_groups[] = {"aout1"};
+static const char * const aout1b_groups[] = {"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"};
@@ -746,6 +750,7 @@  static const char * const usb3_groups[] = {"usb3"};
 
 static const struct uniphier_pinmux_function uniphier_ld20_functions[] = {
 	UNIPHIER_PINMUX_FUNCTION(aout1),
+	UNIPHIER_PINMUX_FUNCTION(aout1b),
 	UNIPHIER_PINMUX_FUNCTION(aoutiec1),
 	UNIPHIER_PINMUX_FUNCTION(emmc),
 	UNIPHIER_PINMUX_FUNCTION(ether_rgmii),