From: Paul Walmsley Date: Thu, 19 Apr 2012 10:04:37 +0000 (-0600) Subject: ARM: OMAP3: hwmod data: add IVA hard reset lines, main clock, clockdomain X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f42c54968f2e02a7f4816051557f79d847b39f6e;p=linux-beck.git ARM: OMAP3: hwmod data: add IVA hard reset lines, main clock, clockdomain The IVA hwmod data is missing some fields that cause the following warning on boot: [ 0.118011] omap_hwmod: iva: cannot be enabled for reset (3) Fix by encoding the IP block's main functional clock, reset lines, and clockdomain. Signed-off-by: Paul Walmsley --- diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 15cdc4abd6e2..0c65079c2b69 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -99,9 +99,19 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = { }; /* IVA2 (IVA2) */ +static struct omap_hwmod_rst_info omap3xxx_iva_resets[] = { + { .name = "logic", .rst_shift = 0 }, + { .name = "seq0", .rst_shift = 1 }, + { .name = "seq1", .rst_shift = 2 }, +}; + static struct omap_hwmod omap3xxx_iva_hwmod = { .name = "iva", .class = &iva_hwmod_class, + .clkdm_name = "iva2_clkdm", + .rst_lines = omap3xxx_iva_resets, + .rst_lines_cnt = ARRAY_SIZE(omap3xxx_iva_resets), + .main_clk = "iva2_ck", }; /* timer class */