diff options
author | Tony Lindgren <tony@atomide.com> | 2017-06-12 03:27:30 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-06-12 03:27:30 -0700 |
commit | 67d00470accf5c58abbb23a44c867c5f15437976 (patch) | |
tree | 4141a408b08ec38c6d3cf0295641ce3e8a63182b /arch/arm/mach-omap2/prm3xxx.c | |
parent | Merge branch 'omap-for-v4.13/legacy-v2' into omap-for-v4.13/soc-v3 (diff) | |
parent | ARM: OMAP2+: hwmod: populate clkctrl clocks for hwmods if available (diff) | |
download | linux-dev-67d00470accf5c58abbb23a44c867c5f15437976.tar.xz linux-dev-67d00470accf5c58abbb23a44c867c5f15437976.zip |
Merge branch 'omap-for-v4.13/clkctrl' into omap-for-v4.13/soc-v4
Diffstat (limited to 'arch/arm/mach-omap2/prm3xxx.c')
-rw-r--r-- | arch/arm/mach-omap2/prm3xxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index 395cf43b5c5e..382e236fbfd9 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -676,7 +676,7 @@ static struct prm_ll_data omap3xxx_prm_ll_data = { int __init omap3xxx_prm_init(const struct omap_prcm_init_data *data) { omap2_clk_legacy_provider_init(TI_CLKM_PRM, - prm_base + OMAP3430_IVA2_MOD); + prm_base.va + OMAP3430_IVA2_MOD); if (omap3_has_io_wakeup()) prm_features |= PRM_HAS_IO_WAKEUP; |