diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-24 06:59:18 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-24 06:59:18 +0200 |
| commit | 24da741c678f865de3182194604dbddcc7fc7f3c (patch) | |
| tree | 0322f37f8e9e4e945acc100a0d1821db268fe624 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | Merge tag 'for-v4.3/omap-hwmod-prcm-a' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | ARM: OMAP2: Add minimal dm814x hwmod support (diff) | |
| download | linux-24da741c678f865de3182194604dbddcc7fc7f3c.tar.xz linux-24da741c678f865de3182194604dbddcc7fc7f3c.zip | |
Merge branch 'dm814x-soc' into omap-for-v4.3/soc
Update dm814x changes for sparse fixes to make data structures
static.
Conflicts:
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 2ceed3192f22..1ba175f7210a 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -3891,7 +3891,8 @@ void __init omap_hwmod_init(void) soc_ops.init_clkdm = _init_clkdm; soc_ops.update_context_lost = _omap4_update_context_lost; soc_ops.get_context_lost = _omap4_get_context_lost; - } else if (cpu_is_ti816x() || soc_is_am33xx() || soc_is_am43xx()) { + } else if (cpu_is_ti814x() || cpu_is_ti816x() || soc_is_am33xx() || + soc_is_am43xx()) { soc_ops.enable_module = _omap4_enable_module; soc_ops.disable_module = _omap4_disable_module; soc_ops.wait_target_ready = _omap4_wait_target_ready; |