* [PATCH 2/4] sh-pfc: r8a7790: Add Audio pin support
@ 2013-11-29 3:01 Kuninori Morimoto
2013-11-29 17:30 ` Laurent Pinchart
2013-12-02 1:29 ` Kuninori Morimoto
0 siblings, 2 replies; 3+ messages in thread
From: Kuninori Morimoto @ 2013-11-29 3:01 UTC (permalink / raw)
To: linux-sh
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 69 ++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
index a7fa443..6d567d3 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
@@ -1739,6 +1739,57 @@ static struct sh_pfc_pin pinmux_pins[] = {
SH_PFC_PIN_NAMED(ROW_GROUP_A('H'), 15, AH15),
};
+/* - AUDIO CLOCK ------------------------------------------------------------ */
+static const unsigned int audio_clk_a_pins[] = {
+ /* CLK A */
+ RCAR_GP_PIN(4, 25),
+};
+static const unsigned int audio_clk_a_mux[] = {
+ AUDIO_CLKA_MARK,
+};
+static const unsigned int audio_clk_b_pins[] = {
+ /* CLK B */
+ RCAR_GP_PIN(4, 26),
+};
+static const unsigned int audio_clk_b_mux[] = {
+ AUDIO_CLKB_MARK,
+};
+static const unsigned int audio_clk_c_pins[] = {
+ /* CLK C */
+ RCAR_GP_PIN(5, 27),
+};
+static const unsigned int audio_clk_c_mux[] = {
+ AUDIO_CLKC_MARK,
+};
+static const unsigned int audio_clkout_pins[] = {
+ /* CLK OUT */
+ RCAR_GP_PIN(5, 16),
+};
+static const unsigned int audio_clkout_mux[] = {
+ AUDIO_CLKOUT_MARK,
+};
+static const unsigned int audio_clkout_b_pins[] = {
+ /* CLK OUT B */
+ RCAR_GP_PIN(0, 23),
+};
+static const unsigned int audio_clkout_b_mux[] = {
+ AUDIO_CLKOUT_B_MARK,
+};
+static const unsigned int audio_clkout_c_pins[] = {
+ /* CLK OUT C */
+ RCAR_GP_PIN(5, 27),
+};
+static const unsigned int audio_clkout_c_mux[] = {
+ AUDIO_CLKOUT_C_MARK,
+};
+static const unsigned int audio_clkout_d_pins[] = {
+ /* CLK OUT D */
+ RCAR_GP_PIN(5, 20),
+};
+static const unsigned int audio_clkout_d_mux[] = {
+ AUDIO_CLKOUT_D_MARK,
+};
+
/* - DU RGB ----------------------------------------------------------------- */
static const unsigned int du_rgb666_pins[] = {
/* R[7:2], G[7:2], B[7:2] */
@@ -3278,6 +3329,13 @@ static const unsigned int vin1_clk_mux[] = {
};
static const struct sh_pfc_pin_group pinmux_groups[] = {
+ SH_PFC_PIN_GROUP(audio_clk_a),
+ SH_PFC_PIN_GROUP(audio_clk_b),
+ SH_PFC_PIN_GROUP(audio_clk_c),
+ SH_PFC_PIN_GROUP(audio_clkout),
+ SH_PFC_PIN_GROUP(audio_clkout_b),
+ SH_PFC_PIN_GROUP(audio_clkout_c),
+ SH_PFC_PIN_GROUP(audio_clkout_d),
SH_PFC_PIN_GROUP(du_rgb666),
SH_PFC_PIN_GROUP(du_rgb888),
SH_PFC_PIN_GROUP(du_clk_out_0),
@@ -3488,6 +3546,16 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(vin1_clk),
};
+static const char * const audio_clk_groups[] = {
+ "audio_clk_a",
+ "audio_clk_b",
+ "audio_clk_c",
+ "audio_clkout",
+ "audio_clkout_b",
+ "audio_clkout_c",
+ "audio_clkout_d",
+};
+
static const char * const du_groups[] = {
"du_rgb666",
"du_rgb888",
@@ -3808,6 +3876,7 @@ static const char * const vin1_groups[] = {
};
static const struct sh_pfc_function pinmux_functions[] = {
+ SH_PFC_FUNCTION(audio_clk),
SH_PFC_FUNCTION(du),
SH_PFC_FUNCTION(du0),
SH_PFC_FUNCTION(du1),
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 2/4] sh-pfc: r8a7790: Add Audio pin support
2013-11-29 3:01 [PATCH 2/4] sh-pfc: r8a7790: Add Audio pin support Kuninori Morimoto
@ 2013-11-29 17:30 ` Laurent Pinchart
2013-12-02 1:29 ` Kuninori Morimoto
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2013-11-29 17:30 UTC (permalink / raw)
To: linux-sh
Hi Morimoto-san,
Thank you for the patch.
On Thursday 28 November 2013 19:01:37 Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
I've applied the patch to my tree and will send a pull request to Linus
Walleij for v3.14.
Please see below for one small comment.
> ---
> drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 69 +++++++++++++++++++++++++++++++
> 1 file changed, 69 insertions(+)
>
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index a7fa443..6d567d3 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> @@ -1739,6 +1739,57 @@ static struct sh_pfc_pin pinmux_pins[] = {
> SH_PFC_PIN_NAMED(ROW_GROUP_A('H'), 15, AH15),
> };
>
> +/* - AUDIO CLOCK ------------------------------------------------------- */
> +static const unsigned int audio_clk_a_pins[] = {
> + /* CLK A */
> + RCAR_GP_PIN(4, 25),
> +};
> +static const unsigned int audio_clk_a_mux[] = {
> + AUDIO_CLKA_MARK,
> +};
> +static const unsigned int audio_clk_b_pins[] = {
> + /* CLK B */
> + RCAR_GP_PIN(4, 26),
> +};
> +static const unsigned int audio_clk_b_mux[] = {
> + AUDIO_CLKB_MARK,
> +};
> +static const unsigned int audio_clk_c_pins[] = {
> + /* CLK C */
> + RCAR_GP_PIN(5, 27),
> +};
> +static const unsigned int audio_clk_c_mux[] = {
> + AUDIO_CLKC_MARK,
> +};
> +static const unsigned int audio_clkout_pins[] = {
> + /* CLK OUT */
> + RCAR_GP_PIN(5, 16),
> +};
> +static const unsigned int audio_clkout_mux[] = {
> + AUDIO_CLKOUT_MARK,
> +};
> +static const unsigned int audio_clkout_b_pins[] = {
> + /* CLK OUT B */
> + RCAR_GP_PIN(0, 23),
> +};
> +static const unsigned int audio_clkout_b_mux[] = {
> + AUDIO_CLKOUT_B_MARK,
> +};
> +static const unsigned int audio_clkout_c_pins[] = {
> + /* CLK OUT C */
> + RCAR_GP_PIN(5, 27),
> +};
> +static const unsigned int audio_clkout_c_mux[] = {
> + AUDIO_CLKOUT_C_MARK,
> +};
> +static const unsigned int audio_clkout_d_pins[] = {
> + /* CLK OUT D */
> + RCAR_GP_PIN(5, 20),
> +};
> +static const unsigned int audio_clkout_d_mux[] = {
> + AUDIO_CLKOUT_D_MARK,
> +};
> +
The file has no blank line after all the other groups, I've thus removed this
blank line. Please let me know if you're fine with that.
> /* - DU RGB ------------------------------------------------------------ */
> static const unsigned int du_rgb666_pins[] = {
> /* R[7:2], G[7:2], B[7:2] */
> @@ -3278,6 +3329,13 @@ static const unsigned int vin1_clk_mux[] = {
> };
>
> static const struct sh_pfc_pin_group pinmux_groups[] = {
> + SH_PFC_PIN_GROUP(audio_clk_a),
> + SH_PFC_PIN_GROUP(audio_clk_b),
> + SH_PFC_PIN_GROUP(audio_clk_c),
> + SH_PFC_PIN_GROUP(audio_clkout),
> + SH_PFC_PIN_GROUP(audio_clkout_b),
> + SH_PFC_PIN_GROUP(audio_clkout_c),
> + SH_PFC_PIN_GROUP(audio_clkout_d),
> SH_PFC_PIN_GROUP(du_rgb666),
> SH_PFC_PIN_GROUP(du_rgb888),
> SH_PFC_PIN_GROUP(du_clk_out_0),
> @@ -3488,6 +3546,16 @@ static const struct sh_pfc_pin_group pinmux_groups[]
> = { SH_PFC_PIN_GROUP(vin1_clk),
> };
>
> +static const char * const audio_clk_groups[] = {
> + "audio_clk_a",
> + "audio_clk_b",
> + "audio_clk_c",
> + "audio_clkout",
> + "audio_clkout_b",
> + "audio_clkout_c",
> + "audio_clkout_d",
> +};
> +
> static const char * const du_groups[] = {
> "du_rgb666",
> "du_rgb888",
> @@ -3808,6 +3876,7 @@ static const char * const vin1_groups[] = {
> };
>
> static const struct sh_pfc_function pinmux_functions[] = {
> + SH_PFC_FUNCTION(audio_clk),
> SH_PFC_FUNCTION(du),
> SH_PFC_FUNCTION(du0),
> SH_PFC_FUNCTION(du1),
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 2/4] sh-pfc: r8a7790: Add Audio pin support
2013-11-29 3:01 [PATCH 2/4] sh-pfc: r8a7790: Add Audio pin support Kuninori Morimoto
2013-11-29 17:30 ` Laurent Pinchart
@ 2013-12-02 1:29 ` Kuninori Morimoto
1 sibling, 0 replies; 3+ messages in thread
From: Kuninori Morimoto @ 2013-12-02 1:29 UTC (permalink / raw)
To: linux-sh
Hi Laurent
> On Thursday 28 November 2013 19:01:37 Kuninori Morimoto wrote:
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> I've applied the patch to my tree and will send a pull request to Linus
> Walleij for v3.14.
>
> Please see below for one small comment.
(snip)
> > +static const unsigned int audio_clkout_d_mux[] = {
> > + AUDIO_CLKOUT_D_MARK,
> > +};
> > +
>
> The file has no blank line after all the other groups, I've thus removed this
> blank line. Please let me know if you're fine with that.
Thank you.
I have no objection about it.
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-02 1:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-29 3:01 [PATCH 2/4] sh-pfc: r8a7790: Add Audio pin support Kuninori Morimoto
2013-11-29 17:30 ` Laurent Pinchart
2013-12-02 1:29 ` Kuninori Morimoto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox