Commit ace90216 authored by Paul Walmsley's avatar Paul Walmsley Committed by Tony Lindgren

ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list

Commit d6504acd ("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: default avatarPaul 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: default avatarTony Lindgren <tony@atomide.com>
parent af504e5d
...@@ -3270,7 +3270,7 @@ int __init omap3xxx_hwmod_init(void) ...@@ -3270,7 +3270,7 @@ int __init omap3xxx_hwmod_init(void)
/* Register hwmods common to all OMAP3 */ /* Register hwmods common to all OMAP3 */
r = omap_hwmod_register(omap3xxx_hwmods); r = omap_hwmod_register(omap3xxx_hwmods);
if (!r) if (r < 0)
return r; return r;
rev = omap_rev(); rev = omap_rev();
...@@ -3295,7 +3295,7 @@ int __init omap3xxx_hwmod_init(void) ...@@ -3295,7 +3295,7 @@ int __init omap3xxx_hwmod_init(void)
}; };
r = omap_hwmod_register(h); r = omap_hwmod_register(h);
if (!r) if (r < 0)
return r; return r;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment