diff options
| author | Dave Gerlach <d-gerlach@ti.com> | 2014-06-16 00:02:17 +0200 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2014-06-16 00:02:17 +0200 |
| commit | 98bbc114bfa0ea1da31e230050b437e19e49e2b3 (patch) | |
| tree | 691853e074785197bcf81405b81b5d48ede17840 /arch/arm/mach-omap2/cm33xx.h | |
| parent | Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/j... (diff) | |
| download | linux-98bbc114bfa0ea1da31e230050b437e19e49e2b3.tar.xz linux-98bbc114bfa0ea1da31e230050b437e19e49e2b3.zip | |
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: Dave Gerlach <d-gerlach@ti.com>
[paul@pwsan.com: fixed build errors for an AM43xx-only Kconfig]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/cm33xx.h')
| -rw-r--r-- | arch/arm/mach-omap2/cm33xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cm33xx.h b/arch/arm/mach-omap2/cm33xx.h index 15a778ce7707..bd2441790779 100644 --- a/arch/arm/mach-omap2/cm33xx.h +++ b/arch/arm/mach-omap2/cm33xx.h @@ -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, |