OSDN Git Service

ARM: OMAP3: hwmod data: add IVA hard reset lines, main clock, clockdomain
authorPaul Walmsley <paul@pwsan.com>
Thu, 19 Apr 2012 10:04:37 +0000 (04:04 -0600)
committerPaul Walmsley <paul@pwsan.com>
Thu, 19 Apr 2012 10:25:07 +0000 (04:25 -0600)
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 <paul@pwsan.com>
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

index 15cdc4a..0c65079 100644 (file)
@@ -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 */