]> git.openpandora.org Git - pandora-kernel.git/commitdiff
ARM: AM43xx: hwmod: use OMAP4 hardreset ops instead of the AM33xx version
authorTero Kristo <t-kristo@ti.com>
Thu, 28 Aug 2014 14:38:22 +0000 (17:38 +0300)
committerTero Kristo <t-kristo@ti.com>
Mon, 22 Sep 2014 12:52:26 +0000 (15:52 +0300)
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>
arch/arm/mach-omap2/omap_hwmod.c

index 68c8bb543aed4ff225c5e07220fb9b32abc9387f..02518c5fdaa90bb014e52a5e5e23cd432ee9d7fc 100644 (file)
@@ -4116,9 +4116,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;