Re: [PATCH 1/8] OMAP4: hwmod: add EMIF hw mod data

["Cousson, Benoit" <b-cousson@ti.com>]

Hi Aneesh

On 3/8/2012 4:54 PM, Aneesh V wrote:
> From: Benoit Cousson<b-cousson@ti.com>
>
> Add hwmod data for EMIF IP instances in OMAP4.

Paul has just posted an OMAP4 hwmod series (ARM: OMAP4: hwmod data: add 
almost all remaining IP blocks) that does contain the EMIF hwmods, so 
assuming that you are not adding some custom dev_attr here, it should 
work for you.

Regards,
Benoit



>
> Signed-off-by: Benoit Cousson<b-cousson@ti.com>
> ---
> Changes since RFC:
> - Improved commit log
> ---
>   arch/arm/mach-omap2/omap_hwmod_44xx_data.c |  110 ++++++++++++++++++++++++++++
>   1 files changed, 110 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index f9f1510..2b107c7 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -5480,6 +5480,111 @@ static struct omap_hwmod omap44xx_usb_tll_hs_hwmod = {
>   	.slaves_cnt	= ARRAY_SIZE(omap44xx_usb_tll_hs_slaves),
>   };
>
> +/*
> + * 'emif' class
> + * external memory interface no1
> + */
> +
> +static struct omap_hwmod_class omap44xx_emif_hwmod_class = {
> +	.name	= "emif",
> +};
> +
> +/* emif1 */
> +static struct omap_hwmod omap44xx_emif1_hwmod;
> +static struct omap_hwmod_irq_info omap44xx_emif1_irqs[] = {
> +	{ .irq = 110 + OMAP44XX_IRQ_GIC_START },
> +	{ .irq = -1 }
> +};
> +
> +static struct omap_hwmod_addr_space omap44xx_emif1_addrs[] = {
> +	{
> +		.pa_start	= 0x4c000000,
> +		.pa_end		= 0x4c0000ff,
> +		.flags		= ADDR_TYPE_RT
> +	},
> +	{ }
> +};
> +
> +/* emif_fw ->  emif1 */
> +static struct omap_hwmod_ocp_if omap44xx_emif_fw__emif1 = {
> +	.master		=&omap44xx_emif_fw_hwmod,
> +	.slave		=&omap44xx_emif1_hwmod,
> +	.clk		= "l3_div_ck",
> +	.addr		= omap44xx_emif1_addrs,
> +	.user		= OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
> +/* emif1 slave ports */
> +static struct omap_hwmod_ocp_if *omap44xx_emif1_slaves[] = {
> +	&omap44xx_emif_fw__emif1,
> +};
> +
> +static struct omap_hwmod omap44xx_emif1_hwmod = {
> +	.name		= "emif1",
> +	.class		=&omap44xx_emif_hwmod_class,
> +	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
> +	.mpu_irqs	= omap44xx_emif1_irqs,
> +	.main_clk	= "emif1_fck",
> +	.clkdm_name	= "l3_emif_clkdm",
> +	.prcm		= {
> +		.omap4 = {
> +			.clkctrl_offs = OMAP4_CM_MEMIF_EMIF_1_CLKCTRL_OFFSET,
> +			.context_offs = OMAP4_RM_MEMIF_EMIF_1_CONTEXT_OFFSET,
> +			.modulemode   = MODULEMODE_HWCTRL,
> +		},
> +	},
> +	.slaves		= omap44xx_emif1_slaves,
> +	.slaves_cnt	= ARRAY_SIZE(omap44xx_emif1_slaves),
> +};
> +
> +/* emif2 */
> +static struct omap_hwmod omap44xx_emif2_hwmod;
> +static struct omap_hwmod_irq_info omap44xx_emif2_irqs[] = {
> +	{ .irq = 111 + OMAP44XX_IRQ_GIC_START },
> +	{ .irq = -1 }
> +};
> +
> +static struct omap_hwmod_addr_space omap44xx_emif2_addrs[] = {
> +	{
> +		.pa_start	= 0x4d000000,
> +		.pa_end		= 0x4d0000ff,
> +		.flags		= ADDR_TYPE_RT
> +	},
> +	{ }
> +};
> +
> +/* emif_fw ->  emif2 */
> +static struct omap_hwmod_ocp_if omap44xx_emif_fw__emif2 = {
> +	.master		=&omap44xx_emif_fw_hwmod,
> +	.slave		=&omap44xx_emif2_hwmod,
> +	.clk		= "l3_div_ck",
> +	.addr		= omap44xx_emif2_addrs,
> +	.user		= OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
> +/* emif2 slave ports */
> +static struct omap_hwmod_ocp_if *omap44xx_emif2_slaves[] = {
> +	&omap44xx_emif_fw__emif2,
> +};
> +
> +static struct omap_hwmod omap44xx_emif2_hwmod = {
> +	.name		= "emif2",
> +	.class		=&omap44xx_emif_hwmod_class,
> +	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
> +	.mpu_irqs	= omap44xx_emif2_irqs,
> +	.main_clk	= "emif2_fck",
> +	.clkdm_name	= "l3_emif_clkdm",
> +	.prcm		= {
> +		.omap4 = {
> +			.clkctrl_offs = OMAP4_CM_MEMIF_EMIF_1_CLKCTRL_OFFSET,
> +			.context_offs = OMAP4_RM_MEMIF_EMIF_1_CONTEXT_OFFSET,
> +			.modulemode   = MODULEMODE_HWCTRL,
> +		}
> +	},
> +	.slaves		= omap44xx_emif2_slaves,
> +	.slaves_cnt	= ARRAY_SIZE(omap44xx_emif2_slaves),
> +};
> +
>   static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
>
>   	/* dmm class */
> @@ -5629,6 +5734,11 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
>   	/* wd_timer class */
>   	&omap44xx_wd_timer2_hwmod,
>   	&omap44xx_wd_timer3_hwmod,
> +
> +	/* emif class */
> +	&omap44xx_emif1_hwmod,
> +	&omap44xx_emif2_hwmod,
> +
>   	NULL,
>   };
>