[PATCH 1/2] ARM: omap5: hwmod_data: Update McPDM hwmod's flags

[PATCH 1/2] ARM: omap5: hwmod_data: Update McPDM hwmod's flags

[Peter Ujfalusi]

Add HWMOD_SWSUP_SIDLE to flags.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 892317294fdc..e829664e6a6c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -895,7 +895,7 @@ static struct omap_hwmod omap54xx_mcpdm_hwmod = {
 	 * current exception.
 	 */
 
-	.flags		= HWMOD_EXT_OPT_MAIN_CLK,
+	.flags		= HWMOD_EXT_OPT_MAIN_CLK | HWMOD_SWSUP_SIDLE,
 	.main_clk	= "pad_clks_ck",
 	.prcm = {
 		.omap4 = {
-- 
1.9.2

[PATCH 2/2] ARM: omap5: hwmod_data: Add AESS related data

[Peter Ujfalusi]

Add the needed hwmod entries which is needed for AESS (Audio Engine
SubSystem) and ABE.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 64 ++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index e829664e6a6c..3e20c025b5a4 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -146,6 +146,7 @@ static struct omap_hwmod omap54xx_l4_abe_hwmod = {
 	.prcm = {
 		.omap4 = {
 			.clkctrl_offs = OMAP54XX_CM_ABE_L4_ABE_CLKCTRL_OFFSET,
+			.context_offs = OMAP54XX_RM_ABE_AESS_CONTEXT_OFFSET,
 			.flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
 		},
 	},
@@ -211,6 +212,42 @@ static struct omap_hwmod omap54xx_mpu_private_hwmod = {
 };
 
 /*
+ * 'aess' class
+ * audio engine sub system
+ */
+
+static struct omap_hwmod_class_sysconfig omap54xx_aess_sysc = {
+	.rev_offs	= 0x0000,
+	.sysc_offs	= 0x0010,
+	.sysc_flags	= (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE),
+	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+			   MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART |
+			   MSTANDBY_SMART_WKUP),
+	.sysc_fields	= &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class omap54xx_aess_hwmod_class = {
+	.name	= "aess",
+	.sysc	= &omap54xx_aess_sysc,
+	.enable_preprogram = omap_hwmod_aess_preprogram,
+};
+
+/* aess */
+static struct omap_hwmod omap54xx_aess_hwmod = {
+	.name		= "aess",
+	.class		= &omap54xx_aess_hwmod_class,
+	.clkdm_name	= "abe_clkdm",
+	.main_clk	= "aess_fclk",
+	.prcm = {
+		.omap4 = {
+			.clkctrl_offs = OMAP54XX_CM_ABE_AESS_CLKCTRL_OFFSET,
+			.context_offs = OMAP54XX_RM_ABE_AESS_CONTEXT_OFFSET,
+			.modulemode   = MODULEMODE_SWCTRL,
+		},
+	},
+};
+
+/*
  * 'counter' class
  * 32-bit ordinary counter, clocked by the falling edge of the 32 khz clock
  */
@@ -1892,6 +1929,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__l3_main_3 = {
 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* aess -> l4_abe */
+static struct omap_hwmod_ocp_if __maybe_unused omap54xx_aess__l4_abe = {
+	.master		= &omap54xx_aess_hwmod,
+	.slave		= &omap54xx_l4_abe_hwmod,
+	.clk		= "abe_iclk",
+	.user		= OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 /* l3_main_1 -> l4_abe */
 static struct omap_hwmod_ocp_if omap54xx_l3_main_1__l4_abe = {
 	.master		= &omap54xx_l3_main_1_hwmod,
@@ -1966,6 +2011,22 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__dma_system = {
 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l4_abe -> aess */
+static struct omap_hwmod_ocp_if __maybe_unused omap54xx_l4_abe__aess = {
+	.master		= &omap54xx_l4_abe_hwmod,
+	.slave		= &omap54xx_aess_hwmod,
+	.clk		= "abe_iclk",
+	.user		= OCP_USER_MPU,
+};
+
+/* l4_abe -> aess (dma) */
+static struct omap_hwmod_ocp_if __maybe_unused omap54xx_l4_abe__aess_dma = {
+	.master		= &omap54xx_l4_abe_hwmod,
+	.slave		= &omap54xx_aess_hwmod,
+	.clk		= "abe_iclk",
+	.user		= OCP_USER_SDMA,
+};
+
 /* l4_abe -> dmic */
 static struct omap_hwmod_ocp_if omap54xx_l4_abe__dmic = {
 	.master		= &omap54xx_l4_abe_hwmod,
@@ -2417,6 +2478,9 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
 	&omap54xx_l3_main_1__l3_main_3,
 	&omap54xx_l3_main_2__l3_main_3,
 	&omap54xx_l4_cfg__l3_main_3,
+	&omap54xx_l4_abe__aess,
+	&omap54xx_l4_abe__aess_dma,
+	&omap54xx_aess__l4_abe,
 	&omap54xx_l3_main_1__l4_abe,
 	&omap54xx_mpu__l4_abe,
 	&omap54xx_l3_main_1__l4_cfg,
-- 
1.9.2

[PATCH 1/2] ARM: omap5: hwmod_data: Update McPDM hwmod's flags

[Paul Walmsley]

Hi P?ter,

On Wed, 30 Apr 2014, Peter Ujfalusi wrote:

> Add HWMOD_SWSUP_SIDLE to flags.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

This patch could use a better changelog.  It would be ideal to understand 
_why_ HWMOD_SWSUP_SIDLE is needed.  Is there a known hardware bug?  Or is 
this simply based on practical observation, e.g., something bad happens if 
the McPDM is not software-idled?


- Paul

[PATCH 1/2] ARM: omap5: hwmod_data: Update McPDM hwmod's flags

[Peter Ujfalusi]

Hi Paul,

On 05/08/2014 03:20 AM, Paul Walmsley wrote:
> Hi P?ter,
> 
> On Wed, 30 Apr 2014, Peter Ujfalusi wrote:
> 
>> Add HWMOD_SWSUP_SIDLE to flags.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> 
> This patch could use a better changelog.  It would be ideal to understand 
> _why_ HWMOD_SWSUP_SIDLE is needed.  Is there a known hardware bug?  Or is 
> this simply based on practical observation, e.g., something bad happens if 
> the McPDM is not software-idled?

The same issue exists on OMAP5 as on OMAP4:

commit 12d82e4b0aa6c71f38b668a372f9a13f243207da
Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date:   Fri Jan 18 16:48:16 2013 -0700

    ARM: OMAP4: hwmod_data: Correct IDLEMODE for McPDM

    McPDM need to be configured to NO_IDLE mode when it is in used otherwise
    vital clocks will be gated which results 'slow motion' audio playback.

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    [paul at pwsan.com: copy patch description into hwmod data comments]
    Signed-off-by: Paul Walmsley <paul@pwsan.com>

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c

-- 
P?ter

[PATCH 1/2] ARM: omap5: hwmod_data: Update McPDM hwmod's flags

[Paul Walmsley]

On Thu, 8 May 2014, Peter Ujfalusi wrote:

> Hi Paul,
> 
> On 05/08/2014 03:20 AM, Paul Walmsley wrote:
> > Hi P?ter,
> > 
> > On Wed, 30 Apr 2014, Peter Ujfalusi wrote:
> > 
> >> Add HWMOD_SWSUP_SIDLE to flags.
> >>
> >> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> > 
> > This patch could use a better changelog.  It would be ideal to understand 
> > _why_ HWMOD_SWSUP_SIDLE is needed.  Is there a known hardware bug?  Or is 
> > this simply based on practical observation, e.g., something bad happens if 
> > the McPDM is not software-idled?
> 
> The same issue exists on OMAP5 as on OMAP4:
> 
> commit 12d82e4b0aa6c71f38b668a372f9a13f243207da
> Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
> Date:   Fri Jan 18 16:48:16 2013 -0700
> 
>     ARM: OMAP4: hwmod_data: Correct IDLEMODE for McPDM
> 
>     McPDM need to be configured to NO_IDLE mode when it is in used otherwise
>     vital clocks will be gated which results 'slow motion' audio playback.
> 
>     Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>     [paul at pwsan.com: copy patch description into hwmod data comments]
>     Signed-off-by: Paul Walmsley <paul@pwsan.com>
> 
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Thanks, could you please resend the patch with an updated commit message?  
Then I'll take it.  I assume this is -rc material?


- Paul

[PATCH 2/2] ARM: omap5: hwmod_data: Add AESS related data

[Peter Ujfalusi]

Paul,

On 04/30/2014 02:43 PM, Peter Ujfalusi wrote:
> Add the needed hwmod entries which is needed for AESS (Audio Engine
> SubSystem) and ABE.

please ignore this patch to add AESS to hwmod data. W/o addresses defined we
will see warnings printed. So either I add the addresses to hwmod data or need
to have aess also in DT.

-- 
P?ter

> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
>  arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 64 ++++++++++++++++++++++++++++++
>  1 file changed, 64 insertions(+)
> 
> diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> index e829664e6a6c..3e20c025b5a4 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
> @@ -146,6 +146,7 @@ static struct omap_hwmod omap54xx_l4_abe_hwmod = {
>  	.prcm = {
>  		.omap4 = {
>  			.clkctrl_offs = OMAP54XX_CM_ABE_L4_ABE_CLKCTRL_OFFSET,
> +			.context_offs = OMAP54XX_RM_ABE_AESS_CONTEXT_OFFSET,
>  			.flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
>  		},
>  	},
> @@ -211,6 +212,42 @@ static struct omap_hwmod omap54xx_mpu_private_hwmod = {
>  };
>  
>  /*
> + * 'aess' class
> + * audio engine sub system
> + */
> +
> +static struct omap_hwmod_class_sysconfig omap54xx_aess_sysc = {
> +	.rev_offs	= 0x0000,
> +	.sysc_offs	= 0x0010,
> +	.sysc_flags	= (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE),
> +	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
> +			   MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART |
> +			   MSTANDBY_SMART_WKUP),
> +	.sysc_fields	= &omap_hwmod_sysc_type2,
> +};
> +
> +static struct omap_hwmod_class omap54xx_aess_hwmod_class = {
> +	.name	= "aess",
> +	.sysc	= &omap54xx_aess_sysc,
> +	.enable_preprogram = omap_hwmod_aess_preprogram,
> +};
> +
> +/* aess */
> +static struct omap_hwmod omap54xx_aess_hwmod = {
> +	.name		= "aess",
> +	.class		= &omap54xx_aess_hwmod_class,
> +	.clkdm_name	= "abe_clkdm",
> +	.main_clk	= "aess_fclk",
> +	.prcm = {
> +		.omap4 = {
> +			.clkctrl_offs = OMAP54XX_CM_ABE_AESS_CLKCTRL_OFFSET,
> +			.context_offs = OMAP54XX_RM_ABE_AESS_CONTEXT_OFFSET,
> +			.modulemode   = MODULEMODE_SWCTRL,
> +		},
> +	},
> +};
> +
> +/*
>   * 'counter' class
>   * 32-bit ordinary counter, clocked by the falling edge of the 32 khz clock
>   */
> @@ -1892,6 +1929,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__l3_main_3 = {
>  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
>  };
>  
> +/* aess -> l4_abe */
> +static struct omap_hwmod_ocp_if __maybe_unused omap54xx_aess__l4_abe = {
> +	.master		= &omap54xx_aess_hwmod,
> +	.slave		= &omap54xx_l4_abe_hwmod,
> +	.clk		= "abe_iclk",
> +	.user		= OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
>  /* l3_main_1 -> l4_abe */
>  static struct omap_hwmod_ocp_if omap54xx_l3_main_1__l4_abe = {
>  	.master		= &omap54xx_l3_main_1_hwmod,
> @@ -1966,6 +2011,22 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__dma_system = {
>  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
>  };
>  
> +/* l4_abe -> aess */
> +static struct omap_hwmod_ocp_if __maybe_unused omap54xx_l4_abe__aess = {
> +	.master		= &omap54xx_l4_abe_hwmod,
> +	.slave		= &omap54xx_aess_hwmod,
> +	.clk		= "abe_iclk",
> +	.user		= OCP_USER_MPU,
> +};
> +
> +/* l4_abe -> aess (dma) */
> +static struct omap_hwmod_ocp_if __maybe_unused omap54xx_l4_abe__aess_dma = {
> +	.master		= &omap54xx_l4_abe_hwmod,
> +	.slave		= &omap54xx_aess_hwmod,
> +	.clk		= "abe_iclk",
> +	.user		= OCP_USER_SDMA,
> +};
> +
>  /* l4_abe -> dmic */
>  static struct omap_hwmod_ocp_if omap54xx_l4_abe__dmic = {
>  	.master		= &omap54xx_l4_abe_hwmod,
> @@ -2417,6 +2478,9 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
>  	&omap54xx_l3_main_1__l3_main_3,
>  	&omap54xx_l3_main_2__l3_main_3,
>  	&omap54xx_l4_cfg__l3_main_3,
> +	&omap54xx_l4_abe__aess,
> +	&omap54xx_l4_abe__aess_dma,
> +	&omap54xx_aess__l4_abe,
>  	&omap54xx_l3_main_1__l4_abe,
>  	&omap54xx_mpu__l4_abe,
>  	&omap54xx_l3_main_1__l4_cfg,
> 

[PATCH v2] ARM: omap5: hwmod_data: Correct IDLEMODE for McPDM

[Peter Ujfalusi]

McPDM need to be configured to NO_IDLE mode when it is in used otherwise
vital clocks will be gated which results 'slow motion' audio playback.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
Hi Paul,

Changes since v1:
- updated the commit message

If this can still make it to 3.15, that would be great.

Regards,
Peter

 arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 892317294fdc..e829664e6a6c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -895,7 +895,7 @@ static struct omap_hwmod omap54xx_mcpdm_hwmod = {
 	 * current exception.
 	 */
 
-	.flags		= HWMOD_EXT_OPT_MAIN_CLK,
+	.flags		= HWMOD_EXT_OPT_MAIN_CLK | HWMOD_SWSUP_SIDLE,
 	.main_clk	= "pad_clks_ck",
 	.prcm = {
 		.omap4 = {
-- 
1.9.2

[PATCH v2] ARM: omap5: hwmod_data: Correct IDLEMODE for McPDM

[Paul Walmsley]

On Fri, 9 May 2014, Peter Ujfalusi wrote:

> McPDM need to be configured to NO_IDLE mode when it is in used otherwise
> vital clocks will be gated which results 'slow motion' audio playback.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Thanks, queued for v3.15-rc.

- Paul