From: Tero Kristo Date: Mon, 27 Oct 2014 15:39:24 +0000 (-0700) Subject: ARM: AM43xx: hwmod: use OMAP4 hardreset ops instead of the AM33xx version X-Git-Tag: v3.19-rc1~169^2~22^2~14 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=409d70632357122fa89db298256a162bb563a08b;p=karo-tx-linux.git 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 Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren --- 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;