diff mbox

[1/2] ARM: shmobile: r8a7790: add Audio DMAC clock

Message ID 87zjn9ik7o.wl%kuninori.morimoto.gx@gmail.com (mailing list archive)
State Changes Requested
Headers show

Commit Message

Kuninori Morimoto Jan. 6, 2014, 8:32 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Audio DMAC can be controlled via sh-dma-engine

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/mach-shmobile/clock-r8a7790.c |    5 +++++
 1 file changed, 5 insertions(+)

Comments

Simon Horman Jan. 8, 2014, 4:17 a.m. UTC | #1 
On Mon, Jan 06, 2014 at 12:32:46AM -0800, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Audio DMAC can be controlled via sh-dma-engine
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  arch/arm/mach-shmobile/clock-r8a7790.c |    5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> index 9dd5499b4..4f23247 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -204,6 +204,7 @@ enum {
>  	MSTP717, MSTP716,
>  	MSTP704,
>  	MSTP522,
> +	MSTP502, MSTP501,
>  	MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
>  	MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
>  	MSTP124,
> @@ -239,6 +240,8 @@ static struct clk mstp_clks[MSTP_NR] = {
>  	[MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
>  	[MSTP704] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 4, 0), /* HSUSB */
>  	[MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */
> +	[MSTP502] = SH_CLK_MSTP32(&zs_clk, SMSTPCR5, 2, 0), /* Audio-DMAC low */
> +	[MSTP501] = SH_CLK_MSTP32(&zs_clk, SMSTPCR5, 1, 0), /* Audio-DMAC hi */
>  	[MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
>  	[MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
>  	[MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */
> @@ -318,6 +321,8 @@ static struct clk_lookup lookups[] = {
>  	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
>  	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
>  	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
> +	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP502]),
> +	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP501]),
>  	CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]),
>  	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
>  	CLKDEV_DEV_ID("ee100000.sd", &mstp_clks[MSTP314]),

Unfortunately this patch conflicts with "ARM: shmobile: r8a7790: Wait for
status on all MSTP clocks" which I have queued up as a fix for v3.14.

As this patch will be submitted for inclusion on v3.15 it will be in a
branch based on v3.14-rc1 which I expect to include (""ARM: shmobile:
r8a7790: Wait for status on all MSTP clocks").

Rather than risk messing up doing the non-trivial rebase of this
patch myself I have dropped this patch. Could you please rebase it
on top of the latest devel tag of the renesas tree, currently
renesas-devel-v3.13-rc7-20140108.
--
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
Simon Horman Jan. 8, 2014, 4:23 a.m. UTC | #2 
On Wed, Jan 08, 2014 at 01:17:38PM +0900, Simon Horman wrote:
> On Mon, Jan 06, 2014 at 12:32:46AM -0800, Kuninori Morimoto wrote:
> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > 
> > Audio DMAC can be controlled via sh-dma-engine
> > 
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> >  arch/arm/mach-shmobile/clock-r8a7790.c |    5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> > index 9dd5499b4..4f23247 100644
> > --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> > +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> > @@ -204,6 +204,7 @@ enum {
> >  	MSTP717, MSTP716,
> >  	MSTP704,
> >  	MSTP522,
> > +	MSTP502, MSTP501,
> >  	MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
> >  	MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
> >  	MSTP124,
> > @@ -239,6 +240,8 @@ static struct clk mstp_clks[MSTP_NR] = {
> >  	[MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
> >  	[MSTP704] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 4, 0), /* HSUSB */
> >  	[MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */
> > +	[MSTP502] = SH_CLK_MSTP32(&zs_clk, SMSTPCR5, 2, 0), /* Audio-DMAC low */
> > +	[MSTP501] = SH_CLK_MSTP32(&zs_clk, SMSTPCR5, 1, 0), /* Audio-DMAC hi */
> >  	[MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
> >  	[MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
> >  	[MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */
> > @@ -318,6 +321,8 @@ static struct clk_lookup lookups[] = {
> >  	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
> >  	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
> >  	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
> > +	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP502]),
> > +	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP501]),
> >  	CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]),
> >  	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
> >  	CLKDEV_DEV_ID("ee100000.sd", &mstp_clks[MSTP314]),
> 
> Unfortunately this patch conflicts with "ARM: shmobile: r8a7790: Wait for
> status on all MSTP clocks" which I have queued up as a fix for v3.14.
> 
> As this patch will be submitted for inclusion on v3.15 it will be in a
> branch based on v3.14-rc1 which I expect to include (""ARM: shmobile:
> r8a7790: Wait for status on all MSTP clocks").
> 
> Rather than risk messing up doing the non-trivial rebase of this
> patch myself I have dropped this patch. Could you please rebase it
> on top of the latest devel tag of the renesas tree, currently
> renesas-devel-v3.13-rc7-20140108.

Sorry, cut-and-paste error on my part.

This patch is not queued up but I would like you to rebase it
(so I can queue it up :).
--
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
diff mbox

Patch

diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 9dd5499b4..4f23247 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -204,6 +204,7 @@  enum {
 	MSTP717, MSTP716,
 	MSTP704,
 	MSTP522,
+	MSTP502, MSTP501,
 	MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
 	MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
 	MSTP124,
@@ -239,6 +240,8 @@  static struct clk mstp_clks[MSTP_NR] = {
 	[MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
 	[MSTP704] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 4, 0), /* HSUSB */
 	[MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */
+	[MSTP502] = SH_CLK_MSTP32(&zs_clk, SMSTPCR5, 2, 0), /* Audio-DMAC low */
+	[MSTP501] = SH_CLK_MSTP32(&zs_clk, SMSTPCR5, 1, 0), /* Audio-DMAC hi */
 	[MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
 	[MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
 	[MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */
@@ -318,6 +321,8 @@  static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
 	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
 	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
+	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP502]),
+	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP501]),
 	CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]),
 	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
 	CLKDEV_DEV_ID("ee100000.sd", &mstp_clks[MSTP314]),