summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-03-25 10:04:18 +0100
committerLee Jones <lee.jones@linaro.org>2012-01-05 10:03:07 +0000
commit61b69e43816e60d90c82d2d5ec82ed2f1146c136 (patch)
tree42cf1fd146a108b16db8e96165ea03d067a4b80e
parente61c25e4ef1210d2ebffc82a292c9cfece20934c (diff)
msp: improved configuration for msp1
MSP1 Pins configured as GPIO to improve consumption during sleep mode GPIO[33] DIR=1, DATA=0 GPIO[36:34] DIR=0, PDIS=1 ST-Ericsson ID: ER 271120 Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> Change-Id: Ie394b8633a079974d9cc481b618eec1a8c005f03 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10365 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Conflicts: arch/arm/mach-ux500/board-mop500-msp.c arch/arm/mach-ux500/board-mop500.c arch/arm/mach-ux500/include/mach/msp.h drivers/misc/audio_io_dev/ste_audio_io_core.c drivers/misc/audio_io_dev/ste_audio_io_core.h drivers/misc/audio_io_dev/ste_audio_io_func.c drivers/misc/i2s/msp_i2s.c include/linux/mfd/ab8500.h
-rw-r--r--sound/arm/u8500_alsa_ab8500.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/arm/u8500_alsa_ab8500.c b/sound/arm/u8500_alsa_ab8500.c
index fe104539cc9..56c54b6c80c 100644
--- a/sound/arm/u8500_alsa_ab8500.c
+++ b/sound/arm/u8500_alsa_ab8500.c
@@ -1342,7 +1342,6 @@ static int u8500_direct_rendering_mode_ctrl_put(struct snd_kcontrol *kcontrol, s
t_ab8500_codec_error error;
chip->direct_rendering_mode = uinfo->value.enumerated.item[0];
-
changed = 1;
return changed;
@@ -1809,8 +1808,6 @@ static int configure_direct_rendering(struct snd_pcm_substream *substream)
writel(0x0, ((char *)(IO_ADDRESS(U8500_MSP1_BASE) + 0x20))); //MSP
writel(0x0, ((char *)(IO_ADDRESS(U8500_MSP1_BASE) + 0x2C))); //MSP
- printk("\n stm_gpio_altfuncenable for GPIO_ALT_MSP_1\n");
-
dsp_configure_audio_codec();
#if DRIVER_DEBUG > 0