Skip to content

Commit

Permalink
ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex fr…
Browse files Browse the repository at this point in the history
…om common list

Commit d6504ac ("OMAP2+: hwmod:
remove OMAP_CHIP*") tests the inverse condition of what it should be
testing for the return value from omap_hwmod_register().  This causes
several IP blocks to not be registered on several OMAP3 family devices.

Fixing that bug also unmasked another bug, originally reported by
Chase Maupin <chase.maupin@ti.com> and then subsequently by Abhilash K
V <abhilash.kv@ti.com>, which caused SmartReflex IP blocks to be
registered on SoCs that don't support them.

Thanks to Russell King - ARM Linux <linux@arm.linux.org.uk> for comments
on a previous version of the patch.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Chase Maupin <chase.maupin@ti.com>
Cc: Abhilash K V <abhilash.kv@ti.com>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Paul Walmsley authored and Tony Lindgren committed Nov 5, 2011
1 parent af504e5 commit ace9021
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -3270,7 +3270,7 @@ int __init omap3xxx_hwmod_init(void)

/* Register hwmods common to all OMAP3 */
r = omap_hwmod_register(omap3xxx_hwmods);
if (!r)
if (r < 0)
return r;

rev = omap_rev();
Expand All @@ -3295,7 +3295,7 @@ int __init omap3xxx_hwmod_init(void)
};

r = omap_hwmod_register(h);
if (!r)
if (r < 0)
return r;

/*
Expand Down

0 comments on commit ace9021

Please sign in to comment.