commit f445d05328a2d627c2fb70c79d8b01455c254609
author Tony Lindgren <tony@atomide.com> Wed Jun 12 07:00:35 2013 -0700
committer Tony Lindgren <tony@atomide.com> Wed Jun 12 07:00:35 2013 -0700
tree e46c5f112ba429f836c0c63719b928a8e14fb131
parent 668468b161745df666b75fbfb76d14155b0f9df6
parent 3d85f548d3c84a13dc54cc9c79249c5fdae2ad36

Merge branch 'dss-regulator' into omap-for-v3.11/fixes-non-critical

arch/arm/mach-omap2/control.c

diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 2adb268..31e0dfe 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -249,6 +249,7 @@
 	u32 offset = cpu_is_omap243x() ? OMAP243X_CONTROL_IVA2_BOOTADDR :
 		     cpu_is_omap34xx() ? OMAP343X_CONTROL_IVA2_BOOTADDR :
 		     cpu_is_omap44xx() ? OMAP4_CTRL_MODULE_CORE_DSP_BOOTADDR :
+		     soc_is_omap54xx() ? OMAP4_CTRL_MODULE_CORE_DSP_BOOTADDR :
 		     0;
 
 	if (!offset) {