diff options
| author | Ola Lilja <elilola@steludxu2785.(none)> | 2011-04-15 17:06:18 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-04-19 17:29:33 +0200 |
| commit | 19ee623a872865988261eab50ecd2ea29b45d479 (patch) | |
| tree | b4911a7c257599b0e2baf42c9950bbf80f1d7813 /sound | |
| parent | 6a224b51fa5098033443ea90dc6df120c82ce6e7 (diff) | |
[ANDROID] staging: android: PWM-vibra for ASoC
PWM-vibra modified to use AB8500 ASoC-driver instead of audio_io-driver.
ST-Ericsson ID: 273228
Change-Id: I44e36e5d78442df1c4ee5383e339d0fa6e64d367
Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21099
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.c | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c index d4dc7c1ac75..cd3cd2d0174 100644 --- a/sound/soc/codecs/ab8500_audio.c +++ b/sound/soc/codecs/ab8500_audio.c @@ -167,6 +167,8 @@ static const u8 ab8500_reg_cache[AB8500_CACHEREGNUM] = { 0x02, /* REG_AUDREV (0x6F) - read only */ }; +static struct snd_soc_codec *ab8500_codec; + /* Reads an arbitrary register from the ab8500 chip. */ static int ab8500_codec_read_reg(struct snd_soc_codec *codec, unsigned int bank, @@ -1503,6 +1505,65 @@ static int ab8500_codec_set_bit_delay_if1(struct snd_soc_codec *codec, unsigned /* Extended interface for codec-driver */ +void ab8500_audio_pwm_vibra(unsigned char speed_left_pos, + unsigned char speed_left_neg, + unsigned char speed_right_pos, + unsigned char speed_right_neg) +{ + unsigned int clear_mask, set_mask; + bool vibra_on; + + if (ab8500_codec == NULL) { + pr_err("%s: ERROR: AB8500 ASoC-driver not yet probed!\n", __func__); + return; + } + + vibra_on = speed_left_pos | speed_left_neg | speed_right_pos | speed_right_neg; + + if (!vibra_on) { + pr_debug("%s: PWM-vibra off.\n", __func__); + clear_mask = BMASK(REG_ANACONF4_ENVIB1) | BMASK(REG_ANACONF4_ENVIB2); + ab8500_codec_update_reg_audio(ab8500_codec, REG_ANACONF4, clear_mask, 0x00); + return; + } + + pr_debug("%s: PWM-vibra on (%d, %d, %d, %d).\n", + __func__, + speed_left_pos, + speed_left_neg, + speed_right_pos, + speed_right_neg); + + set_mask = BMASK(REG_PWMGENCONF1_PWMTOVIB1) | + BMASK(REG_PWMGENCONF1_PWMTOVIB2) | + BMASK(REG_PWMGENCONF1_PWM1CTRL) | + BMASK(REG_PWMGENCONF1_PWM2CTRL) | + BMASK(REG_PWMGENCONF1_PWM1NCTRL) | + BMASK(REG_PWMGENCONF1_PWM1PCTRL) | + BMASK(REG_PWMGENCONF1_PWM2NCTRL) | + BMASK(REG_PWMGENCONF1_PWM2PCTRL); + ab8500_codec_update_reg_audio(ab8500_codec, REG_PWMGENCONF1, 0x00, set_mask); + + if (speed_left_pos > REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX) + speed_left_pos = REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX; + ab8500_codec_update_reg_audio(ab8500_codec, REG_PWMGENCONF3, REG_MASK_ALL, speed_left_pos); + + if (speed_left_neg > REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX) + speed_left_neg = REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX; + ab8500_codec_update_reg_audio(ab8500_codec, REG_PWMGENCONF2, REG_MASK_ALL, speed_left_neg); + + if (speed_right_pos > REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX) + speed_right_pos = REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX; + ab8500_codec_update_reg_audio(ab8500_codec, REG_PWMGENCONF5, REG_MASK_ALL, speed_right_pos); + + if (speed_right_neg > REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX) + speed_right_neg = REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX; + ab8500_codec_update_reg_audio(ab8500_codec, REG_PWMGENCONF4, REG_MASK_ALL, speed_right_neg); + + set_mask = BMASK(REG_ANACONF4_ENVIB1) | BMASK(REG_ANACONF4_ENVIB2); + ab8500_codec_update_reg_audio(ab8500_codec, REG_ANACONF4, 0x00, set_mask); +} + int ab8500_audio_set_word_length(struct snd_soc_dai *dai, unsigned int wl) { unsigned int clear_mask, set_mask; @@ -1999,12 +2060,15 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) return ret; } + ab8500_codec = codec; + return 0; } static int ab8500_codec_remove(struct snd_soc_codec *codec) { snd_soc_dapm_free(codec); + ab8500_codec = NULL; return 0; } |