diff options
| author | Tero Kristo <t-kristo@ti.com> | 2014-10-27 08:39:24 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-10-27 08:39:24 -0700 |
| commit | 409d70632357122fa89db298256a162bb563a08b (patch) | |
| tree | 52aed11dc3d25ad9b1843316b7737c27a087a2e2 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 05d2b09329ad34a9f8b5b9ac25ab11f4fc077bc7 (diff) | |
| download | linux-stable-409d70632357122fa89db298256a162bb563a08b.tar.gz linux-stable-409d70632357122fa89db298256a162bb563a08b.tar.bz2 linux-stable-409d70632357122fa89db298256a162bb563a08b.zip | |
ARM: AM43xx: hwmod: use OMAP4 hardreset ops instead of the AM33xx version
AM43xx is using OMAP4+ PRM driver, so it should be using the corresponding
hardreset ops from the hwmod also.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 9fec604ee625..af4482d3d308 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -4123,9 +4123,9 @@ void __init omap_hwmod_init(void) soc_ops.enable_module = _omap4_enable_module; soc_ops.disable_module = _omap4_disable_module; soc_ops.wait_target_ready = _omap4_wait_target_ready; - soc_ops.assert_hardreset = _am33xx_assert_hardreset; - soc_ops.deassert_hardreset = _am33xx_deassert_hardreset; - soc_ops.is_hardreset_asserted = _am33xx_is_hardreset_asserted; + soc_ops.assert_hardreset = _omap4_assert_hardreset; + soc_ops.deassert_hardreset = _omap4_deassert_hardreset; + soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted; soc_ops.init_clkdm = _init_clkdm; } else if (soc_is_am33xx()) { soc_ops.enable_module = _omap4_enable_module; |