summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm34xx.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-03-04 17:17:06 +0200
committerTero Kristo <t-kristo@ti.com>2014-07-04 17:02:18 +0300
commitbbd36f9f03eceee5c208db83049142171e6338f6 (patch)
tree16a6d579e4938078996158b172f059ea40572389 /arch/arm/mach-omap2/pm34xx.c
parentc5180a2b3e26d9b82277986f830c89a50103e65a (diff)
downloadlinux-stable-bbd36f9f03eceee5c208db83049142171e6338f6.tar.gz
linux-stable-bbd36f9f03eceee5c208db83049142171e6338f6.tar.bz2
linux-stable-bbd36f9f03eceee5c208db83049142171e6338f6.zip
ARM: OMAP3: control: add API for setting up the modem pads
This patch moves the functionality from PM core to control driver. Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r--arch/arm/mach-omap2/pm34xx.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 3ea04ac10d16..126f3ec2d174 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -355,20 +355,7 @@ restore:
static void __init omap3_d2d_idle(void)
{
- u16 mask, padconf;
-
- /* In a stand alone OMAP3430 where there is not a stacked
- * modem for the D2D Idle Ack and D2D MStandby must be pulled
- * high. S CONTROL_PADCONF_SAD2D_IDLEACK and
- * CONTROL_PADCONF_SAD2D_MSTDBY to have a pull up. */
- mask = (1 << 4) | (1 << 3); /* pull-up, enabled */
- padconf = omap_ctrl_readw(OMAP3_PADCONF_SAD2D_MSTANDBY);
- padconf |= mask;
- omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_MSTANDBY);
-
- padconf = omap_ctrl_readw(OMAP3_PADCONF_SAD2D_IDLEACK);
- padconf |= mask;
- omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_IDLEACK);
+ omap3_ctrl_setup_d2d_padconf();
/* reset modem */
omap3_prm_reset_modem();