[PATCH 0/25 v3][RFC] arm64: Salvator-X sound support

SUPERH platform development
 help / color / mirror / Atom feed

* [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support
@ 2015-09-18  1:51 Kuninori Morimoto
  2015-09-18  1:52 ` [PATCH 0/3 v2] pinctrl: sh-pfc: r8a7795: add I2C/Audio pin support Kuninori Morimoto
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Kuninori Morimoto @ 2015-09-18  1:51 UTC (permalink / raw)
  To: linux-sh


Hi Simon

These are v3 of Salvator-X sound support patches.

These are based on renesas-drivers-2015-09-15-v4.3-rc1
These is including non SH-ARM patches which are
posted to other ML, but still not yet merged.

Kuninori Morimoto (23):
      pinctrl: sh-pfc: r8a7795: add I2C pin support
      pinctrl: sh-pfc: r8a7795: add Audio clock pin support
      pinctrl: sh-pfc: r8a7795: add Audio SSI pin support
      dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF
      clk: add CS2000 Fractional-N driver
      arm64: renesas: tidyup MSTP9 reverse definition order
      arm64: renesas: r8a7795: add I2C support
      arm64: renesas: r8a7795: add AUDIO_DMAC support
      arm64: renesas: r8a7795: Sound SSI PIO support
      arm64: renesas: r8a7795: Sound SSI DMA support
      arm64: renesas: r8a7795: Sound SRC support
      arm64: renesas: r8a7795: Sound DVC support
      arm64: renesas: r8a7795: Sound CTU/MIX support
      arm64: renesas: salvator-x: enable I2C
      arm64: renesas: salvator-x: Sound SSI PIO support
      arm64: renesas: salvator-x: Sound SSI DMA support
      arm64: renesas: salvator-x: Sound SSI DMA support via BUSIF
      arm64: renesas: salvator-x: Sound SRC support
      arm64: renesas: salvator-x: Sound DVC support
      arm64: defconfig: Enable Renesas R-Car I2C Controller
      arm64: defconfig: add Renesas sound and AK4613 support
      arm64: defconfig: add Renesas R-Car DMAC driver support
      arm64: defconfig: add CS2000 driver support

Wolfram Sang (2):
      i2c: rcar: add support for r8a7795 (R-Car H3)
      i2c: sh_mobile: add support for r8a7795 (R-Car H3)

 Documentation/devicetree/bindings/clock/cs2000-cp.txt   |  24 +++++
 Documentation/devicetree/bindings/i2c/i2c-rcar.txt      |   1 +
 Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt |   1 +
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts      | 125 +++++++++++++++++++++++++
 arch/arm64/boot/dts/renesas/r8a7795.dtsi                | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 arch/arm64/configs/defconfig                            |  10 ++
 drivers/clk/Kconfig                                     |   6 ++
 drivers/clk/Makefile                                    |   1 +
 drivers/clk/clk-cs2000-cp.c                             | 530 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/i2c/busses/i2c-rcar.c                           |   3 +
 drivers/i2c/busses/i2c-sh_mobile.c                      |   1 +
 drivers/pinctrl/sh-pfc/pfc-r8a7795.c                    | 468 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/dt-bindings/clock/r8a7795-clock.h               |  49 ++++++++--
 include/linux/of_dma.h                                  |   2 +-
 14 files changed, 1613 insertions(+), 9 deletions(-)

Best regards
---
Kuninori Morimoto

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 0/3 v2] pinctrl: sh-pfc: r8a7795: add I2C/Audio pin support
  2015-09-18  1:51 [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support Kuninori Morimoto
@ 2015-09-18  1:52 ` Kuninori Morimoto
  2015-09-18  1:53   ` [PATCH 1/3 v2] pinctrl: sh-pfc: r8a7795: add I2C " Kuninori Morimoto
                     ` (2 more replies)
  2015-09-18  6:09 ` [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support Simon Horman
  2015-09-18  8:13 ` Kuninori Morimoto
  2 siblings, 3 replies; 11+ messages in thread
From: Kuninori Morimoto @ 2015-09-18  1:52 UTC (permalink / raw)
  To: Simon, Linus Walleij, Laurent
  Cc: linux-gpio@vger.kernel.org, Wolfram Sang, Magnus, Linux-SH,
	Geert Uytterhoeven


Hi Linus W
Cc: Geert, Laurent, Wolfram

These are v2 of I2C / Audio pinchart support for Renesas r8a7795

Kuninori Morimoto (3):
      pinctrl: sh-pfc: r8a7795: add I2C pin support
      pinctrl: sh-pfc: r8a7795: add Audio clock pin support
      pinctrl: sh-pfc: r8a7795: add Audio SSI pin support

 drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 459 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 459 insertions(+)
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/3 v2] pinctrl: sh-pfc: r8a7795: add I2C pin support
  2015-09-18  1:52 ` [PATCH 0/3 v2] pinctrl: sh-pfc: r8a7795: add I2C/Audio pin support Kuninori Morimoto
@ 2015-09-18  1:53   ` Kuninori Morimoto
  2015-09-18  1:54   ` [PATCH 2/3 v2] pinctrl: sh-pfc: r8a7795: add Audio clock " Kuninori Morimoto
  2015-09-18  1:54   ` [PATCH 3/3 v2] pinctrl: sh-pfc: r8a7795: add Audio SSI " Kuninori Morimoto
  2 siblings, 0 replies; 11+ messages in thread
