Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98bbc114 authored by Dave Gerlach's avatar Dave Gerlach Committed by Paul Walmsley
Browse files

ARM: OMAP2+: hwmod: Change hardreset soc_ops for AM43XX 



am43xx reset register layout is more similar to am33xx than omap4 so
use the am33xx functions for hwmod hardreset soc_ops rather than the
currently used omap4 functions. Without this, assert_hardreset and
deassert_hardreset will not work on am43xx.

Signed-off-by: default avatarDave Gerlach <d-gerlach@ti.com>
[paul@pwsan.com: fixed build errors for an AM43xx-only Kconfig]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent abf04af7

arch/arm/mach-omap2/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -110,14 +110,16 @@ obj-y += prm_common.o cm_common.o 
obj-$(CONFIG_ARCH_OMAP2)		+= prm2xxx_3xxx.o prm2xxx.o cm2xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prm2xxx_3xxx.o prm3xxx.o cm3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= vc3xxx_data.o vp3xxx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= prm33xx.o cm33xx.o

omap-prcm-4-5-common			=  cminst44xx.o cm44xx.o prm44xx.o \

					   prcm_mpu44xx.o prminst44xx.o \

					   vc44xx_data.o vp44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-prcm-4-5-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-prcm-4-5-common)

obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-prcm-4-5-common)

obj-$(CONFIG_SOC_AM43XX)		+= $(omap-prcm-4-5-common)

am33xx-43xx-prcm-common			+= prm33xx.o cm33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= $(am33xx-43xx-prcm-common)

obj-$(CONFIG_SOC_AM43XX)		+= $(omap-prcm-4-5-common) \

					   $(am33xx-43xx-prcm-common)



# OMAP voltage domains

voltagedomain-common			:= voltage.o vc.o vp.o

arch/arm/mach-omap2/cm33xx.h

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ void am33xx_cm_clkdm_disable_hwsup(u16 inst, u16 cdoffs); 
void am33xx_cm_clkdm_force_sleep(u16 inst, u16 cdoffs);

void am33xx_cm_clkdm_force_wakeup(u16 inst, u16 cdoffs);



#ifdef CONFIG_SOC_AM33XX

#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)

extern int am33xx_cm_wait_module_idle(u16 inst, s16 cdoffs,

					u16 clkctrl_offs);

extern void am33xx_cm_module_enable(u8 mode, u16 inst, s16 cdoffs,

arch/arm/mach-omap2/omap_hwmod.c

+3 −3
Original line number Diff line number Diff line
@@ -4251,9 +4251,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 = _omap4_assert_hardreset;

		soc_ops.deassert_hardreset = _omap4_deassert_hardreset;

		soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted;

		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.init_clkdm = _init_clkdm;

	} else if (soc_is_am33xx()) {

		soc_ops.enable_module = _am33xx_enable_module;