Skip to content

L
linux
Commit 991e02b4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'for-2.6.38' of... 

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
parents 465d7fcc 1bf84759
Hide whitespace changes
Inline Side-by-side
Showing with 844 additions and 219 deletions
sound/soc/codecs/tlv320aic3x.c
View file @ 991e02b4
...@@ -1545,21 +1545,6 @@ static struct i2c_driver aic3x_i2c_driver = { ...@@ -1545,21 +1545,6 @@ static struct i2c_driver aic3x_i2c_driver = {
.remove = aic3x_i2c_remove, .remove = aic3x_i2c_remove,
.id_table = aic3x_i2c_id, .id_table = aic3x_i2c_id,
}; };
static inline void aic3x_i2c_init(void)
{
int ret;
ret = i2c_add_driver(&aic3x_i2c_driver);
if (ret)
printk(KERN_ERR "%s: error regsitering i2c driver, %d\n",
__func__, ret);
}
static inline void aic3x_i2c_exit(void)
{
i2c_del_driver(&aic3x_i2c_driver);
}
#endif #endif
static int __init aic3x_modinit(void) static int __init aic3x_modinit(void)
......
sound/soc/codecs/tlv320dac33.c
View file @ 991e02b4
...@@ -315,8 +315,6 @@ static void dac33_init_chip(struct snd_soc_codec *codec) ...@@ -315,8 +315,6 @@ static void dac33_init_chip(struct snd_soc_codec *codec)
clock source = internal osc (?) */ clock source = internal osc (?) */
dac33_write(codec, DAC33_ANA_VOL_SOFT_STEP_CTRL, DAC33_VOLCLKEN); dac33_write(codec, DAC33_ANA_VOL_SOFT_STEP_CTRL, DAC33_VOLCLKEN);
dac33_write(codec, DAC33_PWR_CTRL, DAC33_PDNALLB);
/* Restore only selected registers (gains mostly) */ /* Restore only selected registers (gains mostly) */
dac33_write(codec, DAC33_LDAC_DIG_VOL_CTRL, dac33_write(codec, DAC33_LDAC_DIG_VOL_CTRL,
dac33_read_reg_cache(codec, DAC33_LDAC_DIG_VOL_CTRL)); dac33_read_reg_cache(codec, DAC33_LDAC_DIG_VOL_CTRL));
...@@ -356,6 +354,21 @@ static inline void dac33_soft_power(struct snd_soc_codec *codec, int power) ...@@ -356,6 +354,21 @@ static inline void dac33_soft_power(struct snd_soc_codec *codec, int power)
dac33_write(codec, DAC33_PWR_CTRL, reg); dac33_write(codec, DAC33_PWR_CTRL, reg);
} }
static inline void dac33_disable_digital(struct snd_soc_codec *codec)
{
u8 reg;
/* Stop the DAI clock */
reg = dac33_read_reg_cache(codec, DAC33_SER_AUDIOIF_CTRL_B);
reg &= ~DAC33_BCLKON;
dac33_write(codec, DAC33_SER_AUDIOIF_CTRL_B, reg);
/* Power down the Oscillator, and DACs */
reg = dac33_read_reg_cache(codec, DAC33_PWR_CTRL);
reg &= ~(DAC33_OSCPDNB | DAC33_DACRPDNB | DAC33_DACLPDNB);
dac33_write(codec, DAC33_PWR_CTRL, reg);
}
static int dac33_hard_power(struct snd_soc_codec *codec, int power) static int dac33_hard_power(struct snd_soc_codec *codec, int power)
{ {
struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec); struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);
...@@ -404,7 +417,7 @@ static int dac33_hard_power(struct snd_soc_codec *codec, int power) ...@@ -404,7 +417,7 @@ static int dac33_hard_power(struct snd_soc_codec *codec, int power)
return ret; return ret;
} }
static int playback_event(struct snd_soc_dapm_widget *w, static int dac33_playback_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(w->codec); struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(w->codec);
...@@ -416,6 +429,9 @@ static int playback_event(struct snd_soc_dapm_widget *w, ...@@ -416,6 +429,9 @@ static int playback_event(struct snd_soc_dapm_widget *w,
dac33_prepare_chip(dac33->substream); dac33_prepare_chip(dac33->substream);
} }
break; break;
case SND_SOC_DAPM_POST_PMD:
dac33_disable_digital(w->codec);
break;
} }
return 0; return 0;
} }
...@@ -592,8 +608,8 @@ static const struct snd_soc_dapm_widget dac33_dapm_widgets[] = { ...@@ -592,8 +608,8 @@ static const struct snd_soc_dapm_widget dac33_dapm_widgets[] = {
SND_SOC_DAPM_INPUT("LINEL"), SND_SOC_DAPM_INPUT("LINEL"),
SND_SOC_DAPM_INPUT("LINER"), SND_SOC_DAPM_INPUT("LINER"),
SND_SOC_DAPM_DAC("DACL", "Left Playback", DAC33_LDAC_PWR_CTRL, 2, 0), SND_SOC_DAPM_DAC("DACL", "Left Playback", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_DAC("DACR", "Right Playback", DAC33_RDAC_PWR_CTRL, 2, 0), SND_SOC_DAPM_DAC("DACR", "Right Playback", SND_SOC_NOPM, 0, 0),
/* Analog bypass */ /* Analog bypass */
SND_SOC_DAPM_SWITCH("Analog Left Bypass", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_SWITCH("Analog Left Bypass", SND_SOC_NOPM, 0, 0,
...@@ -601,12 +617,18 @@ static const struct snd_soc_dapm_widget dac33_dapm_widgets[] = { ...@@ -601,12 +617,18 @@ static const struct snd_soc_dapm_widget dac33_dapm_widgets[] = {
SND_SOC_DAPM_SWITCH("Analog Right Bypass", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_SWITCH("Analog Right Bypass", SND_SOC_NOPM, 0, 0,
&dac33_dapm_abypassr_control), &dac33_dapm_abypassr_control),
SND_SOC_DAPM_REG(snd_soc_dapm_mixer, "Output Left Amp Power", SND_SOC_DAPM_REG(snd_soc_dapm_mixer, "Output Left Amplifier",
DAC33_OUT_AMP_PWR_CTRL, 6, 3, 3, 0), DAC33_OUT_AMP_PWR_CTRL, 6, 3, 3, 0),
SND_SOC_DAPM_REG(snd_soc_dapm_mixer, "Output Right Amp Power", SND_SOC_DAPM_REG(snd_soc_dapm_mixer, "Output Right Amplifier",
DAC33_OUT_AMP_PWR_CTRL, 4, 3, 3, 0), DAC33_OUT_AMP_PWR_CTRL, 4, 3, 3, 0),
SND_SOC_DAPM_PRE("Prepare Playback", playback_event), SND_SOC_DAPM_SUPPLY("Left DAC Power",
DAC33_LDAC_PWR_CTRL, 2, 0, NULL, 0),
SND_SOC_DAPM_SUPPLY("Right DAC Power",
DAC33_RDAC_PWR_CTRL, 2, 0, NULL, 0),
SND_SOC_DAPM_PRE("Pre Playback", dac33_playback_event),
SND_SOC_DAPM_POST("Post Playback", dac33_playback_event),
}; };
static const struct snd_soc_dapm_route audio_map[] = { static const struct snd_soc_dapm_route audio_map[] = {
...@@ -614,15 +636,18 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -614,15 +636,18 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"Analog Left Bypass", "Switch", "LINEL"}, {"Analog Left Bypass", "Switch", "LINEL"},
{"Analog Right Bypass", "Switch", "LINER"}, {"Analog Right Bypass", "Switch", "LINER"},
{"Output Left Amp Power", NULL, "DACL"}, {"Output Left Amplifier", NULL, "DACL"},
{"Output Right Amp Power", NULL, "DACR"}, {"Output Right Amplifier", NULL, "DACR"},
{"Output Left Amplifier", NULL, "Analog Left Bypass"},
{"Output Right Amplifier", NULL, "Analog Right Bypass"},
{"Output Left Amp Power", NULL, "Analog Left Bypass"}, {"Output Left Amplifier", NULL, "Left DAC Power"},
{"Output Right Amp Power", NULL, "Analog Right Bypass"}, {"Output Right Amplifier", NULL, "Right DAC Power"},
/* output */ /* output */
{"LEFT_LO", NULL, "Output Left Amp Power"}, {"LEFT_LO", NULL, "Output Left Amplifier"},
{"RIGHT_LO", NULL, "Output Right Amp Power"}, {"RIGHT_LO", NULL, "Output Right Amplifier"},
}; };
static int dac33_add_widgets(struct snd_soc_codec *codec) static int dac33_add_widgets(struct snd_soc_codec *codec)
...@@ -640,11 +665,13 @@ static int dac33_add_widgets(struct snd_soc_codec *codec) ...@@ -640,11 +665,13 @@ static int dac33_add_widgets(struct snd_soc_codec *codec)
static int dac33_set_bias_level(struct snd_soc_codec *codec, static int dac33_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);
int ret; int ret;
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
dac33_soft_power(codec, 1); if (!dac33->substream)
dac33_soft_power(codec, 1);
break; break;
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
break; break;
......
sound/soc/codecs/tpa6130a2.c
View file @ 991e02b4
...@@ -41,7 +41,7 @@ struct tpa6130a2_data { ...@@ -41,7 +41,7 @@ struct tpa6130a2_data {
unsigned char regs[TPA6130A2_CACHEREGNUM]; unsigned char regs[TPA6130A2_CACHEREGNUM];
struct regulator *supply; struct regulator *supply;
int power_gpio; int power_gpio;
unsigned char power_state; u8 power_state:1;
enum tpa_model id; enum tpa_model id;
}; };
...@@ -116,7 +116,7 @@ static int tpa6130a2_initialize(void) ...@@ -116,7 +116,7 @@ static int tpa6130a2_initialize(void)
return ret; return ret;
} }
static int tpa6130a2_power(int power) static int tpa6130a2_power(u8 power)
{ {
struct tpa6130a2_data *data; struct tpa6130a2_data *data;
u8 val; u8 val;
...@@ -126,8 +126,10 @@ static int tpa6130a2_power(int power) ...@@ -126,8 +126,10 @@ static int tpa6130a2_power(int power)
data = i2c_get_clientdata(tpa6130a2_client); data = i2c_get_clientdata(tpa6130a2_client);
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
if (power && !data->power_state) { if (power == data->power_state)
goto exit;
if (power) {
ret = regulator_enable(data->supply); ret = regulator_enable(data->supply);
if (ret != 0) { if (ret != 0) {
dev_err(&tpa6130a2_client->dev, dev_err(&tpa6130a2_client->dev,
...@@ -149,12 +151,7 @@ static int tpa6130a2_power(int power) ...@@ -149,12 +151,7 @@ static int tpa6130a2_power(int power)
data->power_state = 0; data->power_state = 0;
goto exit; goto exit;
} }
} else {
/* Clear SWS */
val = tpa6130a2_read(TPA6130A2_REG_CONTROL);
val &= ~TPA6130A2_SWS;
tpa6130a2_i2c_write(TPA6130A2_REG_CONTROL, val);
} else if (!power && data->power_state) {
/* set SWS */ /* set SWS */
val = tpa6130a2_read(TPA6130A2_REG_CONTROL); val = tpa6130a2_read(TPA6130A2_REG_CONTROL);
val |= TPA6130A2_SWS; val |= TPA6130A2_SWS;
...@@ -299,6 +296,7 @@ static void tpa6130a2_channel_enable(u8 channel, int enable) ...@@ -299,6 +296,7 @@ static void tpa6130a2_channel_enable(u8 channel, int enable)
/* Enable amplifier */ /* Enable amplifier */
val = tpa6130a2_read(TPA6130A2_REG_CONTROL); val = tpa6130a2_read(TPA6130A2_REG_CONTROL);
val |= channel; val |= channel;
val &= ~TPA6130A2_SWS;
tpa6130a2_i2c_write(TPA6130A2_REG_CONTROL, val); tpa6130a2_i2c_write(TPA6130A2_REG_CONTROL, val);
/* Unmute channel */ /* Unmute channel */
...@@ -319,72 +317,24 @@ static void tpa6130a2_channel_enable(u8 channel, int enable) ...@@ -319,72 +317,24 @@ static void tpa6130a2_channel_enable(u8 channel, int enable)
} }
} }
static int tpa6130a2_left_event(struct snd_soc_dapm_widget *w, int tpa6130a2_stereo_enable(struct snd_soc_codec *codec, int enable)
struct snd_kcontrol *kcontrol, int event)
{
switch (event) {
case SND_SOC_DAPM_POST_PMU:
tpa6130a2_channel_enable(TPA6130A2_HP_EN_L, 1);
break;
case SND_SOC_DAPM_POST_PMD:
tpa6130a2_channel_enable(TPA6130A2_HP_EN_L, 0);
break;
}
return 0;
}
static int tpa6130a2_right_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
switch (event) {
case SND_SOC_DAPM_POST_PMU:
tpa6130a2_channel_enable(TPA6130A2_HP_EN_R, 1);
break;
case SND_SOC_DAPM_POST_PMD:
tpa6130a2_channel_enable(TPA6130A2_HP_EN_R, 0);
break;
}
return 0;
}
static int tpa6130a2_supply_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{ {
int ret = 0; int ret = 0;
if (enable) {
switch (event) {
case SND_SOC_DAPM_POST_PMU:
ret = tpa6130a2_power(1); ret = tpa6130a2_power(1);
break; if (ret < 0)
case SND_SOC_DAPM_POST_PMD: return ret;
tpa6130a2_channel_enable(TPA6130A2_HP_EN_R | TPA6130A2_HP_EN_L,
1);
} else {
tpa6130a2_channel_enable(TPA6130A2_HP_EN_R | TPA6130A2_HP_EN_L,
0);
ret = tpa6130a2_power(0); ret = tpa6130a2_power(0);
break;
} }
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(tpa6130a2_stereo_enable);
static const struct snd_soc_dapm_widget tpa6130a2_dapm_widgets[] = {
SND_SOC_DAPM_PGA_E("TPA6130A2 Left", SND_SOC_NOPM,
0, 0, NULL, 0, tpa6130a2_left_event,
SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_PGA_E("TPA6130A2 Right", SND_SOC_NOPM,
0, 0, NULL, 0, tpa6130a2_right_event,
SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_SUPPLY("TPA6130A2 Enable", SND_SOC_NOPM,
0, 0, tpa6130a2_supply_event,
SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
/* Outputs */
SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Left"),
SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Right"),
};
static const struct snd_soc_dapm_route audio_map[] = {
{"TPA6130A2 Headphone Left", NULL, "TPA6130A2 Left"},
{"TPA6130A2 Headphone Right", NULL, "TPA6130A2 Right"},
{"TPA6130A2 Headphone Left", NULL, "TPA6130A2 Enable"},
{"TPA6130A2 Headphone Right", NULL, "TPA6130A2 Enable"},
};
int tpa6130a2_add_controls(struct snd_soc_codec *codec) int tpa6130a2_add_controls(struct snd_soc_codec *codec)
{ {
...@@ -396,18 +346,12 @@ int tpa6130a2_add_controls(struct snd_soc_codec *codec) ...@@ -396,18 +346,12 @@ int tpa6130a2_add_controls(struct snd_soc_codec *codec)
data = i2c_get_clientdata(tpa6130a2_client); data = i2c_get_clientdata(tpa6130a2_client);
snd_soc_dapm_new_controls(dapm, tpa6130a2_dapm_widgets,
ARRAY_SIZE(tpa6130a2_dapm_widgets));
snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
if (data->id == TPA6140A2) if (data->id == TPA6140A2)
return snd_soc_add_controls(codec, tpa6140a2_controls, return snd_soc_add_controls(codec, tpa6140a2_controls,
ARRAY_SIZE(tpa6140a2_controls)); ARRAY_SIZE(tpa6140a2_controls));
else else
return snd_soc_add_controls(codec, tpa6130a2_controls, return snd_soc_add_controls(codec, tpa6130a2_controls,
ARRAY_SIZE(tpa6130a2_controls)); ARRAY_SIZE(tpa6130a2_controls));
} }
EXPORT_SYMBOL_GPL(tpa6130a2_add_controls); EXPORT_SYMBOL_GPL(tpa6130a2_add_controls);
......
sound/soc/codecs/tpa6130a2.h
View file @ 991e02b4
...@@ -57,5 +57,6 @@ ...@@ -57,5 +57,6 @@
#define TPA6130A2_VERSION_MASK (0x0f) #define TPA6130A2_VERSION_MASK (0x0f)
extern int tpa6130a2_add_controls(struct snd_soc_codec *codec); extern int tpa6130a2_add_controls(struct snd_soc_codec *codec);
extern int tpa6130a2_stereo_enable(struct snd_soc_codec *codec, int enable);
#endif /* __TPA6130A2_H__ */ #endif /* __TPA6130A2_H__ */
sound/soc/codecs/twl4030.c
View file @ 991e02b4
...@@ -1724,6 +1724,7 @@ static int twl4030_startup(struct snd_pcm_substream *substream, ...@@ -1724,6 +1724,7 @@ static int twl4030_startup(struct snd_pcm_substream *substream,
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_codec *codec = rtd->codec;
struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24);
if (twl4030->master_substream) { if (twl4030->master_substream) {
twl4030->slave_substream = substream; twl4030->slave_substream = substream;
/* The DAI has one configuration for playback and capture, so /* The DAI has one configuration for playback and capture, so
...@@ -1848,7 +1849,7 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream, ...@@ -1848,7 +1849,7 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream,
case SNDRV_PCM_FORMAT_S16_LE: case SNDRV_PCM_FORMAT_S16_LE:
format |= TWL4030_DATA_WIDTH_16S_16W; format |= TWL4030_DATA_WIDTH_16S_16W;
break; break;
case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_S32_LE:
format |= TWL4030_DATA_WIDTH_32S_24W; format |= TWL4030_DATA_WIDTH_32S_24W;
break; break;
default: default:
...@@ -2181,7 +2182,7 @@ static int twl4030_voice_set_tristate(struct snd_soc_dai *dai, int tristate) ...@@ -2181,7 +2182,7 @@ static int twl4030_voice_set_tristate(struct snd_soc_dai *dai, int tristate)
} }
#define TWL4030_RATES (SNDRV_PCM_RATE_8000_48000) #define TWL4030_RATES (SNDRV_PCM_RATE_8000_48000)
#define TWL4030_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE) #define TWL4030_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_ops twl4030_dai_hifi_ops = { static struct snd_soc_dai_ops twl4030_dai_hifi_ops = {
.startup = twl4030_startup, .startup = twl4030_startup,
......
sound/soc/codecs/twl6040.c
View file @ 991e02b4
...@@ -39,8 +39,41 @@ ...@@ -39,8 +39,41 @@
#include "twl6040.h" #include "twl6040.h"
#define TWL6040_RATES (SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) #define TWL6040_RATES SNDRV_PCM_RATE_8000_96000
#define TWL6040_FORMATS (SNDRV_PCM_FMTBIT_S32_LE) #define TWL6040_FORMATS (SNDRV_PCM_FMTBIT_S32_LE)
#define TWL6040_OUTHS_0dB 0x00
#define TWL6040_OUTHS_M30dB 0x0F
#define TWL6040_OUTHF_0dB 0x03
#define TWL6040_OUTHF_M52dB 0x1D
#define TWL6040_RAMP_NONE 0
#define TWL6040_RAMP_UP 1
#define TWL6040_RAMP_DOWN 2
#define TWL6040_HSL_VOL_MASK 0x0F
#define TWL6040_HSL_VOL_SHIFT 0
#define TWL6040_HSR_VOL_MASK 0xF0
#define TWL6040_HSR_VOL_SHIFT 4
#define TWL6040_HF_VOL_MASK 0x1F
#define TWL6040_HF_VOL_SHIFT 0
struct twl6040_output {
u16 active;
u16 left_vol;
u16 right_vol;
u16 left_step;
u16 right_step;
unsigned int step_delay;
u16 ramp;
u16 mute;
struct completion ramp_done;
};
struct twl6040_jack_data {
struct snd_soc_jack *jack;
int report;
};
/* codec private data */ /* codec private data */
struct twl6040_data { struct twl6040_data {
...@@ -52,6 +85,17 @@ struct twl6040_data { ...@@ -52,6 +85,17 @@ struct twl6040_data {
unsigned int sysclk; unsigned int sysclk;
struct snd_pcm_hw_constraint_list *sysclk_constraints; struct snd_pcm_hw_constraint_list *sysclk_constraints;
struct completion ready; struct completion ready;
struct twl6040_jack_data hs_jack;
struct snd_soc_codec *codec;
struct workqueue_struct *workqueue;
struct delayed_work delayed_work;
struct mutex mutex;
struct twl6040_output headset;
struct twl6040_output handsfree;
struct workqueue_struct *hf_workqueue;
struct workqueue_struct *hs_workqueue;
struct delayed_work hs_delayed_work;
struct delayed_work hf_delayed_work;
}; };
/* /*
...@@ -200,7 +244,7 @@ static int twl6040_read_reg_volatile(struct snd_soc_codec *codec, ...@@ -200,7 +244,7 @@ static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
if (reg >= TWL6040_CACHEREGNUM) if (reg >= TWL6040_CACHEREGNUM)
return -EIO; return -EIO;
twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &value, reg); twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &value, reg);
twl6040_write_reg_cache(codec, reg, value); twl6040_write_reg_cache(codec, reg, value);
return value; return value;
...@@ -216,7 +260,7 @@ static int twl6040_write(struct snd_soc_codec *codec, ...@@ -216,7 +260,7 @@ static int twl6040_write(struct snd_soc_codec *codec,
return -EIO; return -EIO;
twl6040_write_reg_cache(codec, reg, value); twl6040_write_reg_cache(codec, reg, value);
return twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, reg); return twl_i2c_write_u8(TWL_MODULE_AUDIO_VOICE, value, reg);
} }
static void twl6040_init_vio_regs(struct snd_soc_codec *codec) static void twl6040_init_vio_regs(struct snd_soc_codec *codec)
...@@ -253,6 +297,305 @@ static void twl6040_init_vdd_regs(struct snd_soc_codec *codec) ...@@ -253,6 +297,305 @@ static void twl6040_init_vdd_regs(struct snd_soc_codec *codec)
} }
} }
/*
* Ramp HS PGA volume to minimise pops at stream startup and shutdown.
*/
static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
unsigned int left_step, unsigned int right_step)
{
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
struct twl6040_output *headset = &priv->headset;
int left_complete = 0, right_complete = 0;
u8 reg, val;
/* left channel */
left_step = (left_step > 0xF) ? 0xF : left_step;
reg = twl6040_read_reg_cache(codec, TWL6040_REG_HSGAIN);
val = (~reg & TWL6040_HSL_VOL_MASK);
if (headset->ramp == TWL6040_RAMP_UP) {
/* ramp step up */
if (val < headset->left_vol) {
val += left_step;
reg &= ~TWL6040_HSL_VOL_MASK;
twl6040_write(codec, TWL6040_REG_HSGAIN,
(reg | (~val & TWL6040_HSL_VOL_MASK)));
} else {
left_complete = 1;
}
} else if (headset->ramp == TWL6040_RAMP_DOWN) {
/* ramp step down */
if (val > 0x0) {
val -= left_step;
reg &= ~TWL6040_HSL_VOL_MASK;
twl6040_write(codec, TWL6040_REG_HSGAIN, reg |
(~val & TWL6040_HSL_VOL_MASK));
} else {
left_complete = 1;
}
}
/* right channel */
right_step = (right_step > 0xF) ? 0xF : right_step;
reg = twl6040_read_reg_cache(codec, TWL6040_REG_HSGAIN);
val = (~reg & TWL6040_HSR_VOL_MASK) >> TWL6040_HSR_VOL_SHIFT;
if (headset->ramp == TWL6040_RAMP_UP) {
/* ramp step up */
if (val < headset->right_vol) {
val += right_step;
reg &= ~TWL6040_HSR_VOL_MASK;
twl6040_write(codec, TWL6040_REG_HSGAIN,
(reg | (~val << TWL6040_HSR_VOL_SHIFT)));
} else {
right_complete = 1;
}
} else if (headset->ramp == TWL6040_RAMP_DOWN) {
/* ramp step down */
if (val > 0x0) {
val -= right_step;
reg &= ~TWL6040_HSR_VOL_MASK;
twl6040_write(codec, TWL6040_REG_HSGAIN,
reg | (~val << TWL6040_HSR_VOL_SHIFT));
} else {
right_complete = 1;
}
}
return left_complete & right_complete;
}
/*
* Ramp HF PGA volume to minimise pops at stream startup and shutdown.
*/
static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
unsigned int left_step, unsigned int right_step)
{
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
struct twl6040_output *handsfree = &priv->handsfree;
int left_complete = 0, right_complete = 0;
u16 reg, val;
/* left channel */
left_step = (left_step > 0x1D) ? 0x1D : left_step;
reg = twl6040_read_reg_cache(codec, TWL6040_REG_HFLGAIN);
reg = 0x1D - reg;
val = (reg & TWL6040_HF_VOL_MASK);
if (handsfree->ramp == TWL6040_RAMP_UP) {
/* ramp step up */
if (val < handsfree->left_vol) {
val += left_step;
reg &= ~TWL6040_HF_VOL_MASK;
twl6040_write(codec, TWL6040_REG_HFLGAIN,
reg | (0x1D - val));
} else {
left_complete = 1;
}
} else if (handsfree->ramp == TWL6040_RAMP_DOWN) {
/* ramp step down */
if (val > 0) {
val -= left_step;
reg &= ~TWL6040_HF_VOL_MASK;
twl6040_write(codec, TWL6040_REG_HFLGAIN,
reg | (0x1D - val));
} else {
left_complete = 1;
}
}
/* right channel */
right_step = (right_step > 0x1D) ? 0x1D : right_step;
reg = twl6040_read_reg_cache(codec, TWL6040_REG_HFRGAIN);
reg = 0x1D - reg;
val = (reg & TWL6040_HF_VOL_MASK);
if (handsfree->ramp == TWL6040_RAMP_UP) {
/* ramp step up */
if (val < handsfree->right_vol) {
val += right_step;
reg &= ~TWL6040_HF_VOL_MASK;
twl6040_write(codec, TWL6040_REG_HFRGAIN,
reg | (0x1D - val));
} else {
right_complete = 1;
}
} else if (handsfree->ramp == TWL6040_RAMP_DOWN) {
/* ramp step down */
if (val > 0) {
val -= right_step;
reg &= ~TWL6040_HF_VOL_MASK;
twl6040_write(codec, TWL6040_REG_HFRGAIN,
reg | (0x1D - val));
}
}
return left_complete & right_complete;
}
/*
* This work ramps both output PGAs at stream start/stop time to
* minimise pop associated with DAPM power switching.
*/
static void twl6040_pga_hs_work(struct work_struct *work)
{
struct twl6040_data *priv =
container_of(work, struct twl6040_data, hs_delayed_work.work);
struct snd_soc_codec *codec = priv->codec;
struct twl6040_output *headset = &priv->headset;
unsigned int delay = headset->step_delay;
int i, headset_complete;
/* do we need to ramp at all ? */
if (headset->ramp == TWL6040_RAMP_NONE)
return;
/* HS PGA volumes have 4 bits of resolution to ramp */
for (i = 0; i <= 16; i++) {
headset_complete = 1;
if (headset->ramp != TWL6040_RAMP_NONE)
headset_complete = twl6040_hs_ramp_step(codec,
headset->left_step,
headset->right_step);
/* ramp finished ? */
if (headset_complete)
break;
/*
* TODO: tune: delay is longer over 0dB
* as increases are larger.
*/
if (i >= 8)
schedule_timeout_interruptible(msecs_to_jiffies(delay +
(delay >> 1)));
else
schedule_timeout_interruptible(msecs_to_jiffies(delay));
}
if (headset->ramp == TWL6040_RAMP_DOWN) {
headset->active = 0;
complete(&headset->ramp_done);
} else {
headset->active = 1;
}
headset->ramp = TWL6040_RAMP_NONE;
}
static void twl6040_pga_hf_work(struct work_struct *work)
{
struct twl6040_data *priv =
container_of(work, struct twl6040_data, hf_delayed_work.work);
struct snd_soc_codec *codec = priv->codec;
struct twl6040_output *handsfree = &priv->handsfree;
unsigned int delay = handsfree->step_delay;
int i, handsfree_complete;
/* do we need to ramp at all ? */
if (handsfree->ramp == TWL6040_RAMP_NONE)
return;
/* HF PGA volumes have 5 bits of resolution to ramp */
for (i = 0; i <= 32; i++) {
handsfree_complete = 1;
if (handsfree->ramp != TWL6040_RAMP_NONE)
handsfree_complete = twl6040_hf_ramp_step(codec,
handsfree->left_step,
handsfree->right_step);
/* ramp finished ? */
if (handsfree_complete)
break;
/*
* TODO: tune: delay is longer over 0dB
* as increases are larger.
*/
if (i >= 16)
schedule_timeout_interruptible(msecs_to_jiffies(delay +
(delay >> 1)));
else
schedule_timeout_interruptible(msecs_to_jiffies(delay));
}
if (handsfree->ramp == TWL6040_RAMP_DOWN) {
handsfree->active = 0;
complete(&handsfree->ramp_done);
} else
handsfree->active = 1;
handsfree->ramp = TWL6040_RAMP_NONE;
}
static int pga_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
struct snd_soc_codec *codec = w->codec;
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
struct twl6040_output *out;
struct delayed_work *work;
struct workqueue_struct *queue;
switch (w->shift) {
case 2:
case 3:
out = &priv->headset;
work = &priv->hs_delayed_work;
queue = priv->hs_workqueue;
out->step_delay = 5; /* 5 ms between volume ramp steps */
break;
case 4:
out = &priv->handsfree;
work = &priv->hf_delayed_work;
queue = priv->hf_workqueue;
out->step_delay = 5; /* 5 ms between volume ramp steps */
if (SND_SOC_DAPM_EVENT_ON(event))
priv->non_lp++;
else
priv->non_lp--;
break;
default:
return -1;
}
switch (event) {
case SND_SOC_DAPM_POST_PMU:
if (out->active)
break;
/* don't use volume ramp for power-up */
out->left_step = out->left_vol;
out->right_step = out->right_vol;
if (!delayed_work_pending(work)) {
out->ramp = TWL6040_RAMP_UP;
queue_delayed_work(queue, work,
msecs_to_jiffies(1));
}
break;
case SND_SOC_DAPM_PRE_PMD:
if (!out->active)
break;
if (!delayed_work_pending(work)) {
/* use volume ramp for power-down */
out->left_step = 1;
out->right_step = 1;
out->ramp = TWL6040_RAMP_DOWN;
INIT_COMPLETION(out->ramp_done);
queue_delayed_work(queue, work,
msecs_to_jiffies(1));
wait_for_completion_timeout(&out->ramp_done,
msecs_to_jiffies(2000));
}
break;
}
return 0;
}
/* twl6040 codec manual power-up sequence */ /* twl6040 codec manual power-up sequence */
static void twl6040_power_up(struct snd_soc_codec *codec) static void twl6040_power_up(struct snd_soc_codec *codec)
{ {
...@@ -381,6 +724,47 @@ static int twl6040_power_mode_event(struct snd_soc_dapm_widget *w, ...@@ -381,6 +724,47 @@ static int twl6040_power_mode_event(struct snd_soc_dapm_widget *w,
return 0; return 0;
} }
void twl6040_hs_jack_report(struct snd_soc_codec *codec,
struct snd_soc_jack *jack, int report)
{
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
int status;
mutex_lock(&priv->mutex);
/* Sync status */
status = twl6040_read_reg_volatile(codec, TWL6040_REG_STATUS);
if (status & TWL6040_PLUGCOMP)
snd_soc_jack_report(jack, report, report);
else
snd_soc_jack_report(jack, 0, report);
mutex_unlock(&priv->mutex);
}
void twl6040_hs_jack_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *jack, int report)
{
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
struct twl6040_jack_data *hs_jack = &priv->hs_jack;
hs_jack->jack = jack;
hs_jack->report = report;
twl6040_hs_jack_report(codec, hs_jack->jack, hs_jack->report);
}
EXPORT_SYMBOL_GPL(twl6040_hs_jack_detect);
static void twl6040_accessory_work(struct work_struct *work)
{
struct twl6040_data *priv = container_of(work,
struct twl6040_data, delayed_work.work);
struct snd_soc_codec *codec = priv->codec;
struct twl6040_jack_data *hs_jack = &priv->hs_jack;
twl6040_hs_jack_report(codec, hs_jack->jack, hs_jack->report);
}
/* audio interrupt handler */ /* audio interrupt handler */
static irqreturn_t twl6040_naudint_handler(int irq, void *data) static irqreturn_t twl6040_naudint_handler(int irq, void *data)
{ {
...@@ -388,33 +772,180 @@ static irqreturn_t twl6040_naudint_handler(int irq, void *data) ...@@ -388,33 +772,180 @@ static irqreturn_t twl6040_naudint_handler(int irq, void *data)
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
u8 intid; u8 intid;
twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &intid, TWL6040_REG_INTID); twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &intid, TWL6040_REG_INTID);
switch (intid) { if (intid & TWL6040_THINT)
case TWL6040_THINT:
dev_alert(codec->dev, "die temp over-limit detection\n"); dev_alert(codec->dev, "die temp over-limit detection\n");
if ((intid & TWL6040_PLUGINT) || (intid & TWL6040_UNPLUGINT))
queue_delayed_work(priv->workqueue, &priv->delayed_work,
msecs_to_jiffies(200));
if (intid & TWL6040_HOOKINT)
dev_info(codec->dev, "hook detection\n");
if (intid & TWL6040_HFINT)
dev_alert(codec->dev, "hf drivers over current detection\n");
if (intid & TWL6040_VIBINT)
dev_alert(codec->dev, "vib drivers over current detection\n");
if (intid & TWL6040_READYINT)
complete(&priv->ready);
return IRQ_HANDLED;
}
static int twl6040_put_volsw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct twl6040_data *twl6040_priv = snd_soc_codec_get_drvdata(codec);
struct twl6040_output *out = NULL;
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
int ret;
unsigned int reg = mc->reg;
/* For HS and HF we shadow the values and only actually write
* them out when active in order to ensure the amplifier comes on
* as quietly as possible. */
switch (reg) {
case TWL6040_REG_HSGAIN:
out = &twl6040_priv->headset;
break; break;
case TWL6040_PLUGINT: default:
case TWL6040_UNPLUGINT:
case TWL6040_HOOKINT:
break; break;
case TWL6040_HFINT: }
dev_alert(codec->dev, "hf drivers over current detection\n");
if (out) {
out->left_vol = ucontrol->value.integer.value[0];
out->right_vol = ucontrol->value.integer.value[1];
if (!out->active)
return 1;
}
ret = snd_soc_put_volsw(kcontrol, ucontrol);
if (ret < 0)
return ret;
return 1;
}
static int twl6040_get_volsw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct twl6040_data *twl6040_priv = snd_soc_codec_get_drvdata(codec);
struct twl6040_output *out = &twl6040_priv->headset;
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
unsigned int reg = mc->reg;
switch (reg) {
case TWL6040_REG_HSGAIN:
out = &twl6040_priv->headset;
ucontrol->value.integer.value[0] = out->left_vol;
ucontrol->value.integer.value[1] = out->right_vol;
return 0;
default:
break; break;
case TWL6040_VIBINT: }
dev_alert(codec->dev, "vib drivers over current detection\n");
return snd_soc_get_volsw(kcontrol, ucontrol);
}
static int twl6040_put_volsw_2r_vu(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct twl6040_data *twl6040_priv = snd_soc_codec_get_drvdata(codec);
struct twl6040_output *out = NULL;
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
int ret;
unsigned int reg = mc->reg;
/* For HS and HF we shadow the values and only actually write
* them out when active in order to ensure the amplifier comes on
* as quietly as possible. */
switch (reg) {
case TWL6040_REG_HFLGAIN:
case TWL6040_REG_HFRGAIN:
out = &twl6040_priv->handsfree;
break; break;
case TWL6040_READYINT: default:
complete(&priv->ready);
break; break;
}
if (out) {
out->left_vol = ucontrol->value.integer.value[0];
out->right_vol = ucontrol->value.integer.value[1];
if (!out->active)
return 1;
}
ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
if (ret < 0)
return ret;
return 1;
}
static int twl6040_get_volsw_2r(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct twl6040_data *twl6040_priv = snd_soc_codec_get_drvdata(codec);
struct twl6040_output *out = &twl6040_priv->handsfree;
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
unsigned int reg = mc->reg;
/* If these are cached registers use the cache */
switch (reg) {
case TWL6040_REG_HFLGAIN:
case TWL6040_REG_HFRGAIN:
out = &twl6040_priv->handsfree;
ucontrol->value.integer.value[0] = out->left_vol;
ucontrol->value.integer.value[1] = out->right_vol;
return 0;
default: default:
dev_err(codec->dev, "unknown audio interrupt %d\n", intid);
break; break;
} }
return IRQ_HANDLED; return snd_soc_get_volsw_2r(kcontrol, ucontrol);
} }
/* double control with volume update */
#define SOC_TWL6040_DOUBLE_TLV(xname, xreg, shift_left, shift_right, xmax,\
xinvert, tlv_array)\
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
SNDRV_CTL_ELEM_ACCESS_READWRITE,\
.tlv.p = (tlv_array), \
.info = snd_soc_info_volsw, .get = twl6040_get_volsw, \
.put = twl6040_put_volsw, \
.private_value = (unsigned long)&(struct soc_mixer_control) \
{.reg = xreg, .shift = shift_left, .rshift = shift_right,\
.max = xmax, .platform_max = xmax, .invert = xinvert} }
/* double control with volume update */
#define SOC_TWL6040_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax,\
xinvert, tlv_array)\
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
SNDRV_CTL_ELEM_ACCESS_READWRITE | \
SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
.tlv.p = (tlv_array), \
.info = snd_soc_info_volsw_2r, \
.get = twl6040_get_volsw_2r, .put = twl6040_put_volsw_2r_vu, \
.private_value = (unsigned long)&(struct soc_mixer_control) \
{.reg = reg_left, .rreg = reg_right, .shift = xshift, \
.rshift = xshift, .max = xmax, .invert = xinvert}, }
/* /*
* MICATT volume control: * MICATT volume control:
* from -6 to 0 dB in 6 dB steps * from -6 to 0 dB in 6 dB steps
...@@ -423,9 +954,15 @@ static DECLARE_TLV_DB_SCALE(mic_preamp_tlv, -600, 600, 0); ...@@ -423,9 +954,15 @@ static DECLARE_TLV_DB_SCALE(mic_preamp_tlv, -600, 600, 0);
/* /*
* MICGAIN volume control: * MICGAIN volume control:
* from 6 to 30 dB in 6 dB steps * from -6 to 30 dB in 6 dB steps
*/
static DECLARE_TLV_DB_SCALE(mic_amp_tlv, -600, 600, 0);
/*
* AFMGAIN volume control:
* from 18 to 24 dB in 6 dB steps
*/ */
static DECLARE_TLV_DB_SCALE(mic_amp_tlv, 600, 600, 0); static DECLARE_TLV_DB_SCALE(afm_amp_tlv, 1800, 600, 0);
/* /*
* HSGAIN volume control: * HSGAIN volume control:
...@@ -454,8 +991,30 @@ static const char *twl6040_amicr_texts[] = ...@@ -454,8 +991,30 @@ static const char *twl6040_amicr_texts[] =
{"Headset Mic", "Sub Mic", "Aux/FM Right", "Off"}; {"Headset Mic", "Sub Mic", "Aux/FM Right", "Off"};
static const struct soc_enum twl6040_enum[] = { static const struct soc_enum twl6040_enum[] = {
SOC_ENUM_SINGLE(TWL6040_REG_MICLCTL, 3, 3, twl6040_amicl_texts), SOC_ENUM_SINGLE(TWL6040_REG_MICLCTL, 3, 4, twl6040_amicl_texts),
SOC_ENUM_SINGLE(TWL6040_REG_MICRCTL, 3, 3, twl6040_amicr_texts), SOC_ENUM_SINGLE(TWL6040_REG_MICRCTL, 3, 4, twl6040_amicr_texts),
};
static const char *twl6040_hs_texts[] = {
"Off", "HS DAC", "Line-In amp"
};
static const struct soc_enum twl6040_hs_enum[] = {
SOC_ENUM_SINGLE(TWL6040_REG_HSLCTL, 5, ARRAY_SIZE(twl6040_hs_texts),
twl6040_hs_texts),
SOC_ENUM_SINGLE(TWL6040_REG_HSRCTL, 5, ARRAY_SIZE(twl6040_hs_texts),
twl6040_hs_texts),
};
static const char *twl6040_hf_texts[] = {
"Off", "HF DAC", "Line-In amp"
};
static const struct soc_enum twl6040_hf_enum[] = {
SOC_ENUM_SINGLE(TWL6040_REG_HFLCTL, 2, ARRAY_SIZE(twl6040_hf_texts),
twl6040_hf_texts),
SOC_ENUM_SINGLE(TWL6040_REG_HFRCTL, 2, ARRAY_SIZE(twl6040_hf_texts),
twl6040_hf_texts),
}; };
static const struct snd_kcontrol_new amicl_control = static const struct snd_kcontrol_new amicl_control =
...@@ -465,18 +1024,18 @@ static const struct snd_kcontrol_new amicr_control = ...@@ -465,18 +1024,18 @@ static const struct snd_kcontrol_new amicr_control =
SOC_DAPM_ENUM("Route", twl6040_enum[1]); SOC_DAPM_ENUM("Route", twl6040_enum[1]);
/* Headset DAC playback switches */ /* Headset DAC playback switches */
static const struct snd_kcontrol_new hsdacl_switch_controls = static const struct snd_kcontrol_new hsl_mux_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HSLCTL, 5, 1, 0); SOC_DAPM_ENUM("Route", twl6040_hs_enum[0]);
static const struct snd_kcontrol_new hsdacr_switch_controls = static const struct snd_kcontrol_new hsr_mux_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HSRCTL, 5, 1, 0); SOC_DAPM_ENUM("Route", twl6040_hs_enum[1]);
/* Handsfree DAC playback switches */ /* Handsfree DAC playback switches */
static const struct snd_kcontrol_new hfdacl_switch_controls = static const struct snd_kcontrol_new hfl_mux_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFLCTL, 2, 1, 0); SOC_DAPM_ENUM("Route", twl6040_hf_enum[0]);
static const struct snd_kcontrol_new hfdacr_switch_controls = static const struct snd_kcontrol_new hfr_mux_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFRCTL, 2, 1, 0); SOC_DAPM_ENUM("Route", twl6040_hf_enum[1]);
static const struct snd_kcontrol_new ep_driver_switch_controls = static const struct snd_kcontrol_new ep_driver_switch_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_EARCTL, 0, 1, 0); SOC_DAPM_SINGLE("Switch", TWL6040_REG_EARCTL, 0, 1, 0);
...@@ -488,10 +1047,14 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = { ...@@ -488,10 +1047,14 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = {
SOC_DOUBLE_TLV("Capture Volume", SOC_DOUBLE_TLV("Capture Volume",
TWL6040_REG_MICGAIN, 0, 3, 4, 0, mic_amp_tlv), TWL6040_REG_MICGAIN, 0, 3, 4, 0, mic_amp_tlv),
/* AFM gains */
SOC_DOUBLE_TLV("Aux FM Volume",
TWL6040_REG_LINEGAIN, 0, 4, 0xF, 0, afm_amp_tlv),
/* Playback gains */ /* Playback gains */
SOC_DOUBLE_TLV("Headset Playback Volume", SOC_TWL6040_DOUBLE_TLV("Headset Playback Volume",
TWL6040_REG_HSGAIN, 0, 4, 0xF, 1, hs_tlv), TWL6040_REG_HSGAIN, 0, 4, 0xF, 1, hs_tlv),
SOC_DOUBLE_R_TLV("Handsfree Playback Volume", SOC_TWL6040_DOUBLE_R_TLV("Handsfree Playback Volume",
TWL6040_REG_HFLGAIN, TWL6040_REG_HFRGAIN, 0, 0x1D, 1, hf_tlv), TWL6040_REG_HFLGAIN, TWL6040_REG_HFRGAIN, 0, 0x1D, 1, hf_tlv),
SOC_SINGLE_TLV("Earphone Playback Volume", SOC_SINGLE_TLV("Earphone Playback Volume",
TWL6040_REG_EARCTL, 1, 0xF, 1, ep_tlv), TWL6040_REG_EARCTL, 1, 0xF, 1, ep_tlv),
...@@ -524,6 +1087,12 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { ...@@ -524,6 +1087,12 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
SND_SOC_DAPM_PGA("MicAmpR", SND_SOC_DAPM_PGA("MicAmpR",
TWL6040_REG_MICRCTL, 0, 0, NULL, 0), TWL6040_REG_MICRCTL, 0, 0, NULL, 0),
/* Auxiliary FM PGAs */
SND_SOC_DAPM_PGA("AFMAmpL",
TWL6040_REG_MICLCTL, 1, 0, NULL, 0),
SND_SOC_DAPM_PGA("AFMAmpR",
TWL6040_REG_MICRCTL, 1, 0, NULL, 0),
/* ADCs */ /* ADCs */
SND_SOC_DAPM_ADC("ADC Left", "Left Front Capture", SND_SOC_DAPM_ADC("ADC Left", "Left Front Capture",
TWL6040_REG_MICLCTL, 2, 0), TWL6040_REG_MICLCTL, 2, 0),
...@@ -558,29 +1127,33 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { ...@@ -558,29 +1127,33 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
twl6040_power_mode_event, twl6040_power_mode_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
/* Analog playback switches */ SND_SOC_DAPM_MUX("HF Left Playback",
SND_SOC_DAPM_SWITCH("HSDAC Left Playback", SND_SOC_NOPM, 0, 0, &hfl_mux_controls),
SND_SOC_NOPM, 0, 0, &hsdacl_switch_controls), SND_SOC_DAPM_MUX("HF Right Playback",
SND_SOC_DAPM_SWITCH("HSDAC Right Playback", SND_SOC_NOPM, 0, 0, &hfr_mux_controls),
SND_SOC_NOPM, 0, 0, &hsdacr_switch_controls), /* Analog playback Muxes */
SND_SOC_DAPM_SWITCH("HFDAC Left Playback", SND_SOC_DAPM_MUX("HS Left Playback",
SND_SOC_NOPM, 0, 0, &hfdacl_switch_controls), SND_SOC_NOPM, 0, 0, &hsl_mux_controls),
SND_SOC_DAPM_SWITCH("HFDAC Right Playback", SND_SOC_DAPM_MUX("HS Right Playback",
SND_SOC_NOPM, 0, 0, &hfdacr_switch_controls), SND_SOC_NOPM, 0, 0, &hsr_mux_controls),
/* Analog playback drivers */ /* Analog playback drivers */
SND_SOC_DAPM_PGA_E("Handsfree Left Driver", SND_SOC_DAPM_PGA_E("Handsfree Left Driver",
TWL6040_REG_HFLCTL, 4, 0, NULL, 0, TWL6040_REG_HFLCTL, 4, 0, NULL, 0,
twl6040_power_mode_event, pga_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_PGA_E("Handsfree Right Driver", SND_SOC_DAPM_PGA_E("Handsfree Right Driver",
TWL6040_REG_HFRCTL, 4, 0, NULL, 0, TWL6040_REG_HFRCTL, 4, 0, NULL, 0,
twl6040_power_mode_event, pga_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_PGA("Headset Left Driver", SND_SOC_DAPM_PGA_E("Headset Left Driver",
TWL6040_REG_HSLCTL, 2, 0, NULL, 0), TWL6040_REG_HSLCTL, 2, 0, NULL, 0,
SND_SOC_DAPM_PGA("Headset Right Driver", pga_event,
TWL6040_REG_HSRCTL, 2, 0, NULL, 0), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_PGA_E("Headset Right Driver",
TWL6040_REG_HSRCTL, 2, 0, NULL, 0,
pga_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_SWITCH_E("Earphone Driver", SND_SOC_DAPM_SWITCH_E("Earphone Driver",
SND_SOC_NOPM, 0, 0, &ep_driver_switch_controls, SND_SOC_NOPM, 0, 0, &ep_driver_switch_controls,
twl6040_power_mode_event, twl6040_power_mode_event,
...@@ -610,12 +1183,18 @@ static const struct snd_soc_dapm_route intercon[] = { ...@@ -610,12 +1183,18 @@ static const struct snd_soc_dapm_route intercon[] = {
{"ADC Left", NULL, "MicAmpL"}, {"ADC Left", NULL, "MicAmpL"},
{"ADC Right", NULL, "MicAmpR"}, {"ADC Right", NULL, "MicAmpR"},
/* Headset playback path */ /* AFM path */
{"HSDAC Left Playback", "Switch", "HSDAC Left"}, {"AFMAmpL", "NULL", "AFML"},
{"HSDAC Right Playback", "Switch", "HSDAC Right"}, {"AFMAmpR", "NULL", "AFMR"},
{"HS Left Playback", "HS DAC", "HSDAC Left"},
{"HS Left Playback", "Line-In amp", "AFMAmpL"},
{"Headset Left Driver", NULL, "HSDAC Left Playback"}, {"HS Right Playback", "HS DAC", "HSDAC Right"},
{"Headset Right Driver", NULL, "HSDAC Right Playback"}, {"HS Right Playback", "Line-In amp", "AFMAmpR"},
{"Headset Left Driver", "NULL", "HS Left Playback"},
{"Headset Right Driver", "NULL", "HS Right Playback"},
{"HSOL", NULL, "Headset Left Driver"}, {"HSOL", NULL, "Headset Left Driver"},
{"HSOR", NULL, "Headset Right Driver"}, {"HSOR", NULL, "Headset Right Driver"},
...@@ -624,12 +1203,14 @@ static const struct snd_soc_dapm_route intercon[] = { ...@@ -624,12 +1203,14 @@ static const struct snd_soc_dapm_route intercon[] = {
{"Earphone Driver", "Switch", "HSDAC Left"}, {"Earphone Driver", "Switch", "HSDAC Left"},
{"EP", NULL, "Earphone Driver"}, {"EP", NULL, "Earphone Driver"},
/* Handsfree playback path */ {"HF Left Playback", "HF DAC", "HFDAC Left"},
{"HFDAC Left Playback", "Switch", "HFDAC Left"}, {"HF Left Playback", "Line-In amp", "AFMAmpL"},
{"HFDAC Right Playback", "Switch", "HFDAC Right"},
{"HF Right Playback", "HF DAC", "HFDAC Right"},
{"HF Right Playback", "Line-In amp", "AFMAmpR"},
{"HFDAC Left PGA", NULL, "HFDAC Left Playback"}, {"HFDAC Left PGA", NULL, "HF Left Playback"},
{"HFDAC Right PGA", NULL, "HFDAC Right Playback"}, {"HFDAC Right PGA", NULL, "HF Right Playback"},
{"Handsfree Left Driver", "Switch", "HFDAC Left PGA"}, {"Handsfree Left Driver", "Switch", "HFDAC Left PGA"},
{"Handsfree Right Driver", "Switch", "HFDAC Right PGA"}, {"Handsfree Right Driver", "Switch", "HFDAC Right PGA"},
...@@ -658,10 +1239,10 @@ static int twl6040_power_up_completion(struct snd_soc_codec *codec, ...@@ -658,10 +1239,10 @@ static int twl6040_power_up_completion(struct snd_soc_codec *codec,
u8 intid; u8 intid;
time_left = wait_for_completion_timeout(&priv->ready, time_left = wait_for_completion_timeout(&priv->ready,
msecs_to_jiffies(48)); msecs_to_jiffies(144));
if (!time_left) { if (!time_left) {
twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &intid, twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &intid,
TWL6040_REG_INTID); TWL6040_REG_INTID);
if (!(intid & TWL6040_READYINT)) { if (!(intid & TWL6040_READYINT)) {
dev_err(codec->dev, "timeout waiting for READYINT\n"); dev_err(codec->dev, "timeout waiting for READYINT\n");
...@@ -712,6 +1293,15 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec, ...@@ -712,6 +1293,15 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec,
/* initialize vdd/vss registers with reg_cache */ /* initialize vdd/vss registers with reg_cache */
twl6040_init_vdd_regs(codec); twl6040_init_vdd_regs(codec);
/* Set external boost GPO */
twl6040_write(codec, TWL6040_REG_GPOCTL, 0x02);
/* Set initial minimal gain values */
twl6040_write(codec, TWL6040_REG_HSGAIN, 0xFF);
twl6040_write(codec, TWL6040_REG_EARCTL, 0x1E);
twl6040_write(codec, TWL6040_REG_HFLGAIN, 0x1D);
twl6040_write(codec, TWL6040_REG_HFRGAIN, 0x1D);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
if (!priv->codec_powered) if (!priv->codec_powered)
...@@ -771,23 +1361,6 @@ static int twl6040_startup(struct snd_pcm_substream *substream, ...@@ -771,23 +1361,6 @@ static int twl6040_startup(struct snd_pcm_substream *substream,
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_codec *codec = rtd->codec;
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
if (!priv->sysclk) {
dev_err(codec->dev,
"no mclk configured, call set_sysclk() on init\n");
return -EINVAL;
}
/*
* capture is not supported at 17.64 MHz,
* it's reserved for headset low-power playback scenario
*/
if ((priv->sysclk == 17640000) && substream->stream) {
dev_err(codec->dev,
"capture mode is not supported at %dHz\n",
priv->sysclk);
return -EINVAL;
}
snd_pcm_hw_constraint_list(substream->runtime, 0, snd_pcm_hw_constraint_list(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_RATE, SNDRV_PCM_HW_PARAM_RATE,
priv->sysclk_constraints); priv->sysclk_constraints);
...@@ -813,10 +1386,17 @@ static int twl6040_hw_params(struct snd_pcm_substream *substream, ...@@ -813,10 +1386,17 @@ static int twl6040_hw_params(struct snd_pcm_substream *substream,
rate = params_rate(params); rate = params_rate(params);
switch (rate) { switch (rate) {
case 11250:
case 22500:
case 44100:
case 88200: case 88200:
lppllctl |= TWL6040_LPLLFIN; lppllctl |= TWL6040_LPLLFIN;
priv->sysclk = 17640000; priv->sysclk = 17640000;
break; break;
case 8000:
case 16000:
case 32000:
case 48000:
case 96000: case 96000:
lppllctl &= ~TWL6040_LPLLFIN; lppllctl &= ~TWL6040_LPLLFIN;
priv->sysclk = 19200000; priv->sysclk = 19200000;
...@@ -831,31 +1411,37 @@ static int twl6040_hw_params(struct snd_pcm_substream *substream, ...@@ -831,31 +1411,37 @@ static int twl6040_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int twl6040_trigger(struct snd_pcm_substream *substream, static int twl6040_prepare(struct snd_pcm_substream *substream,
int cmd, struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_codec *codec = rtd->codec;
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
switch (cmd) { if (!priv->sysclk) {
case SNDRV_PCM_TRIGGER_START: dev_err(codec->dev,
case SNDRV_PCM_TRIGGER_RESUME: "no mclk configured, call set_sysclk() on init\n");
/* return -EINVAL;
* low-power playback mode is restricted }
* for headset path only
*/ /*
if ((priv->sysclk == 17640000) && priv->non_lp) { * capture is not supported at 17.64 MHz,
* it's reserved for headset low-power playback scenario
*/
if ((priv->sysclk == 17640000) &&
substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
dev_err(codec->dev,
"capture mode is not supported at %dHz\n",
priv->sysclk);
return -EINVAL;
}
if ((priv->sysclk == 17640000) && priv->non_lp) {
dev_err(codec->dev, dev_err(codec->dev,
"some enabled paths aren't supported at %dHz\n", "some enabled paths aren't supported at %dHz\n",
priv->sysclk); priv->sysclk);
return -EPERM; return -EPERM;
}
break;
default:
break;
} }
return 0; return 0;
} }
...@@ -969,7 +1555,7 @@ static int twl6040_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -969,7 +1555,7 @@ static int twl6040_set_dai_sysclk(struct snd_soc_dai *codec_dai,
static struct snd_soc_dai_ops twl6040_dai_ops = { static struct snd_soc_dai_ops twl6040_dai_ops = {
.startup = twl6040_startup, .startup = twl6040_startup,
.hw_params = twl6040_hw_params, .hw_params = twl6040_hw_params,
.trigger = twl6040_trigger, .prepare = twl6040_prepare,
.set_sysclk = twl6040_set_dai_sysclk, .set_sysclk = twl6040_set_dai_sysclk,
}; };
...@@ -1003,6 +1589,7 @@ static int twl6040_suspend(struct snd_soc_codec *codec, pm_message_t state) ...@@ -1003,6 +1589,7 @@ static int twl6040_suspend(struct snd_soc_codec *codec, pm_message_t state)
static int twl6040_resume(struct snd_soc_codec *codec) static int twl6040_resume(struct snd_soc_codec *codec)
{ {
twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY); twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
twl6040_set_bias_level(codec, codec->dapm.suspend_bias_level);
return 0; return 0;
} }
...@@ -1017,24 +1604,41 @@ static int twl6040_probe(struct snd_soc_codec *codec) ...@@ -1017,24 +1604,41 @@ static int twl6040_probe(struct snd_soc_codec *codec)
struct twl6040_data *priv; struct twl6040_data *priv;
int audpwron, naudint; int audpwron, naudint;
int ret = 0; int ret = 0;
u8 icrev, intmr = TWL6040_ALLINT_MSK;
priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL); priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
return -ENOMEM; return -ENOMEM;
snd_soc_codec_set_drvdata(codec, priv); snd_soc_codec_set_drvdata(codec, priv);
if (twl_codec) { priv->codec = codec;
twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &icrev, TWL6040_REG_ASICREV);
if (twl_codec && (icrev > 0))
audpwron = twl_codec->audpwron_gpio; audpwron = twl_codec->audpwron_gpio;
naudint = twl_codec->naudint_irq; else
} else {
audpwron = -EINVAL; audpwron = -EINVAL;
if (twl_codec)
naudint = twl_codec->naudint_irq;
else
naudint = 0; naudint = 0;
}
priv->audpwron = audpwron; priv->audpwron = audpwron;
priv->naudint = naudint; priv->naudint = naudint;
priv->workqueue = create_singlethread_workqueue("twl6040-codec");
if (!priv->workqueue)
goto work_err;
INIT_DELAYED_WORK(&priv->delayed_work, twl6040_accessory_work);
mutex_init(&priv->mutex);
init_completion(&priv->ready); init_completion(&priv->ready);
init_completion(&priv->headset.ramp_done);
init_completion(&priv->handsfree.ramp_done);
if (gpio_is_valid(audpwron)) { if (gpio_is_valid(audpwron)) {
ret = gpio_request(audpwron, "audpwron"); ret = gpio_request(audpwron, "audpwron");
...@@ -1046,7 +1650,14 @@ static int twl6040_probe(struct snd_soc_codec *codec) ...@@ -1046,7 +1650,14 @@ static int twl6040_probe(struct snd_soc_codec *codec)
goto gpio2_err; goto gpio2_err;
priv->codec_powered = 0; priv->codec_powered = 0;
/* enable only codec ready interrupt */
intmr &= ~(TWL6040_READYMSK | TWL6040_PLUGMSK);
/* reset interrupt status to allow correct power up sequence */
twl6040_read_reg_volatile(codec, TWL6040_REG_INTID);
} }
twl6040_write(codec, TWL6040_REG_INTMR, intmr);
if (naudint) { if (naudint) {
/* audio interrupt */ /* audio interrupt */
...@@ -1056,25 +1667,29 @@ static int twl6040_probe(struct snd_soc_codec *codec) ...@@ -1056,25 +1667,29 @@ static int twl6040_probe(struct snd_soc_codec *codec)
"twl6040_codec", codec); "twl6040_codec", codec);
if (ret) if (ret)
goto gpio2_err; goto gpio2_err;
} else {
if (gpio_is_valid(audpwron)) {
/* enable only codec ready interrupt */
twl6040_write_reg_cache(codec, TWL6040_REG_INTMR,
~TWL6040_READYMSK & TWL6040_ALLINT_MSK);
} else {
/* no interrupts at all */
twl6040_write_reg_cache(codec, TWL6040_REG_INTMR,
TWL6040_ALLINT_MSK);
}
} }
/* init vio registers */ /* init vio registers */
twl6040_init_vio_regs(codec); twl6040_init_vio_regs(codec);
priv->hf_workqueue = create_singlethread_workqueue("twl6040-hf");
if (priv->hf_workqueue == NULL) {
ret = -ENOMEM;
goto irq_err;
}
priv->hs_workqueue = create_singlethread_workqueue("twl6040-hs");
if (priv->hs_workqueue == NULL) {
ret = -ENOMEM;
goto wq_err;
}
INIT_DELAYED_WORK(&priv->hs_delayed_work, twl6040_pga_hs_work);
INIT_DELAYED_WORK(&priv->hf_delayed_work, twl6040_pga_hf_work);
/* power on device */ /* power on device */
ret = twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY); ret = twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
if (ret) if (ret)
goto irq_err; goto bias_err;
snd_soc_add_controls(codec, twl6040_snd_controls, snd_soc_add_controls(codec, twl6040_snd_controls,
ARRAY_SIZE(twl6040_snd_controls)); ARRAY_SIZE(twl6040_snd_controls));
...@@ -1082,6 +1697,10 @@ static int twl6040_probe(struct snd_soc_codec *codec) ...@@ -1082,6 +1697,10 @@ static int twl6040_probe(struct snd_soc_codec *codec)
return 0; return 0;
bias_err:
destroy_workqueue(priv->hs_workqueue);
wq_err:
destroy_workqueue(priv->hf_workqueue);
irq_err: irq_err:
if (naudint) if (naudint)
free_irq(naudint, codec); free_irq(naudint, codec);
...@@ -1089,6 +1708,8 @@ static int twl6040_probe(struct snd_soc_codec *codec) ...@@ -1089,6 +1708,8 @@ static int twl6040_probe(struct snd_soc_codec *codec)
if (gpio_is_valid(audpwron)) if (gpio_is_valid(audpwron))
gpio_free(audpwron); gpio_free(audpwron);
gpio1_err: gpio1_err:
destroy_workqueue(priv->workqueue);
work_err:
kfree(priv); kfree(priv);
return ret; return ret;
} }
...@@ -1107,6 +1728,9 @@ static int twl6040_remove(struct snd_soc_codec *codec) ...@@ -1107,6 +1728,9 @@ static int twl6040_remove(struct snd_soc_codec *codec)
if (naudint) if (naudint)
free_irq(naudint, codec); free_irq(naudint, codec);
destroy_workqueue(priv->workqueue);
destroy_workqueue(priv->hf_workqueue);
destroy_workqueue(priv->hs_workqueue);
kfree(priv); kfree(priv);
return 0; return 0;
......
sound/soc/codecs/twl6040.h
View file @ 991e02b4
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
/* INTMR (0x04) fields */ /* INTMR (0x04) fields */
#define TWL6040_PLUGMSK 0x02
#define TWL6040_READYMSK 0x40 #define TWL6040_READYMSK 0x40
#define TWL6040_ALLINT_MSK 0x7B #define TWL6040_ALLINT_MSK 0x7B
...@@ -135,4 +136,11 @@ ...@@ -135,4 +136,11 @@
#define TWL6040_HPPLL_ID 1 #define TWL6040_HPPLL_ID 1
#define TWL6040_LPPLL_ID 2 #define TWL6040_LPPLL_ID 2
/* STATUS (0x2E) fields */
#define TWL6040_PLUGCOMP 0x02
void twl6040_hs_jack_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *jack, int report);
#endif /* End of __TWL6040_H__ */ #endif /* End of __TWL6040_H__ */
sound/soc/omap/sdp4430.c
View file @ 991e02b4
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/jack.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/hardware.h> #include <plat/hardware.h>
...@@ -65,6 +66,21 @@ static struct snd_soc_ops sdp4430_ops = { ...@@ -65,6 +66,21 @@ static struct snd_soc_ops sdp4430_ops = {
.hw_params = sdp4430_hw_params, .hw_params = sdp4430_hw_params,
}; };
/* Headset jack */
static struct snd_soc_jack hs_jack;
/*Headset jack detection DAPM pins */
static struct snd_soc_jack_pin hs_jack_pins[] = {
{
.pin = "Headset Mic",
.mask = SND_JACK_MICROPHONE,
},
{
.pin = "Headset Stereophone",
.mask = SND_JACK_HEADPHONE,
},
};
static int sdp4430_get_power_mode(struct snd_kcontrol *kcontrol, static int sdp4430_get_power_mode(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
...@@ -101,6 +117,7 @@ static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = { ...@@ -101,6 +117,7 @@ static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = {
SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL),
SND_SOC_DAPM_HP("Headset Stereophone", NULL), SND_SOC_DAPM_HP("Headset Stereophone", NULL),
SND_SOC_DAPM_SPK("Earphone Spk", NULL), SND_SOC_DAPM_SPK("Earphone Spk", NULL),
SND_SOC_DAPM_INPUT("Aux/FM Stereo In"),
}; };
static const struct snd_soc_dapm_route audio_map[] = { static const struct snd_soc_dapm_route audio_map[] = {
...@@ -123,6 +140,10 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -123,6 +140,10 @@ static const struct snd_soc_dapm_route audio_map[] = {
/* Earphone speaker */ /* Earphone speaker */
{"Earphone Spk", NULL, "EP"}, {"Earphone Spk", NULL, "EP"},
/* Aux/FM Stereo In: AFML, AFMR */
{"AFML", NULL, "Aux/FM Stereo In"},
{"AFMR", NULL, "Aux/FM Stereo In"},
}; };
static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd) static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
...@@ -149,14 +170,28 @@ static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd) ...@@ -149,14 +170,28 @@ static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
/* SDP4430 connected pins */ /* SDP4430 connected pins */
snd_soc_dapm_enable_pin(dapm, "Ext Mic"); snd_soc_dapm_enable_pin(dapm, "Ext Mic");
snd_soc_dapm_enable_pin(dapm, "Ext Spk"); snd_soc_dapm_enable_pin(dapm, "Ext Spk");
snd_soc_dapm_enable_pin(dapm, "AFML");
snd_soc_dapm_enable_pin(dapm, "AFMR");
snd_soc_dapm_enable_pin(dapm, "Headset Mic"); snd_soc_dapm_enable_pin(dapm, "Headset Mic");
snd_soc_dapm_enable_pin(dapm, "Headset Stereophone"); snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
/* TWL6040 not connected pins */
snd_soc_dapm_nc_pin(dapm, "AFML");
snd_soc_dapm_nc_pin(dapm, "AFMR");
ret = snd_soc_dapm_sync(dapm); ret = snd_soc_dapm_sync(dapm);
if (ret)
return ret;
/* Headset jack detection */
ret = snd_soc_jack_new(codec, "Headset Jack",
SND_JACK_HEADSET, &hs_jack);
if (ret)
return ret;
ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),
hs_jack_pins);
if (machine_is_omap_4430sdp())
twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET);
else
snd_soc_jack_report(&hs_jack, SND_JACK_HEADSET, SND_JACK_HEADSET);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7