From: Kuninori Morimoto @ 2015-09-18  1:53 UTC (permalink / raw)
  To: Simon, Linus Walleij, Laurent
  Cc: linux-gpio@vger.kernel.org, Wolfram Sang, Magnus, Linux-SH,
	Geert Uytterhoeven

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2 -> v3

 - add Geert's Reviewed-by

 drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 77 ++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index aff3895..f6afe71 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -1426,6 +1426,57 @@ static const struct sh_pfc_pin pinmux_pins[] = {
 	PINMUX_GPIO_GP_ALL(),
 };
 
+/* - I2C -------------------------------------------------------------------- */
+static const unsigned int i2c1_a_pins[] = {
+	/* SDA, SCL */
+	RCAR_GP_PIN(5, 11), RCAR_GP_PIN(5, 10),
+};
+static const unsigned int i2c1_a_mux[] = {
+	SDA1_A_MARK, SCL1_A_MARK,
+};
+static const unsigned int i2c1_b_pins[] = {
+	/* SDA, SCL */
+	RCAR_GP_PIN(5, 24), RCAR_GP_PIN(5, 23),
+};
+static const unsigned int i2c1_b_mux[] = {
+	SDA1_B_MARK, SCL1_B_MARK,
+};
+static const unsigned int i2c2_a_pins[] = {
+	/* SDA, SCL */
+	RCAR_GP_PIN(5, 0), RCAR_GP_PIN(5, 4),
+};
+static const unsigned int i2c2_a_mux[] = {
+	SDA2_A_MARK, SCL2_A_MARK,
+};
+static const unsigned int i2c2_b_pins[] = {
+	/* SDA, SCL */
+	RCAR_GP_PIN(3, 13), RCAR_GP_PIN(3, 12),
+};
+static const unsigned int i2c2_b_mux[] = {
+	SDA2_B_MARK, SCL2_B_MARK,
+};
+static const unsigned int i2c6_a_pins[] = {
+	/* SDA, SCL */
+	RCAR_GP_PIN(1, 8), RCAR_GP_PIN(1, 11),
+};
+static const unsigned int i2c6_a_mux[] = {
+	SDA6_A_MARK, SCL6_A_MARK,
+};
+static const unsigned int i2c6_b_pins[] = {
+	/* SDA, SCL */
+	RCAR_GP_PIN(1, 26), RCAR_GP_PIN(1, 25),
+};
+static const unsigned int i2c6_b_mux[] = {
+	SDA6_B_MARK, SCL6_B_MARK,
+};
+static const unsigned int i2c6_c_pins[] = {
+	/* SDA, SCL */
+	RCAR_GP_PIN(0, 15), RCAR_GP_PIN(0, 14),
+};
+static const unsigned int i2c6_c_mux[] = {
+	SDA6_C_MARK, SCL6_C_MARK,
+};
+
 /* - SCIF0 ------------------------------------------------------------------ */
 static const unsigned int scif0_data_pins[] = {
 	/* RX, TX */
@@ -1610,6 +1661,13 @@ static const unsigned int scif5_clk_mux[] = {
 };
 
 static const struct sh_pfc_pin_group pinmux_groups[] = {
+	SH_PFC_PIN_GROUP(i2c1_a),
+	SH_PFC_PIN_GROUP(i2c1_b),
+	SH_PFC_PIN_GROUP(i2c2_a),
+	SH_PFC_PIN_GROUP(i2c2_b),
+	SH_PFC_PIN_GROUP(i2c6_a),
+	SH_PFC_PIN_GROUP(i2c6_b),
+	SH_PFC_PIN_GROUP(i2c6_c),
 	SH_PFC_PIN_GROUP(scif0_data),
 	SH_PFC_PIN_GROUP(scif0_clk),
 	SH_PFC_PIN_GROUP(scif0_ctrl),
@@ -1637,6 +1695,22 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
 	SH_PFC_PIN_GROUP(scif5_clk),
 };
 
+static const char * const i2c1_groups[] = {
+	"i2c1_a",
+	"i2c1_b",
+};
+
+static const char * const i2c2_groups[] = {
+	"i2c2_a",
+	"i2c2_b",
+};
+
+static const char * const i2c6_groups[] = {
+	"i2c6_a",
+	"i2c6_b",
+	"i2c6_c",
+};
+
 static const char * const scif0_groups[] = {
 	"scif0_data",
 	"scif0_clk",
@@ -1681,6 +1755,9 @@ static const char * const scif5_groups[] = {
 };
 
 static const struct sh_pfc_function pinmux_functions[] = {
+	SH_PFC_FUNCTION(i2c1),
+	SH_PFC_FUNCTION(i2c2),
+	SH_PFC_FUNCTION(i2c6),
 	SH_PFC_FUNCTION(scif0),
 	SH_PFC_FUNCTION(scif1),
 	SH_PFC_FUNCTION(scif2),
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 2/3 v2] pinctrl: sh-pfc: r8a7795: add Audio clock pin support
  2015-09-18  1:52 ` [PATCH 0/3 v2] pinctrl: sh-pfc: r8a7795: add I2C/Audio pin support Kuninori Morimoto
  2015-09-18  1:53   ` [PATCH 1/3 v2] pinctrl: sh-pfc: r8a7795: add I2C " Kuninori Morimoto
@ 2015-09-18  1:54   ` Kuninori Morimoto
  2015-09-18  7:42     ` Geert Uytterhoeven
  2015-10-16 14:35     ` Linus Walleij
  2015-09-18  1:54   ` [PATCH 3/3 v2] pinctrl: sh-pfc: r8a7795: add Audio SSI " Kuninori Morimoto
  2 siblings, 2 replies; 11+ messages in thread
From: Kuninori Morimoto @ 2015-09-18  1:54 UTC (permalink / raw)
  To: Simon, Linus Walleij, Laurent
  Cc: linux-gpio@vger.kernel.org, Wolfram Sang, Magnus, Linux-SH,
	Geert Uytterhoeven

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2

 - add missing audio_clkout_d

 drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 160 +++++++++++++++++++++++++++++++++++
 1 file changed, 160 insertions(+)

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index f6afe71..7ef2f71 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -1426,6 +1426,128 @@ static const struct sh_pfc_pin pinmux_pins[] = {
 	PINMUX_GPIO_GP_ALL(),
 };
 
+/* - AUDIO CLOCK ------------------------------------------------------------ */
+static const unsigned int audio_clk_a_a_pins[] = {
+	/* CLK A */
+	RCAR_GP_PIN(6, 22),
+};
+static const unsigned int audio_clk_a_a_mux[] = {
+	AUDIO_CLKA_A_MARK,
+};
+static const unsigned int audio_clk_a_b_pins[] = {
+	/* CLK A */
+	RCAR_GP_PIN(5, 4),
+};
+static const unsigned int audio_clk_a_b_mux[] = {
+	AUDIO_CLKA_B_MARK,
+};
+static const unsigned int audio_clk_a_c_pins[] = {
+	/* CLK A */
+	RCAR_GP_PIN(5, 19),
+};
+static const unsigned int audio_clk_a_c_mux[] = {
+	AUDIO_CLKA_C_MARK,
+};
+static const unsigned int audio_clk_b_a_pins[] = {
+	/* CLK B */
+	RCAR_GP_PIN(5, 12),
+};
+static const unsigned int audio_clk_b_a_mux[] = {
+	AUDIO_CLKB_A_MARK,
+};
+static const unsigned int audio_clk_b_b_pins[] = {
+	/* CLK B */
+	RCAR_GP_PIN(6, 23),
+};
+static const unsigned int audio_clk_b_b_mux[] = {
+	AUDIO_CLKB_B_MARK,
+};
+static const unsigned int audio_clk_c_a_pins[] = {
+	/* CLK C */
+	RCAR_GP_PIN(5, 21),
+};
+static const unsigned int audio_clk_c_a_mux[] = {
+	AUDIO_CLKC_A_MARK,
+};
+static const unsigned int audio_clk_c_b_pins[] = {
+	/* CLK C */
+	RCAR_GP_PIN(5, 0),
+};
+static const unsigned int audio_clk_c_b_mux[] = {
+	AUDIO_CLKC_B_MARK,
+};
+static const unsigned int audio_clkout_a_pins[] = {
+	/* CLKOUT */
+	RCAR_GP_PIN(5, 18),
+};
+static const unsigned int audio_clkout_a_mux[] = {
+	AUDIO_CLKOUT_A_MARK,
+};
+static const unsigned int audio_clkout_b_pins[] = {
+	/* CLKOUT */
+	RCAR_GP_PIN(6, 28),
+};
+static const unsigned int audio_clkout_b_mux[] = {
+	AUDIO_CLKOUT_B_MARK,
+};
+static const unsigned int audio_clkout_c_pins[] = {
+	/* CLKOUT */
+	RCAR_GP_PIN(5, 3),
+};
+static const unsigned int audio_clkout_c_mux[] = {
+	AUDIO_CLKOUT_C_MARK,
+};
+static const unsigned int audio_clkout_d_pins[] = {
+	/* CLKOUT */
+	RCAR_GP_PIN(5, 21),
+};
+static const unsigned int audio_clkout_d_mux[] = {
+	AUDIO_CLKOUT_D_MARK,
+};
+static const unsigned int audio_clkout1_a_pins[] = {
+	/* CLKOUT1 */
+	RCAR_GP_PIN(5, 15),
+};
+static const unsigned int audio_clkout1_a_mux[] = {
+	AUDIO_CLKOUT1_A_MARK,
+};
+static const unsigned int audio_clkout1_b_pins[] = {
+	/* CLKOUT1 */
+	RCAR_GP_PIN(6, 29),
+};
+static const unsigned int audio_clkout1_b_mux[] = {
+	AUDIO_CLKOUT1_B_MARK,
+};
+static const unsigned int audio_clkout2_a_pins[] = {
+	/* CLKOUT2 */
+	RCAR_GP_PIN(5, 16),
+};
+static const unsigned int audio_clkout2_a_mux[] = {
+	AUDIO_CLKOUT2_A_MARK,
+};
+static const unsigned int audio_clkout2_b_pins[] = {
+	/* CLKOUT2 */
+	RCAR_GP_PIN(6, 30),
+};
+static const unsigned int audio_clkout2_b_mux[] = {
+	AUDIO_CLKOUT2_B_MARK,
+};
+
+static const unsigned int audio_clkout3_a_pins[] = {
+	/* CLKOUT3 */
+	RCAR_GP_PIN(5, 19),
+};
+static const unsigned int audio_clkout3_a_mux[] = {
+	AUDIO_CLKOUT3_A_MARK,
+};
+static const unsigned int audio_clkout3_b_pins[] = {
+	/* CLKOUT3 */
+	RCAR_GP_PIN(6, 31),
+};
+static const unsigned int audio_clkout3_b_mux[] = {
+	AUDIO_CLKOUT3_B_MARK,
+};
+
 /* - I2C -------------------------------------------------------------------- */
 static const unsigned int i2c1_a_pins[] = {
 	/* SDA, SCL */
@@ -1661,6 +1783,23 @@ static const unsigned int scif5_clk_mux[] = {
 };
 
 static const struct sh_pfc_pin_group pinmux_groups[] = {
+	SH_PFC_PIN_GROUP(audio_clk_a_a),
+	SH_PFC_PIN_GROUP(audio_clk_a_b),
+	SH_PFC_PIN_GROUP(audio_clk_a_c),
+	SH_PFC_PIN_GROUP(audio_clk_b_a),
+	SH_PFC_PIN_GROUP(audio_clk_b_b),
+	SH_PFC_PIN_GROUP(audio_clk_c_a),
+	SH_PFC_PIN_GROUP(audio_clk_c_b),
+	SH_PFC_PIN_GROUP(audio_clkout_a),
+	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(audio_clkout1_a),
+	SH_PFC_PIN_GROUP(audio_clkout1_b),
+	SH_PFC_PIN_GROUP(audio_clkout2_a),
+	SH_PFC_PIN_GROUP(audio_clkout2_b),
+	SH_PFC_PIN_GROUP(audio_clkout3_a),
+	SH_PFC_PIN_GROUP(audio_clkout3_b),
 	SH_PFC_PIN_GROUP(i2c1_a),
 	SH_PFC_PIN_GROUP(i2c1_b),
 	SH_PFC_PIN_GROUP(i2c2_a),
@@ -1695,6 +1834,26 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
 	SH_PFC_PIN_GROUP(scif5_clk),
 };
 
+static const char * const audio_clk_groups[] = {
+	"audio_clk_a_a",
+	"audio_clk_a_b",
+	"audio_clk_a_c",
+	"audio_clk_b_a",
+	"audio_clk_b_b",
+	"audio_clk_c_a",
+	"audio_clk_c_b",
+	"audio_clkout_a",
+	"audio_clkout_b",
+	"audio_clkout_c",
+	"audio_clkout_d",
+	"audio_clkout1_a",
+	"audio_clkout1_b",
+	"audio_clkout2_a",
+	"audio_clkout2_b",
+	"audio_clkout3_a",
+	"audio_clkout3_b",
+};
+
 static const char * const i2c1_groups[] = {
 	"i2c1_a",
 	"i2c1_b",
@@ -1755,6 +1914,7 @@ static const char * const scif5_groups[] = {
 };
 
 static const struct sh_pfc_function pinmux_functions[] = {
+	SH_PFC_FUNCTION(audio_clk),
 	SH_PFC_FUNCTION(i2c1),
 	SH_PFC_FUNCTION(i2c2),
 	SH_PFC_FUNCTION(i2c6),
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/3 v2] pinctrl: sh-pfc: r8a7795: add Audio clock pin support
  2015-09-18  1:54   ` [PATCH 2/3 v2] pinctrl: sh-pfc: r8a7795: add Audio clock " Kuninori Morimoto
@ 2015-09-18  7:42     ` Geert Uytterhoeven
  2015-10-16 14:35     ` Linus Walleij
  1 sibling, 0 replies; 11+ messages in thread
From: Geert Uytterhoeven @ 2015-09-18  7:42 UTC (permalink / raw)
  To: Kuninori Morimoto
  Cc: Simon, Linus Walleij, Laurent, linux-gpio@vger.kernel.org,
	Wolfram Sang, Magnus, Linux-SH

On Fri, Sep 18, 2015 at 3:54 AM, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> v1 -> v2
>
>  - add missing audio_clkout_d

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/3 v2] pinctrl: sh-pfc: r8a7795: add Audio clock pin support
  2015-09-18  1:54   ` [PATCH 2/3 v2] pinctrl: sh-pfc: r8a7795: add Audio clock " Kuninori Morimoto
  2015-09-18  7:42     ` Geert Uytterhoeven
@ 2015-10-16 14:35     ` Linus Walleij
  1 sibling, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2015-10-16 14:35 UTC (permalink / raw)
  To: Kuninori Morimoto
  Cc: Simon, Laurent, linux-gpio@vger.kernel.org, Wolfram Sang, Magnus,
	Linux-SH, Geert Uytterhoeven

On Fri, Sep 18, 2015 at 3:54 AM, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:

> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> v1 -> v2
>
>  - add missing audio_clkout_d

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Assume Geert will collect this.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 3/3 v2] pinctrl: sh-pfc: r8a7795: add Audio SSI pin support
  2015-09-18  1:52 ` [PATCH 0/3 v2] pinctrl: sh-pfc: r8a7795: add I2C/Audio pin support Kuninori Morimoto
  2015-09-18  1:53   ` [PATCH 1/3 v2] pinctrl: sh-pfc: r8a7795: add I2C " Kuninori Morimoto
  2015-09-18  1:54   ` [PATCH 2/3 v2] pinctrl: sh-pfc: r8a7795: add Audio clock " Kuninori Morimoto
@ 2015-09-18  1:54   ` Kuninori Morimoto
  2015-09-18  7:43     ` Geert Uytterhoeven
  2015-10-16 14:36     ` Linus Walleij
  2 siblings, 2 replies; 11+ messages in thread
From: Kuninori Morimoto @ 2015-09-18  1:54 UTC (permalink / raw)
  To: Simon, Linus Walleij, Laurent
  Cc: linux-gpio@vger.kernel.org, Wolfram Sang, Magnus, Linux-SH,
	Geert Uytterhoeven

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2

 - tidyup naming format

 drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 231 +++++++++++++++++++++++++++++++++++
 1 file changed, 231 insertions(+)

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index 7ef2f71..e9be4ac 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -1782,6 +1782,183 @@ static const unsigned int scif5_clk_mux[] = {
 	SCK5_MARK,
 };
 
+/* - SSI -------------------------------------------------------------------- */
+static const unsigned int ssi0_data_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 2),
+};
+static const unsigned int ssi0_data_mux[] = {
+	SSI_SDATA0_MARK,
+};
+static const unsigned int ssi01239_ctrl_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 0), RCAR_GP_PIN(6, 1),
+};
+static const unsigned int ssi01239_ctrl_mux[] = {
+	SSI_SCK0129_MARK, SSI_WS0129_MARK,
+};
+static const unsigned int ssi1_data_a_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 3),
+};
+static const unsigned int ssi1_data_a_mux[] = {
+	SSI_SDATA1_A_MARK,
+};
+static const unsigned int ssi1_data_b_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(5, 12),
+};
+static const unsigned int ssi1_data_b_mux[] = {
+	SSI_SDATA1_B_MARK,
+};
+static const unsigned int ssi1_ctrl_a_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 26), RCAR_GP_PIN(6, 27),
+};
+static const unsigned int ssi1_ctrl_a_mux[] = {
+	SSI_SCK1_A_MARK, SSI_WS1_A_MARK,
+};
+static const unsigned int ssi1_ctrl_b_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 4), RCAR_GP_PIN(6, 21),
+};
+static const unsigned int ssi1_ctrl_b_mux[] = {
+	SSI_SCK1_B_MARK, SSI_WS1_B_MARK,
+};
+static const unsigned int ssi2_data_a_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 4),
+};
+static const unsigned int ssi2_data_a_mux[] = {
+	SSI_SDATA2_A_MARK,
+};
+static const unsigned int ssi2_data_b_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(5, 13),
+};
+static const unsigned int ssi2_data_b_mux[] = {
+	SSI_SDATA2_B_MARK,
+};
+static const unsigned int ssi2_ctrl_a_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(5, 19), RCAR_GP_PIN(5, 21),
+};
+static const unsigned int ssi2_ctrl_a_mux[] = {
+	SSI_SCK2_A_MARK, SSI_WS2_A_MARK,
+};
+static const unsigned int ssi2_ctrl_b_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 28), RCAR_GP_PIN(6, 29),
+};
+static const unsigned int ssi2_ctrl_b_mux[] = {
+	SSI_SCK2_B_MARK, SSI_WS2_B_MARK,
+};
+static const unsigned int ssi3_data_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 7),
+};
+static const unsigned int ssi3_data_mux[] = {
+	SSI_SDATA3_MARK,
+};
+static const unsigned int ssi34_ctrl_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 5), RCAR_GP_PIN(6, 6),
+};
+static const unsigned int ssi34_ctrl_mux[] = {
+	SSI_SCK34_MARK, SSI_WS34_MARK,
+};
+static const unsigned int ssi4_data_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 10),
+};
+static const unsigned int ssi4_data_mux[] = {
+	SSI_SDATA4_MARK,
+};
+static const unsigned int ssi4_ctrl_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 8), RCAR_GP_PIN(6, 9),
+};
+static const unsigned int ssi4_ctrl_mux[] = {
+	SSI_SCK4_MARK, SSI_WS4_MARK,
+};
+static const unsigned int ssi5_data_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 13),
+};
+static const unsigned int ssi5_data_mux[] = {
+	SSI_SDATA5_MARK,
+};
+static const unsigned int ssi5_ctrl_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 11), RCAR_GP_PIN(6, 12),
+};
+static const unsigned int ssi5_ctrl_mux[] = {
+	SSI_SCK5_MARK, SSI_WS5_MARK,
+};
+static const unsigned int ssi6_data_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 16),
+};
+static const unsigned int ssi6_data_mux[] = {
+	SSI_SDATA6_MARK,
+};
+static const unsigned int ssi6_ctrl_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 14), RCAR_GP_PIN(6, 15),
+};
+static const unsigned int ssi6_ctrl_mux[] = {
+	SSI_SCK6_MARK, SSI_WS6_MARK,
+};
+static const unsigned int ssi7_data_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 19),
+};
+static const unsigned int ssi7_data_mux[] = {
+	SSI_SDATA7_MARK,
+};
+static const unsigned int ssi78_ctrl_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 17), RCAR_GP_PIN(6, 18),
+};
+static const unsigned int ssi78_ctrl_mux[] = {
+	SSI_SCK78_MARK, SSI_WS78_MARK,
+};
+static const unsigned int ssi8_data_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 20),
+};
+static const unsigned int ssi8_data_mux[] = {
+	SSI_SDATA8_MARK,
+};
+static const unsigned int ssi9_data_a_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(6, 21),
+};
+static const unsigned int ssi9_data_a_mux[] = {
+	SSI_SDATA9_A_MARK,
+};
+static const unsigned int ssi9_data_b_pins[] = {
+	/* SDATA */
+	RCAR_GP_PIN(5, 14),
+};
+static const unsigned int ssi9_data_b_mux[] = {
+	SSI_SDATA9_B_MARK,
+};
+static const unsigned int ssi9_ctrl_a_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(5, 15), RCAR_GP_PIN(5, 16),
+};
+static const unsigned int ssi9_ctrl_a_mux[] = {
+	SSI_SCK9_A_MARK, SSI_WS9_A_MARK,
+};
+static const unsigned int ssi9_ctrl_b_pins[] = {
+	/* SCK, WS */
+	RCAR_GP_PIN(6, 30), RCAR_GP_PIN(6, 31),
+};
+static const unsigned int ssi9_ctrl_b_mux[] = {
+	SSI_SCK9_B_MARK, SSI_WS9_B_MARK,
+};
+
 static const struct sh_pfc_pin_group pinmux_groups[] = {
 	SH_PFC_PIN_GROUP(audio_clk_a_a),
 	SH_PFC_PIN_GROUP(audio_clk_a_b),
@@ -1832,6 +2009,31 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
 	SH_PFC_PIN_GROUP(scif4_ctrl_c),
 	SH_PFC_PIN_GROUP(scif5_data),
 	SH_PFC_PIN_GROUP(scif5_clk),
+	SH_PFC_PIN_GROUP(ssi0_data),
+	SH_PFC_PIN_GROUP(ssi01239_ctrl),
+	SH_PFC_PIN_GROUP(ssi1_data_a),
+	SH_PFC_PIN_GROUP(ssi1_data_b),
+	SH_PFC_PIN_GROUP(ssi1_ctrl_a),
+	SH_PFC_PIN_GROUP(ssi1_ctrl_b),
+	SH_PFC_PIN_GROUP(ssi2_data_a),
+	SH_PFC_PIN_GROUP(ssi2_data_b),
+	SH_PFC_PIN_GROUP(ssi2_ctrl_a),
+	SH_PFC_PIN_GROUP(ssi2_ctrl_b),
+	SH_PFC_PIN_GROUP(ssi3_data),
+	SH_PFC_PIN_GROUP(ssi34_ctrl),
+	SH_PFC_PIN_GROUP(ssi4_data),
+	SH_PFC_PIN_GROUP(ssi4_ctrl),
+	SH_PFC_PIN_GROUP(ssi5_data),
+	SH_PFC_PIN_GROUP(ssi5_ctrl),
+	SH_PFC_PIN_GROUP(ssi6_data),
+	SH_PFC_PIN_GROUP(ssi6_ctrl),
+	SH_PFC_PIN_GROUP(ssi7_data),
+	SH_PFC_PIN_GROUP(ssi78_ctrl),
+	SH_PFC_PIN_GROUP(ssi8_data),
+	SH_PFC_PIN_GROUP(ssi9_data_a),
+	SH_PFC_PIN_GROUP(ssi9_data_b),
+	SH_PFC_PIN_GROUP(ssi9_ctrl_a),
+	SH_PFC_PIN_GROUP(ssi9_ctrl_b),
 };
 
 static const char * const audio_clk_groups[] = {
@@ -1913,6 +2115,34 @@ static const char * const scif5_groups[] = {
 	"scif5_clk",
 };
 
+static const char * const ssi_groups[] = {
+	"ssi0_data",
+	"ssi01239_ctrl",
+	"ssi1_data_a",
+	"ssi1_data_b",
+	"ssi1_ctrl_a",
+	"ssi1_ctrl_b",
+	"ssi2_data_a",
+	"ssi2_data_b",
+	"ssi2_ctrl_a",
+	"ssi2_ctrl_b",
+	"ssi3_data",
+	"ssi34_ctrl",
+	"ssi4_data",
+	"ssi4_ctrl",
+	"ssi5_data",
+	"ssi5_ctrl",
+	"ssi6_data",
+	"ssi6_ctrl",
+	"ssi7_data",
+	"ssi78_ctrl",
+	"ssi8_data",
+	"ssi9_data_a",
+	"ssi9_data_b",
+	"ssi9_ctrl_a",
+	"ssi9_ctrl_b",
+};
+
 static const struct sh_pfc_function pinmux_functions[] = {
 	SH_PFC_FUNCTION(audio_clk),
 	SH_PFC_FUNCTION(i2c1),
@@ -1924,6 +2154,7 @@ static const struct sh_pfc_function pinmux_functions[] = {
 	SH_PFC_FUNCTION(scif3),
 	SH_PFC_FUNCTION(scif4),
 	SH_PFC_FUNCTION(scif5),
+	SH_PFC_FUNCTION(ssi),
 };
 
 static const struct pinmux_cfg_reg pinmux_config_regs[] = {
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 3/3 v2] pinctrl: sh-pfc: r8a7795: add Audio SSI pin support
  2015-09-18  1:54   ` [PATCH 3/3 v2] pinctrl: sh-pfc: r8a7795: add Audio SSI " Kuninori Morimoto
@ 2015-09-18  7:43     ` Geert Uytterhoeven
  2015-10-16 14:36     ` Linus Walleij
  1 sibling, 0 replies; 11+ messages in thread
From: Geert Uytterhoeven @ 2015-09-18  7:43 UTC (permalink / raw)
  To: Kuninori Morimoto
  Cc: Simon, Linus Walleij, Laurent, linux-gpio@vger.kernel.org,
	Wolfram Sang, Magnus, Linux-SH

On Fri, Sep 18, 2015 at 3:54 AM, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> v1 -> v2
>
>  - tidyup naming format

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 3/3 v2] pinctrl: sh-pfc: r8a7795: add Audio SSI pin support
  2015-09-18  1:54   ` [PATCH 3/3 v2] pinctrl: sh-pfc: r8a7795: add Audio SSI " Kuninori Morimoto
  2015-09-18  7:43     ` Geert Uytterhoeven
@ 2015-10-16 14:36     ` Linus Walleij
  1 sibling, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2015-10-16 14:36 UTC (permalink / raw)
  To: Kuninori Morimoto
  Cc: Simon, Laurent, linux-gpio@vger.kernel.org, Wolfram Sang, Magnus,
	Linux-SH, Geert Uytterhoeven

On Fri, Sep 18, 2015 at 3:54 AM, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:

> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> v1 -> v2
>
>  - tidyup naming format

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Geert will bring this to me.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support
  2015-09-18  1:51 [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support Kuninori Morimoto
  2015-09-18  1:52 ` [PATCH 0/3 v2] pinctrl: sh-pfc: r8a7795: add I2C/Audio pin support Kuninori Morimoto
@ 2015-09-18  6:09 ` Simon Horman
  2015-09-18  8:13 ` Kuninori Morimoto
  2 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2015-09-18  6:09 UTC (permalink / raw)
  To: linux-sh

Hi Morimoto-san,

On Fri, Sep 18, 2015 at 01:51:41AM +0000, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> These are v3 of Salvator-X sound support patches.
> 
> These are based on renesas-drivers-2015-09-15-v4.3-rc1
> These is including non SH-ARM patches which are
> posted to other ML, but still not yet merged.

Nice work with the set of patch-sets: your git-foo is strong.

Would you like (Geert and) me to work on putting these into topic branches?

> Kuninori Morimoto (23):
>       pinctrl: sh-pfc: r8a7795: add I2C pin support
>       pinctrl: sh-pfc: r8a7795: add Audio clock pin support
>       pinctrl: sh-pfc: r8a7795: add Audio SSI pin support
>       dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF
>       clk: add CS2000 Fractional-N driver
>       arm64: renesas: tidyup MSTP9 reverse definition order
>       arm64: renesas: r8a7795: add I2C support
>       arm64: renesas: r8a7795: add AUDIO_DMAC support
>       arm64: renesas: r8a7795: Sound SSI PIO support
>       arm64: renesas: r8a7795: Sound SSI DMA support
>       arm64: renesas: r8a7795: Sound SRC support
>       arm64: renesas: r8a7795: Sound DVC support
>       arm64: renesas: r8a7795: Sound CTU/MIX support
>       arm64: renesas: salvator-x: enable I2C
>       arm64: renesas: salvator-x: Sound SSI PIO support
>       arm64: renesas: salvator-x: Sound SSI DMA support
>       arm64: renesas: salvator-x: Sound SSI DMA support via BUSIF
>       arm64: renesas: salvator-x: Sound SRC support
>       arm64: renesas: salvator-x: Sound DVC support
>       arm64: defconfig: Enable Renesas R-Car I2C Controller
>       arm64: defconfig: add Renesas sound and AK4613 support
>       arm64: defconfig: add Renesas R-Car DMAC driver support
>       arm64: defconfig: add CS2000 driver support
> 
> Wolfram Sang (2):
>       i2c: rcar: add support for r8a7795 (R-Car H3)
>       i2c: sh_mobile: add support for r8a7795 (R-Car H3)
> 
>  Documentation/devicetree/bindings/clock/cs2000-cp.txt   |  24 +++++
>  Documentation/devicetree/bindings/i2c/i2c-rcar.txt      |   1 +
>  Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt |   1 +
>  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts      | 125 +++++++++++++++++++++++++
>  arch/arm64/boot/dts/renesas/r8a7795.dtsi                | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>  arch/arm64/configs/defconfig                            |  10 ++
>  drivers/clk/Kconfig                                     |   6 ++
>  drivers/clk/Makefile                                    |   1 +
>  drivers/clk/clk-cs2000-cp.c                             | 530 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  drivers/i2c/busses/i2c-rcar.c                           |   3 +
>  drivers/i2c/busses/i2c-sh_mobile.c                      |   1 +
>  drivers/pinctrl/sh-pfc/pfc-r8a7795.c                    | 468 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  include/dt-bindings/clock/r8a7795-clock.h               |  49 ++++++++--
>  include/linux/of_dma.h                                  |   2 +-
>  14 files changed, 1613 insertions(+), 9 deletions(-)
> 
> Best regards
> ---
> Kuninori Morimoto
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support
  2015-09-18  1:51 [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support Kuninori Morimoto
  2015-09-18  1:52 ` [PATCH 0/3 v2] pinctrl: sh-pfc: r8a7795: add I2C/Audio pin support Kuninori Morimoto
  2015-09-18  6:09 ` [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support Simon Horman
@ 2015-09-18  8:13 ` Kuninori Morimoto
  2 siblings, 0 replies; 11+ messages in thread
From: Kuninori Morimoto @ 2015-09-18  8:13 UTC (permalink / raw)
  To: linux-sh


Hi Simon

> > These are v3 of Salvator-X sound support patches.
> > 
> > These are based on renesas-drivers-2015-09-15-v4.3-rc1
> > These is including non SH-ARM patches which are
> > posted to other ML, but still not yet merged.
> 
> Nice work with the set of patch-sets: your git-foo is strong.
> 
> Would you like (Geert and) me to work on putting these into topic branches?

Hehe :) Thank you

Ahh, I didn't mention 1 things.
It needs ALSA SoC branch merge

	git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git :: topic/rcar/ak4613

Yes please create topic branch if possible

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2015-10-16 14:36 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18  1:51 [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support Kuninori Morimoto
2015-09-18  1:52 ` [PATCH 0/3 v2] pinctrl: sh-pfc: r8a7795: add I2C/Audio pin support Kuninori Morimoto
2015-09-18  1:53   ` [PATCH 1/3 v2] pinctrl: sh-pfc: r8a7795: add I2C " Kuninori Morimoto
2015-09-18  1:54   ` [PATCH 2/3 v2] pinctrl: sh-pfc: r8a7795: add Audio clock " Kuninori Morimoto
2015-09-18  7:42     ` Geert Uytterhoeven
2015-10-16 14:35     ` Linus Walleij
2015-09-18  1:54   ` [PATCH 3/3 v2] pinctrl: sh-pfc: r8a7795: add Audio SSI " Kuninori Morimoto
2015-09-18  7:43     ` Geert Uytterhoeven
2015-10-16 14:36     ` Linus Walleij
2015-09-18  6:09 ` [PATCH 0/25 v3][RFC] arm64: Salvator-X sound support Simon Horman
2015-09-18  8:13 ` Kuninori Morimoto

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox