From d830f470985d85fb058d1b9f9df6c870eb305ce5 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Thu, 19 Apr 2012 04:04:37 -0600 Subject: [PATCH] --- yaml --- r: 303033 b: refs/heads/master c: f42c54968f2e02a7f4816051557f79d847b39f6e h: refs/heads/master i: 303031: 8a7857258e199af41d0cce1bf29c1e84ad5451e3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ad9731b227ba..01599491d5bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 064931abb5cf173913edd54575f208bd7a41f4a7 +refs/heads/master: f42c54968f2e02a7f4816051557f79d847b39f6e diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 15cdc4abd6e2..0c65079c2b69 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/trunk/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 */