[PATCH 4.4.y] ASoC: rsnd: ctu: add rsnd_mix_activation()

[PATCH 4.4.y] ASoC: rsnd: ctu: add rsnd_mix_activation()

[Nhan Nguyen]

From: thongsyho <thong.ho.px@rvc.renesas.com>

commit bd9a603fe78fa838a9c884b1e67749120a45508c upstream.

Based on datasheet

Cc: stable@vger.kernel.org
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Thong Ho <thong.ho.px@rvc.renesas.com>
Signed-off-by: Nhan Nguyen <nhan.nguyen.yb@renesas.com>
---
 sound/soc/sh/rcar/ctu.c  | 8 ++++++++
 sound/soc/sh/rcar/gen.c  | 1 +
 sound/soc/sh/rcar/rsnd.h | 1 +
 3 files changed, 10 insertions(+)

diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index 3cb214a..a4f22b5 100644
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -24,6 +24,12 @@ struct rsnd_ctu {
 		     ((pos) = (struct rsnd_ctu *)(priv)->ctu + i);	\
 	     i++)
 
+static void rsnd_ctu_activation(struct rsnd_mod *mod)
+{
+	rsnd_mod_write(mod, CTU_SWRSR, 0);
+	rsnd_mod_write(mod, CTU_SWRSR, 1);
+}
+
 #define rsnd_ctu_initialize_lock(mod)	__rsnd_ctu_initialize_lock(mod, 1)
 #define rsnd_ctu_initialize_unlock(mod)	__rsnd_ctu_initialize_lock(mod, 0)
 static void __rsnd_ctu_initialize_lock(struct rsnd_mod *mod, u32 enable)
@@ -37,6 +43,8 @@ static int rsnd_ctu_init(struct rsnd_mod *mod,
 {
 	rsnd_mod_power_on(mod);
 
+	rsnd_ctu_activation(mod);
+
 	rsnd_ctu_initialize_lock(mod);
 
 	rsnd_mod_write(mod, CTU_ADINR, rsnd_get_adinr_chan(mod, io));
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index edcf4cc..42c11cd 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -244,6 +244,7 @@ static int rsnd_gen2_probe(struct platform_device *pdev,
 		RSND_GEN_M_REG(SRC_SRCCR,	0x224,	0x40),
 		RSND_GEN_M_REG(SRC_BSDSR,	0x22c,	0x40),
 		RSND_GEN_M_REG(SRC_BSISR,	0x238,	0x40),
+		RSND_GEN_M_REG(CTU_SWRSR,       0x500,  0x100),
 		RSND_GEN_M_REG(CTU_CTUIR,	0x504,	0x100),
 		RSND_GEN_M_REG(CTU_ADINR,	0x508,	0x100),
 		RSND_GEN_M_REG(MIX_SWRSR,	0xd00,	0x40),
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 0853298..3d15c99 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -48,6 +48,7 @@ enum rsnd_reg {
 	RSND_REG_SCU_SYS_STATUS0,
 	RSND_REG_SCU_SYS_INT_EN0,
 	RSND_REG_CMD_ROUTE_SLCT,
+	RSND_REG_CTU_SWRSR,
 	RSND_REG_CTU_CTUIR,
 	RSND_REG_CTU_ADINR,
 	RSND_REG_MIX_SWRSR,
-- 
1.9.1

Re: [PATCH 4.4.y] ASoC: rsnd: ctu: add rsnd_mix_activation()

[Greg KH]

On Thu, Aug 24, 2017 at 03:19:42PM +0700, Nhan Nguyen wrote:
> From: thongsyho <thong.ho.px@rvc.renesas.com>
> 
> commit bd9a603fe78fa838a9c884b1e67749120a45508c upstream.
> 
> Based on datasheet
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Thong Ho <thong.ho.px@rvc.renesas.com>
> Signed-off-by: Nhan Nguyen <nhan.nguyen.yb@renesas.com>
> ---
>  sound/soc/sh/rcar/ctu.c  | 8 ++++++++
>  sound/soc/sh/rcar/gen.c  | 1 +
>  sound/soc/sh/rcar/rsnd.h | 1 +
>  3 files changed, 10 insertions(+)

Why is this a relevant stable kernel patch?

thanks,

greg k-h

Re: FW: [PATCH 4.4.y] ASoC: rsnd: ctu: add rsnd_mix_activation()

[Nhan Ngoc. Nguyen]

Please ignore my patch! It add new feature.
Thanks!

>> -----Original Message-----
>> From: Greg KH [mailto:gregkh@linuxfoundation.org]
>> Sent: Monday, August 28, 2017 2:01 PM
>> To: O365-Nhan Ngoc. Nguyen <nhan.nguyen.yb@renesas.com>
>> Cc: O365-Toru Oishi <toru.oishi.zj@renesas.com>; Thong Sy . Ho
>> <thong.ho.px@rvc.renesas.com>; stable@vger.kernel.org; Kuninori
>> Morimoto <kuninori.morimoto.gx@renesas.com>; Mark Brown
>> <broonie@kernel.org>
>> Subject: Re: [PATCH 4.4.y] ASoC: rsnd: ctu: add rsnd_mix_activation()
>>
>> On Thu, Aug 24, 2017 at 03:19:42PM +0700, Nhan Nguyen wrote:
>>> From: thongsyho <thong.ho.px@rvc.renesas.com>
>>>
>>> commit bd9a603fe78fa838a9c884b1e67749120a45508c upstream.
>>>
>>> Based on datasheet
>>>
>>> Cc: stable@vger.kernel.org
>>> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>>> Signed-off-by: Mark Brown <broonie@kernel.org>
>>> Signed-off-by: Thong Ho <thong.ho.px@rvc.renesas.com>
>>> Signed-off-by: Nhan Nguyen <nhan.nguyen.yb@renesas.com>
>>> ---
>>>   sound/soc/sh/rcar/ctu.c  | 8 ++++++++  sound/soc/sh/rcar/gen.c  | 1 +
>>> sound/soc/sh/rcar/rsnd.h | 1 +
>>>   3 files changed, 10 insertions(+)
>> Why is this a relevant stable kernel patch?
>>
>> thanks,
>>
>> greg k-h