ASoC updates for 2.6.31
Subsystems (5)
The following changes since commit 9b5b0c01598f9782690b09ce6c49f4ba116dde44:
Mark Brown (1):
Merge branch 'for-2.6.30' into for-2.6.31
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31
Eric Miao (2):
ASoC: simplify the SSP DMA parameters settings by run-time generation
ASoC: change stereo/mono to 32-bit/16-bit for pxa-ssp
Joonyoung Shim (2):
ASoC: OMAP: Add checking to detect bufferless pcms
ASoC: TWL4030: Add VDL path support
Mark Brown (16):
ASoC: Factor out generic widget power checks
ASoC: Factor out DAPM power checks for DACs and ADCs
ASoC: Make the DAPM power check an operation on the widget
ASoC: Fix offset of freqmode in WM8580 PLL configuration
ASoC: Fix WM8580 volume update handling for large register changes
ASoC: Add power supply widget to DAPM
ASoC: Use DAPM supply widget for WM8903 charge pump
ASoC: Support CLK_DSP in WM8903
ASoC: Optimise configuration of WM8903 DC servo
ASoC: Actively manage the DC servo for WM8903
ASoC: Remove redundant rate constraint for WM8903
ASoC: Implement WM8903 digital sidetone support
Merge commit 'takashi/fix/asoc' into for-2.6.30
Merge branch 'for-2.6.30' into for-2.6.31
ASoC: s3c-i2s-v2 needs to declare a license for modular builds Merge branch 'for-2.6.30' into for-2.6.31
Peter Ujfalusi (2):
ASoC: OMAP: Add 4 channel support to mcbsp
ASoC: TWL4030: Add 4 channel TDM support
Russell King - ARM Linux (1):
ASoC: Fix warning in wm9705
Takashi Iwai (1):
ASoC: remove non-existing referece to CONFIG_SND_SOC_CODEC_WM8991
Documentation/sound/alsa/soc/dapm.txt | 1 + include/sound/soc-dapm.h | 9 +- sound/soc/codecs/Makefile | 1 - sound/soc/codecs/twl4030.c | 308 +++++++++++++++++++-------------- sound/soc/codecs/twl4030.h | 11 ++ sound/soc/codecs/wm8580.c | 16 +- sound/soc/codecs/wm8903.c | 118 ++++++++----- sound/soc/codecs/wm9705.c | 2 +- sound/soc/omap/omap-mcbsp.c | 5 +- sound/soc/omap/omap-pcm.c | 9 +- sound/soc/pxa/pxa-ssp.c | 203 +++++----------------- sound/soc/s3c24xx/s3c-i2s-v2.c | 3 +- sound/soc/soc-dapm.c | 139 +++++++++++----- 13 files changed, 438 insertions(+), 387 deletions(-)
PATCH 1/21 ASoC: Fix warning in wm9705
From: Russell King - ARM Linux <[email protected]>
I notice that the fixes were merged, minus one:
sound/soc/codecs/wm9705.c: At top level:sound/soc/codecs/wm9705.c:445: warning: initialization from incompatible pointer type
so you might find this trivial patch useful.
--- sound/soc/codecs/wm9705.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/codecs/wm9705.c +1 -1
@@ -318,7 +318,7 @@ static int wm9705_reset(struct snd_soc_codec *codec) }#ifdef CONFIG_PM -static int wm9705_soc_suspend (struct platform_device *pdev) +static int wm9705_soc_suspend (struct platform_device *pdev,pm_message_t msg) {struct snd_soc_device *socdev =platform_get_drvdata (pdev);struct snd_soc_codec *codec = socdev->card->codec;
Signature · 1 line
1.5.6.3
PATCH 2/21 ASoC: Factor out generic widget power checks
In reply to Mark BrownThis will form a basis for further power check refactoring: the overall goal of these changes is to allow us to check power separately to applying it, allowing improvements in the power sequencing algorithms.
--- sound/soc/soc-dapm.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
sound/soc/soc-dapm.c +14 -5
@@ -581,6 +581,19 @@ static int dapm_generic_apply_power(struct snd_soc_dapm_widget *w)return 0 ; } +/* Generic check to see if a widget should be powered. +*/ +static int dapm_generic_check_power (struct snd_soc_dapm_widget *w) +{ +int in, out; + + in =is_connected_input_ep (w); +dapm_clear_walk (w->codec); + out =is_connected_output_ep (w); +dapm_clear_walk (w->codec); +return out !=0 && in !=0 ; +} +/* * Scan a single DAPM widget for a complete audio path and update the * power status appropriately.
@@ -653,11 +666,7 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event, }/* all other widgets */ - in =is_connected_input_ep (w); -dapm_clear_walk (w->codec); - out =is_connected_output_ep (w); -dapm_clear_walk (w->codec); - power = (out !=0 && in !=0 ) ?1 :0 ; + power =dapm_generic_check_power (w); power_change = (w->power == power) ?0 :1 ; w->power = power;
Signature · 1 line
1.5.6.3
PATCH 3/21 ASoC: Factor out DAPM power checks for DACs and ADCs
In reply to Mark BrownThis also switches us to using a switch statement for the widget type in dapm_power_widget().
--- sound/soc/soc-dapm.c | 81 +++++++++++++++++++++++++++++-------------------- 1 files changed, 48 insertions(+), 33 deletions(-)
sound/soc/soc-dapm.c +48 -33
@@ -594,6 +594,34 @@ static int dapm_generic_check_power(struct snd_soc_dapm_widget *w)return out !=0 && in !=0 ; } +/* Check to see if an ADC has power */ +static int dapm_adc_check_power (struct snd_soc_dapm_widget *w) +{ +int in; + +if (w->active) { + in =is_connected_input_ep (w); +dapm_clear_walk (w->codec); +return in !=0 ; + }else { +return dapm_generic_check_power (w); + } +} + +/* Check to see if a DAC has power */ +static int dapm_dac_check_power (struct snd_soc_dapm_widget *w) +{ +int out; + +if (w->active) { + out =is_connected_output_ep (w); +dapm_clear_walk (w->codec); +return out !=0 ; + }else { +return dapm_generic_check_power (w); + } +} +/* * Scan a single DAPM widget for a complete audio path and update the * power status appropriately.
@@ -601,36 +629,23 @@ static int dapm_generic_check_power(struct snd_soc_dapm_widget *w)static int dapm_power_widget (struct snd_soc_codec *codec,int event,struct snd_soc_dapm_widget *w) { -int in, out, power_change, power, ret; +int power, ret; -/* vmid - no action */ -if (w->id == snd_soc_dapm_vmid) +/* Work out the new power state */ +switch (w->id) { +case snd_soc_dapm_vmid: +/* No action required */ return 0 ; -/* active ADC */ -if (w->id == snd_soc_dapm_adc && w->active) { - in =is_connected_input_ep (w); -dapm_clear_walk (w->codec); - power = (in !=0 ) ?1 :0 ; -if (power == w->power) -return 0 ; - w->power = power; -return dapm_generic_apply_power (w); - } +case snd_soc_dapm_adc: + power =dapm_adc_check_power (w); +break ; -/* active DAC */ -if (w->id == snd_soc_dapm_dac && w->active) { - out =is_connected_output_ep (w); -dapm_clear_walk (w->codec); - power = (out !=0 ) ?1 :0 ; -if (power == w->power) -return 0 ; - w->power = power; -return dapm_generic_apply_power (w); - } +case snd_soc_dapm_dac: + power =dapm_dac_check_power (w); +break ; -/* pre and post event widgets */ -if (w->id == snd_soc_dapm_pre) { +case snd_soc_dapm_pre:if (!w->event)return 0 ;
@@ -646,8 +661,8 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event,return ret; }return 0 ; - } -if (w->id == snd_soc_dapm_post) { + +case snd_soc_dapm_post:if (!w->event)return 0 ;
@@ -663,15 +678,15 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event,return ret; }return 0 ; - } -/* all other widgets */ - power =dapm_generic_check_power (w); - power_change = (w->power == power) ?0 :1 ; - w->power = power; +default : + power =dapm_generic_check_power (w); +break ; + } -if (!power_change) +if (w->power == power)return 0 ; + w->power = power;return dapm_generic_apply_power (w); }
Signature · 1 line
1.5.6.3
PATCH 4/21 ASoC: Make the DAPM power check an operation on the widget
In reply to Mark BrownRather than having switch statements at point of use make the DAPM power check a member of the widget structure and set it when we instantiate the widget.
--- include/sound/soc-dapm.h | 2 ++ sound/soc/soc-dapm.c | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-)
include/sound/soc-dapm.h +2 -0
@@ -367,6 +367,8 @@ struct snd_soc_dapm_widget { unsigned char suspend:1; /* was active before suspend */ unsigned char pmdown:1; /* waiting for timeout */ +int (*power_check)(struct snd_soc_dapm_widget *w); +/* external events */ unsigned short event_flags;/* flags to specify event types */ int (*event)(struct snd_soc_dapm_widget *,struct snd_kcontrol *,int );
sound/soc/soc-dapm.c +13 -14
@@ -631,20 +631,7 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event, {int power, ret; -/* Work out the new power state */ switch (w->id) { -case snd_soc_dapm_vmid: -/* No action required */ -return 0 ; - -case snd_soc_dapm_adc: - power =dapm_adc_check_power (w); -break ; - -case snd_soc_dapm_dac: - power =dapm_dac_check_power (w); -break ; -case snd_soc_dapm_pre:if (!w->event)return 0 ;
@@ -680,10 +667,13 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event,return 0 ;default : - power =dapm_generic_check_power (w);break ; } +if (!w->power_check) +return 0 ; + + power = w->power_check (w);if (w->power == power)return 0 ; w->power = power;
@@ -1147,15 +1137,22 @@ int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec)case snd_soc_dapm_switch:case snd_soc_dapm_mixer:case snd_soc_dapm_mixer_named_ctl: + w->power_check = dapm_generic_check_power;dapm_new_mixer (codec, w);break ;case snd_soc_dapm_mux:case snd_soc_dapm_value_mux: + w->power_check = dapm_generic_check_power;dapm_new_mux (codec, w);break ;case snd_soc_dapm_adc: + w->power_check = dapm_adc_check_power; +break ;case snd_soc_dapm_dac: + w->power_check = dapm_dac_check_power; +break ;case snd_soc_dapm_pga: + w->power_check = dapm_generic_check_power;dapm_new_pga (codec, w);break ;case snd_soc_dapm_input:
@@ -1165,6 +1162,8 @@ int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec)case snd_soc_dapm_hp:case snd_soc_dapm_mic:case snd_soc_dapm_line: + w->power_check = dapm_generic_check_power; +break ;case snd_soc_dapm_vmid:case snd_soc_dapm_pre:case snd_soc_dapm_post:
Signature · 1 line
1.5.6.3
PATCH 5/21 ASoC: Fix offset of freqmode in WM8580 PLL configuration
In reply to Mark Brown--- sound/soc/codecs/wm8580.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/codecs/wm8580.c +1 -1
@@ -522,7 +522,7 @@ static int wm8580_set_dai_pll(struct snd_soc_dai *codec_dai, reg =wm8580_read (codec,WM8580_PLLA4 + offset); reg &= ~0x3f ; reg |= pll_div.prescale | pll_div.postscale <<1 | - pll_div.freqmode <<4 ; + pll_div.freqmode <<3 ;wm8580_write (codec,WM8580_PLLA4 + offset, reg);
Signature · 1 line
1.5.6.3
PATCH 6/21 ASoC: Fix WM8580 volume update handling for large register changes
In reply to Mark BrownThe driver is out of sync with the core functions it is using.
--- sound/soc/codecs/wm8580.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
sound/soc/codecs/wm8580.c +9 -5
@@ -268,9 +268,11 @@ static const DECLARE_TLV_DB_SCALE(dac_tlv, -12750, 50, 1);static int wm8580_out_vu (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { +struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value;struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); -int reg = kcontrol->private_value &0xff ; -int reg2 = (kcontrol->private_value >>24 ) &0xff ; +unsigned int reg = mc->reg; +unsigned int reg2 = mc->rreg;int ret;u16 val;
@@ -292,15 +294,17 @@ static int wm8580_out_vu(struct snd_kcontrol *kcontrol,return 0 ; } -#define SOC_WM8580_OUT_DOUBLE_R_TLV (xname, reg_left, reg_right, shift, max, invert, tlv_array) \ +#define SOC_WM8580_OUT_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, \ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw_2r, \ .get = snd_soc_get_volsw_2r, .put = wm8580_out_vu, \ - .private_value = (reg_left) | ((shift) << 8) | \ - ((max) << 12) | ((invert) << 20) | ((reg_right) << 24) } + .private_value = (unsigned long)&(struct soc_mixer_control) \ + {.reg = reg_left, .rreg = reg_right, .shift = xshift, \ + .max = xmax, .invert = xinvert} }static const struct snd_kcontrol_new wm8580_snd_controls[] = { SOC_WM8580_OUT_DOUBLE_R_TLV("DAC1 Playback Volume",
Signature · 1 line
1.5.6.3
PATCH 7/21 ASoC: OMAP: Add checking to detect bufferless pcms
In reply to Mark BrownFrom: Joonyoung Shim <[email protected]>
Add checking in hw_params and prepare to detect bufferless pcms(i.e. BT <--> codec).
--- sound/soc/omap/omap-pcm.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
sound/soc/omap/omap-pcm.c +8 -1
@@ -87,8 +87,10 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,struct omap_pcm_dma_data *dma_data = rtd->dai->cpu_dai->dma_data;int err =0 ; +/* return if this is a bufferless transfer e.g. +* codec <--> BT codec or GSM modem -- lg FIXME */ if (!dma_data) -return -ENODEV ; +return 0 ;snd_pcm_set_runtime_buffer (substream, &substream->dma_buffer); runtime->dma_bytes =params_buffer_bytes (params);
@@ -134,6 +136,11 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream)struct omap_pcm_dma_data *dma_data = prtd->dma_data;struct omap_dma_channel_params dma_params; +/* return if this is a bufferless transfer e.g. +* codec <--> BT codec or GSM modem -- lg FIXME */ +if (!prtd->dma_data) +return 0 ; +memset (&dma_params,0 ,sizeof (dma_params));/* * Note: Regardless of interface data formats supported by OMAP McBSP
Signature · 1 line
1.5.6.3
PATCH 8/21 ASoC: Add power supply widget to DAPM
In reply to Mark BrownMany modern CODECs have shared resources on chip which must be enabled for portions of the chip to work but which can be disabled at other times in order to achieve power savings. Examples of such resources include power supplies and some internal clocks.
Since these widgets are dependencies for the audio path but do not carry audio signals they require slightly different handling to most widgets - they do not contribute to the audio path and so should not be counted as either inputs or outputs during path walks.
Cases where one supply provides a supply for another will require additional work. There is also room for more optimisation of the graph walking to avoid repeated checks for the same thing.
--- Documentation/sound/alsa/soc/dapm.txt | 1 + include/sound/soc-dapm.h | 7 ++++- sound/soc/soc-dapm.c | 44 +++++++++++++++++++++++++++++--- 3 files changed, 46 insertions(+), 6 deletions(-)
Documentation/sound/alsa/soc/dapm.txt +1 -0
@@ -62,6 +62,7 @@ Audio DAPM widgets fall into a number of types:- o Mic - Mic (and optional Jack) o Line - Line Input/Output (and optional Jack) o Speaker - Speaker + o Supply - Power or clock supply widget used by other widgets. o Pre - Special PRE widget (exec before all others) o Post - Special POST widget (exec after all others)
include/sound/soc-dapm.h +6 -1
@@ -154,12 +154,16 @@ .shift = wshift, .invert = winvert, \ .event = wevent, .event_flags = wflags} -/* generic register modifier widget */ +/* generic widgets */ #define SND_SOC_DAPM_REG (wid, wname, wreg, wshift, wmask, won_val, woff_val) \ { .id = wid, .name = wname, .kcontrols = NULL, .num_kcontrols = 0, \ .reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \ .on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \ .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD} +#define SND_SOC_DAPM_SUPPLY (wname, wreg, wshift, winvert, wevent, wflags) \ +{ .id = snd_soc_dapm_supply, .name = wname, .reg = wreg, \ + .shift = wshift, .invert = winvert, .event = wevent, \ + .event_flags = wflags}/* dapm kcontrol types */ #define SOC_DAPM_SINGLE (xname, reg, shift, max, invert) \
@@ -308,6 +312,7 @@ enum snd_soc_dapm_type { snd_soc_dapm_vmid,/* codec bias/vmid - to minimise pops */ snd_soc_dapm_pre,/* machine specific pre widget - exec first */ snd_soc_dapm_post,/* machine specific post widget - exec last */ + snd_soc_dapm_supply, /* power/clock supply */ };/*
sound/soc/soc-dapm.c +39 -5
104 lines not on this page · raw message
Signature · 1 line
1.5.6.3
PATCH 9/21 ASoC: Use DAPM supply widget for WM8903 charge pump
In reply to Mark Brown--- sound/soc/codecs/wm8903.c | 53 +++++++++++++++++---------------------------- 1 files changed, 20 insertions(+), 33 deletions(-)
sound/soc/codecs/wm8903.c +20 -33
@@ -217,7 +217,6 @@ struct wm8903_priv {int sysclk;/* Reference counts */ -int charge_pump_users;int class_w_users;int playback_active;int capture_active;
@@ -373,6 +372,15 @@ static void wm8903_reset(struct snd_soc_codec *codec)#define WM8903_OUTPUT_INT 0x2#define WM8903_OUTPUT_IN 0x1 +static int wm8903_cp_event (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event) +{ +WARN_ON (event !=SND_SOC_DAPM_POST_PMU ); +mdelay (4 ); + +return 0 ; +} +/* * Event for headphone and line out amplifier power changes. Special * power up/down sequences are required in order to maximise pop/click
@@ -382,12 +390,9 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) {struct snd_soc_codec *codec = w->codec; -struct wm8903_priv *wm8903 = codec->private_data; -struct i2c_client *i2c = codec->control_data;u16 val;u16 reg;int shift; -u16 cp_reg =wm8903_read (codec,WM8903_CHARGE_PUMP_0 );switch (w->reg) {case WM8903_POWER_MANAGEMENT_2 :
@@ -419,18 +424,6 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,/* Short the output */ val &= ~(WM8903_OUTPUT_SHORT << shift);wm8903_write (codec, reg, val); - - wm8903->charge_pump_users++; - -dev_dbg (&i2c->dev,"Charge pump use count now %d\n" , - wm8903->charge_pump_users); - -if (wm8903->charge_pump_users ==1 ) { -dev_dbg (&i2c->dev,"Enabling charge pump\n" ); -wm8903_write (codec,WM8903_CHARGE_PUMP_0 , - cp_reg |WM8903_CP_ENA ); -mdelay (4 ); - } }if (event &SND_SOC_DAPM_POST_PMU ) {
@@ -464,19 +457,6 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,wm8903_write (codec, reg, val); } -if (event &SND_SOC_DAPM_POST_PMD ) { - wm8903->charge_pump_users--; - -dev_dbg (&i2c->dev,"Charge pump use count now %d\n" , - wm8903->charge_pump_users); - -if (wm8903->charge_pump_users ==0 ) { -dev_dbg (&i2c->dev,"Disabling charge pump\n" ); -wm8903_write (codec,WM8903_CHARGE_PUMP_0 , - cp_reg & ~WM8903_CP_ENA ); - } - } -return 0 ; }
@@ -844,26 +824,28 @@ SND_SOC_DAPM_MIXER("Right Speaker Mixer", WM8903_POWER_MANAGEMENT_4, 0, 0,SND_SOC_DAPM_PGA_E ("Left Headphone Output PGA" ,WM8903_POWER_MANAGEMENT_2 ,1 ,0 ,NULL ,0 , wm8903_output_event,SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD ), +SND_SOC_DAPM_PRE_PMD ),SND_SOC_DAPM_PGA_E ("Right Headphone Output PGA" ,WM8903_POWER_MANAGEMENT_2 ,0 ,0 ,NULL ,0 , wm8903_output_event,SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD ), +SND_SOC_DAPM_PRE_PMD ),SND_SOC_DAPM_PGA_E ("Left Line Output PGA" ,WM8903_POWER_MANAGEMENT_3 ,1 ,0 ,NULL ,0 , wm8903_output_event,SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD ), +SND_SOC_DAPM_PRE_PMD ),SND_SOC_DAPM_PGA_E ("Right Line Output PGA" ,WM8903_POWER_MANAGEMENT_3 ,0 ,0 ,NULL ,0 , wm8903_output_event,SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD ), +SND_SOC_DAPM_PRE_PMD ),SND_SOC_DAPM_PGA ("Left Speaker PGA" ,WM8903_POWER_MANAGEMENT_5 ,1 ,0 ,NULL ,0 ),SND_SOC_DAPM_PGA ("Right Speaker PGA" ,WM8903_POWER_MANAGEMENT_5 ,0 ,0 ,NULL ,0 ), +SND_SOC_DAPM_SUPPLY ("Charge Pump" ,WM8903_CHARGE_PUMP_0 ,0 ,0 , + wm8903_cp_event, SND_SOC_DAPM_POST_PMU), }; static const struct snd_soc_dapm_route intercon[] = {
@@ -951,6 +933,11 @@ static const struct snd_soc_dapm_route intercon[] = { { "ROP", NULL, "Right Speaker PGA" }, { "RON", NULL, "Right Speaker PGA" }, + + { "Left Headphone Output PGA", NULL, "Charge Pump" }, + { "Right Headphone Output PGA", NULL, "Charge Pump" }, + { "Left Line Output PGA", NULL, "Charge Pump" }, + { "Right Line Output PGA", NULL, "Charge Pump" }, };static int wm8903_add_widgets (struct snd_soc_codec *codec)
Signature · 1 line
1.5.6.3
PATCH 10/21 ASoC: Support CLK_DSP in WM8903
In reply to Mark BrownCLK_DSP provides a master clock for the DAC and ADC related functionality on the device.
--- sound/soc/codecs/wm8903.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
sound/soc/codecs/wm8903.c +6 -0
@@ -846,6 +846,7 @@ SND_SOC_DAPM_PGA("Right Speaker PGA", WM8903_POWER_MANAGEMENT_5, 0, 0,SND_SOC_DAPM_SUPPLY ("Charge Pump" ,WM8903_CHARGE_PUMP_0 ,0 ,0 , wm8903_cp_event,SND_SOC_DAPM_POST_PMU ), +SND_SOC_DAPM_SUPPLY("CLK_DSP", WM8903_CLOCK_RATES_2, 1, 0, NULL, 0), }; static const struct snd_soc_dapm_route intercon[] = {
@@ -891,7 +892,12 @@ static const struct snd_soc_dapm_route intercon[] = { { "Right Input PGA", NULL, "Right Input Mode Mux" }, { "ADCL", NULL, "Left Input PGA" }, + { "ADCL", NULL, "CLK_DSP" }, { "ADCR", NULL, "Right Input PGA" }, + { "ADCR", NULL, "CLK_DSP" }, + + { "DACL", NULL, "CLK_DSP" }, + { "DACR", NULL, "CLK_DSP" }, { "Left Output Mixer", "Left Bypass Switch", "Left Input PGA" }, { "Left Output Mixer", "Right Bypass Switch", "Right Input PGA" },
Signature · 1 line
1.5.6.3
PATCH 11/21 ASoC: Optimise configuration of WM8903 DC servo
In reply to Mark BrownModify the default startup sequence in the chip to set the DC servo dither level for optimal performance.
--- sound/soc/codecs/wm8903.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
sound/soc/codecs/wm8903.c +5 -0
@@ -978,6 +978,11 @@ static int wm8903_set_bias_level(struct snd_soc_codec *codec,wm8903_write (codec,WM8903_CLOCK_RATES_2 ,WM8903_CLK_SYS_ENA ); +/* Change DC servo dither level in startup sequence */ +wm8903_write (codec,WM8903_WRITE_SEQUENCER_0 ,0x11 ); +wm8903_write (codec,WM8903_WRITE_SEQUENCER_1 ,0x1257 ); +wm8903_write (codec,WM8903_WRITE_SEQUENCER_2 ,0x2 ); +wm8903_run_sequence (codec,0 );wm8903_sync_reg_cache (codec, codec->reg_cache);
Signature · 1 line
1.5.6.3
PATCH 12/21 ASoC: Actively manage the DC servo for WM8903
In reply to Mark BrownSave a little extra power by enabling the DC servo offset correction for the output channels only when the relevant channels are enabled.
--- sound/soc/codecs/wm8903.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
sound/soc/codecs/wm8903.c +14 -0
@@ -392,14 +392,18 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,struct snd_soc_codec *codec = w->codec;u16 val;u16 reg; +u16 dcs_reg; +u16 dcs_bit;int shift;switch (w->reg) {case WM8903_POWER_MANAGEMENT_2 : reg =WM8903_ANALOGUE_HP_0 ; + dcs_bit =0 + w->shift;break ;case WM8903_POWER_MANAGEMENT_3 : reg =WM8903_ANALOGUE_LINEOUT_0 ; + dcs_bit =2 + w->shift;break ;default :BUG ();
@@ -439,6 +443,11 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w, val |= (WM8903_OUTPUT_OUT << shift);wm8903_write (codec, reg, val); +/* Enable the DC servo */ + dcs_reg =wm8903_read (codec,WM8903_DC_SERVO_0 ); + dcs_reg |= dcs_bit; +wm8903_write (codec,WM8903_DC_SERVO_0 , dcs_reg); +/* Remove the short */ val |= (WM8903_OUTPUT_SHORT << shift);wm8903_write (codec, reg, val);
@@ -451,6 +460,11 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w, val &= ~(WM8903_OUTPUT_SHORT << shift);wm8903_write (codec, reg, val); +/* Disable the DC servo */ + dcs_reg =wm8903_read (codec,WM8903_DC_SERVO_0 ); + dcs_reg &= ~dcs_bit; +wm8903_write (codec,WM8903_DC_SERVO_0 , dcs_reg); +/* Then disable the intermediate and output stages */ val &= ~((WM8903_OUTPUT_OUT |WM8903_OUTPUT_INT |WM8903_OUTPUT_IN ) << shift);
Signature · 1 line
1.5.6.3
PATCH 13/21 ASoC: Remove redundant rate constraint for WM8903
In reply to Mark BrownThis is now handled by symmetric_rates.
--- sound/soc/codecs/wm8903.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)
sound/soc/codecs/wm8903.c +2 -8
@@ -1289,14 +1289,8 @@ static int wm8903_startup(struct snd_pcm_substream *substream,if (wm8903->master_substream) { master_runtime = wm8903->master_substream->runtime; -dev_dbg (&i2c->dev,"Constraining to %d bits at %dHz\n" , - master_runtime->sample_bits, - master_runtime->rate); - -snd_pcm_hw_constraint_minmax (substream->runtime, -SNDRV_PCM_HW_PARAM_RATE , - master_runtime->rate, - master_runtime->rate); +dev_dbg (&i2c->dev,"Constraining to %d bits\n" , + master_runtime->sample_bits); snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
Signature · 1 line
1.5.6.3
PATCH 14/21 ASoC: Implement WM8903 digital sidetone support
In reply to Mark Brown--- sound/soc/codecs/wm8903.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-)
sound/soc/codecs/wm8903.c +30 -0
@@ -533,6 +533,7 @@ static int wm8903_class_w_put(struct snd_kcontrol *kcontrol,/* ALSA can only do steps of .01dB */ static const DECLARE_TLV_DB_SCALE(digital_tlv, -7200, 75, 1); +static const DECLARE_TLV_DB_SCALE(digital_sidetone_tlv, -3600, 300, 0); static const DECLARE_TLV_DB_SCALE(out_tlv, -5700, 100, 0); static const DECLARE_TLV_DB_SCALE(drc_tlv_thresh, 0, 75, 0);
@@ -651,6 +652,16 @@ static const struct soc_enum rinput_inv_enum =SOC_ENUM_SINGLE (WM8903_ANALOGUE_RIGHT_INPUT_1 ,4 ,3 , rinput_mux_text); +static const char *sidetone_text[] = { +"None" ,"Left" ,"Right" +}; + +static const struct soc_enum lsidetone_enum = +SOC_ENUM_SINGLE (WM8903_DAC_DIGITAL_0 ,2 ,3 , sidetone_text); + +static const struct soc_enum rsidetone_enum = +SOC_ENUM_SINGLE (WM8903_DAC_DIGITAL_0 ,0 ,3 , sidetone_text); +static const struct snd_kcontrol_new wm8903_snd_controls[] = {/* Input PGAs - No TLV since the scale depends on PGA mode */
@@ -694,6 +705,9 @@ SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8903_ADC_DIGITAL_VOLUME_LEFT,SOC_ENUM ("ADC Companding Mode" , adc_companding),SOC_SINGLE ("ADC Companding Switch" ,WM8903_AUDIO_INTERFACE_0 ,3 ,1 ,0 ), +SOC_DOUBLE_TLV ("Digital Sidetone Volume" ,WM8903_DAC_DIGITAL_0 ,4 ,8 , +12 ,0 , digital_sidetone_tlv), +/* DAC */ SOC_DOUBLE_R_TLV ("Digital Playback Volume" ,WM8903_DAC_DIGITAL_VOLUME_LEFT , WM8903_DAC_DIGITAL_VOLUME_RIGHT, 1, 120, 0, digital_tlv),
@@ -756,6 +770,12 @@ static const struct snd_kcontrol_new rinput_mux =static const struct snd_kcontrol_new rinput_inv_mux =SOC_DAPM_ENUM ("Right Inverting Input Mux" , rinput_inv_enum); +static const struct snd_kcontrol_new lsidetone_mux = +SOC_DAPM_ENUM ("DACL Sidetone Mux" , lsidetone_enum); + +static const struct snd_kcontrol_new rsidetone_mux = +SOC_DAPM_ENUM ("DACR Sidetone Mux" , rsidetone_enum); +static const struct snd_kcontrol_new left_output_mixer[] = {SOC_DAPM_SINGLE ("DACL Switch" ,WM8903_ANALOGUE_LEFT_MIX_0 ,3 ,1 ,0 ),SOC_DAPM_SINGLE ("DACR Switch" ,WM8903_ANALOGUE_LEFT_MIX_0 ,2 ,1 ,0 ),
@@ -822,6 +842,9 @@ SND_SOC_DAPM_PGA("Right Input PGA", WM8903_POWER_MANAGEMENT_0, 0, 0, NULL, 0),SND_SOC_DAPM_ADC ("ADCL" ,"Left HiFi Capture" ,WM8903_POWER_MANAGEMENT_6 ,1 ,0 ),SND_SOC_DAPM_ADC ("ADCR" ,"Right HiFi Capture" ,WM8903_POWER_MANAGEMENT_6 ,0 ,0 ), +SND_SOC_DAPM_MUX ("DACL Sidetone" ,SND_SOC_NOPM ,0 ,0 , &lsidetone_mux), +SND_SOC_DAPM_MUX ("DACR Sidetone" ,SND_SOC_NOPM ,0 ,0 , &rsidetone_mux), +SND_SOC_DAPM_DAC ("DACL" ,"Left Playback" ,WM8903_POWER_MANAGEMENT_6 ,3 ,0 ), SND_SOC_DAPM_DAC("DACR", "Right Playback", WM8903_POWER_MANAGEMENT_6, 2, 0),
@@ -910,7 +933,14 @@ static const struct snd_soc_dapm_route intercon[] = { { "ADCR", NULL, "Right Input PGA" }, { "ADCR", NULL, "CLK_DSP" }, + { "DACL Sidetone", "Left", "ADCL" }, + { "DACL Sidetone", "Right", "ADCR" }, + { "DACR Sidetone", "Left", "ADCL" }, + { "DACR Sidetone", "Right", "ADCR" }, + + { "DACL", NULL, "DACL Sidetone" }, { "DACL", NULL, "CLK_DSP" }, + { "DACR", NULL, "DACR Sidetone" }, { "DACR", NULL, "CLK_DSP" }, { "Left Output Mixer", "Left Bypass Switch", "Left Input PGA" },
Signature · 1 line
1.5.6.3
PATCH 15/21 ASoC: remove non-existing referece to CONFIG_SND_SOC_CODEC_WM8991
In reply to Mark BrownFrom: Takashi Iwai <[email protected]>
--- sound/soc/codecs/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
sound/soc/codecs/Makefile +0 -1
@@ -56,7 +56,6 @@ obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o -obj-$(CONFIG_SND_SOC_WM8991) += snd-soc-wm8991.o obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
Signature · 1 line
1.5.6.3
PATCH 16/21 ASoC: TWL4030: Add VDL path support
In reply to Mark BrownFrom: Joonyoung Shim <[email protected]>
Add DAPMs for VDL(Voice Down Link) path. To support VDL path, we have to change DAPMs of outputs(Earpiece, PreDrive Left/Right, Headset Left/Right, Carkit Left/Right) from mux to mixer.
--- sound/soc/codecs/twl4030.c | 256 ++++++++++++++++++++++---------------------- 1 files changed, 126 insertions(+), 130 deletions(-)
sound/soc/codecs/twl4030.c +126 -130
@@ -321,104 +321,60 @@ static void twl4030_power_down(struct snd_soc_codec *codec) }/* Earpiece */ -static const char *twl4030_earpiece_texts[] = - {"Off" ,"DACL1" ,"DACL2" ,"DACR1" }; - -static const unsigned int twl4030_earpiece_values[] = - {0x0 ,0x1 ,0x2 ,0x4 }; - -static const struct soc_enum twl4030_earpiece_enum = -SOC_VALUE_ENUM_SINGLE (TWL4030_REG_EAR_CTL ,1 ,0x7 , -ARRAY_SIZE (twl4030_earpiece_texts), - twl4030_earpiece_texts, - twl4030_earpiece_values); - -static const struct snd_kcontrol_new twl4030_dapm_earpiece_control = -SOC_DAPM_VALUE_ENUM ("Route" , twl4030_earpiece_enum); +static const struct snd_kcontrol_new twl4030_dapm_earpiece_controls[] = { +SOC_DAPM_SINGLE ("Voice" ,TWL4030_REG_EAR_CTL ,0 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL1" ,TWL4030_REG_EAR_CTL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL2" ,TWL4030_REG_EAR_CTL ,2 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioR1" ,TWL4030_REG_EAR_CTL ,3 ,1 ,0 ), +};/* PreDrive Left */ -static const char *twl4030_predrivel_texts[] = - {"Off" ,"DACL1" ,"DACL2" ,"DACR2" }; - -static const unsigned int twl4030_predrivel_values[] = - {0x0 ,0x1 ,0x2 ,0x4 }; - -static const struct soc_enum twl4030_predrivel_enum = -SOC_VALUE_ENUM_SINGLE (TWL4030_REG_PREDL_CTL ,1 ,0x7 , -ARRAY_SIZE (twl4030_predrivel_texts), - twl4030_predrivel_texts, - twl4030_predrivel_values); - -static const struct snd_kcontrol_new twl4030_dapm_predrivel_control = -SOC_DAPM_VALUE_ENUM ("Route" , twl4030_predrivel_enum); +static const struct snd_kcontrol_new twl4030_dapm_predrivel_controls[] = { +SOC_DAPM_SINGLE ("Voice" ,TWL4030_REG_PREDL_CTL ,0 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL1" ,TWL4030_REG_PREDL_CTL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL2" ,TWL4030_REG_PREDL_CTL ,2 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioR2" ,TWL4030_REG_PREDL_CTL ,3 ,1 ,0 ), +};/* PreDrive Right */ -static const char *twl4030_predriver_texts[] = - {"Off" ,"DACR1" ,"DACR2" ,"DACL2" }; - -static const unsigned int twl4030_predriver_values[] = - {0x0 ,0x1 ,0x2 ,0x4 }; - -static const struct soc_enum twl4030_predriver_enum = -SOC_VALUE_ENUM_SINGLE (TWL4030_REG_PREDR_CTL ,1 ,0x7 , -ARRAY_SIZE (twl4030_predriver_texts), - twl4030_predriver_texts, - twl4030_predriver_values); - -static const struct snd_kcontrol_new twl4030_dapm_predriver_control = -SOC_DAPM_VALUE_ENUM ("Route" , twl4030_predriver_enum); +static const struct snd_kcontrol_new twl4030_dapm_predriver_controls[] = { +SOC_DAPM_SINGLE ("Voice" ,TWL4030_REG_PREDR_CTL ,0 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioR1" ,TWL4030_REG_PREDR_CTL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioR2" ,TWL4030_REG_PREDR_CTL ,2 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL2" ,TWL4030_REG_PREDR_CTL ,3 ,1 ,0 ), +};/* Headset Left */ -static const char *twl4030_hsol_texts[] = - {"Off" ,"DACL1" ,"DACL2" }; - -static const struct soc_enum twl4030_hsol_enum = -SOC_ENUM_SINGLE (TWL4030_REG_HS_SEL ,1 , -ARRAY_SIZE (twl4030_hsol_texts), - twl4030_hsol_texts); - -static const struct snd_kcontrol_new twl4030_dapm_hsol_control = -SOC_DAPM_ENUM ("Route" , twl4030_hsol_enum); +static const struct snd_kcontrol_new twl4030_dapm_hsol_controls[] = { +SOC_DAPM_SINGLE ("Voice" ,TWL4030_REG_HS_SEL ,0 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL1" ,TWL4030_REG_HS_SEL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL2" ,TWL4030_REG_HS_SEL ,2 ,1 ,0 ), +};/* Headset Right */ -static const char *twl4030_hsor_texts[] = - {"Off" ,"DACR1" ,"DACR2" }; - -static const struct soc_enum twl4030_hsor_enum = -SOC_ENUM_SINGLE (TWL4030_REG_HS_SEL ,4 , -ARRAY_SIZE (twl4030_hsor_texts), - twl4030_hsor_texts); - -static const struct snd_kcontrol_new twl4030_dapm_hsor_control = -SOC_DAPM_ENUM ("Route" , twl4030_hsor_enum); +static const struct snd_kcontrol_new twl4030_dapm_hsor_controls[] = { +SOC_DAPM_SINGLE ("Voice" ,TWL4030_REG_HS_SEL ,3 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioR1" ,TWL4030_REG_HS_SEL ,4 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioR2" ,TWL4030_REG_HS_SEL ,5 ,1 ,0 ), +};/* Carkit Left */ -static const char *twl4030_carkitl_texts[] = - {"Off" ,"DACL1" ,"DACL2" }; - -static const struct soc_enum twl4030_carkitl_enum = -SOC_ENUM_SINGLE (TWL4030_REG_PRECKL_CTL ,1 , -ARRAY_SIZE (twl4030_carkitl_texts), - twl4030_carkitl_texts); - -static const struct snd_kcontrol_new twl4030_dapm_carkitl_control = -SOC_DAPM_ENUM ("Route" , twl4030_carkitl_enum); +static const struct snd_kcontrol_new twl4030_dapm_carkitl_controls[] = { +SOC_DAPM_SINGLE ("Voice" ,TWL4030_REG_PRECKL_CTL ,0 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL1" ,TWL4030_REG_PRECKL_CTL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioL2" ,TWL4030_REG_PRECKL_CTL ,2 ,1 ,0 ), +};/* Carkit Right */ -static const char *twl4030_carkitr_texts[] = - {"Off" ,"DACR1" ,"DACR2" }; - -static const struct soc_enum twl4030_carkitr_enum = -SOC_ENUM_SINGLE (TWL4030_REG_PRECKR_CTL ,1 , -ARRAY_SIZE (twl4030_carkitr_texts), - twl4030_carkitr_texts); - -static const struct snd_kcontrol_new twl4030_dapm_carkitr_control = -SOC_DAPM_ENUM ("Route" , twl4030_carkitr_enum); +static const struct snd_kcontrol_new twl4030_dapm_carkitr_controls[] = { +SOC_DAPM_SINGLE ("Voice" ,TWL4030_REG_PRECKR_CTL ,0 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioR1" ,TWL4030_REG_PRECKR_CTL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("AudioR2" ,TWL4030_REG_PRECKR_CTL ,2 ,1 ,0 ), +};/* Handsfree Left */ static const char *twl4030_handsfreel_texts[] = - {"Voice" ,"DACL1" ,"DACL2" ,"DACR2" }; + {"Voice" ,"AudioL1" ,"AudioL2" ,"AudioR2" };static const struct soc_enum twl4030_handsfreel_enum = SOC_ENUM_SINGLE(TWL4030_REG_HFL_CTL, 0,
@@ -430,7 +386,7 @@ SOC_DAPM_ENUM("Route", twl4030_handsfreel_enum);/* Handsfree Right */ static const char *twl4030_handsfreer_texts[] = - {"Voice" ,"DACR1" ,"DACR2" ,"DACL2" }; + {"Voice" ,"AudioR1" ,"AudioR2" ,"AudioL2" };static const struct soc_enum twl4030_handsfreer_enum = SOC_ENUM_SINGLE(TWL4030_REG_HFR_CTL, 0,
@@ -829,6 +785,12 @@ static DECLARE_TLV_DB_SCALE(digital_fine_tlv, -6300, 100, 1); static DECLARE_TLV_DB_SCALE(digital_coarse_tlv, 0, 600, 0);/* +* Voice Downlink GAIN volume control: +* from -37 to 12 dB in 1 dB steps (mute instead of -37 dB) +*/ +static DECLARE_TLV_DB_SCALE(digital_voice_downlink_tlv, -3700, 100, 1); + +/* * Analog playback gain * -24 dB to 12 dB in 2 dB steps */
@@ -892,6 +854,16 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = { TWL4030_REG_ARXL2_APGA_CTL, TWL4030_REG_ARXR2_APGA_CTL, 1, 1, 0), +/* Common voice downlink gain controls */ +SOC_SINGLE_TLV ("DAC Voice Digital Downlink Volume" , +TWL4030_REG_VRXPGA ,0 ,0x31 ,0 , digital_voice_downlink_tlv), + +SOC_SINGLE_TLV ("DAC Voice Analog Downlink Volume" , +TWL4030_REG_VDL_APGA_CTL ,3 ,0x12 ,1 , analog_tlv), + +SOC_SINGLE ("DAC Voice Analog Downlink Switch" , +TWL4030_REG_VDL_APGA_CTL ,1 ,1 ,0 ), +/* Separate output gain controls */ SOC_DOUBLE_R_TLV_TWL4030("PreDriv Playback Volume", TWL4030_REG_PREDL_CTL, TWL4030_REG_PREDR_CTL,
@@ -956,6 +928,8 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { SND_SOC_NOPM, 0, 0),SND_SOC_DAPM_DAC ("DAC Left2" ,"Left Rear Playback" ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_DAC ("DAC Voice" ,"Voice Playback" , +TWL4030_REG_AVDAC_CTL ,4 ,0 ),/* Analog PGAs */ SND_SOC_DAPM_PGA("ARXR1_APGA", TWL4030_REG_ARXR1_APGA_CTL,
@@ -966,6 +940,8 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 0, 0, NULL, 0),SND_SOC_DAPM_PGA ("ARXL2_APGA" ,TWL4030_REG_ARXL2_APGA_CTL ,0 ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("VDL_APGA" ,TWL4030_REG_VDL_APGA_CTL , +0 ,0 ,NULL ,0 ),/* Analog bypasses */ SND_SOC_DAPM_SWITCH_E("Right1 Analog Loopback", SND_SOC_NOPM, 0, 0,
@@ -998,26 +974,35 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {SND_SOC_DAPM_MIXER ("Analog L2 Playback Mixer" ,TWL4030_REG_AVDAC_CTL ,3 ,0 ,NULL ,0 ), -/* Output MUX controls */ +/* Output MIXER controls */ /* Earpiece */ -SND_SOC_DAPM_VALUE_MUX ("Earpiece Mux" ,SND_SOC_NOPM ,0 ,0 , - &twl4030_dapm_earpiece_control), +SND_SOC_DAPM_MIXER ("Earpiece Mixer" ,SND_SOC_NOPM ,0 ,0 , + &twl4030_dapm_earpiece_controls[0 ], +ARRAY_SIZE (twl4030_dapm_earpiece_controls)),/* PreDrivL/R */ -SND_SOC_DAPM_VALUE_MUX ("PredriveL Mux" ,SND_SOC_NOPM ,0 ,0 , - &twl4030_dapm_predrivel_control), -SND_SOC_DAPM_VALUE_MUX ("PredriveR Mux" ,SND_SOC_NOPM ,0 ,0 , - &twl4030_dapm_predriver_control), +SND_SOC_DAPM_MIXER ("PredriveL Mixer" ,SND_SOC_NOPM ,0 ,0 , + &twl4030_dapm_predrivel_controls[0 ], +ARRAY_SIZE (twl4030_dapm_predrivel_controls)), +SND_SOC_DAPM_MIXER ("PredriveR Mixer" ,SND_SOC_NOPM ,0 ,0 , + &twl4030_dapm_predriver_controls[0 ], +ARRAY_SIZE (twl4030_dapm_predriver_controls)),/* HeadsetL/R */ -SND_SOC_DAPM_MUX_E ("HeadsetL Mux" ,SND_SOC_NOPM ,0 ,0 , - &twl4030_dapm_hsol_control, headsetl_event, -SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_POST_PMD ), -SND_SOC_DAPM_MUX ("HeadsetR Mux" ,SND_SOC_NOPM ,0 ,0 , - &twl4030_dapm_hsor_control), +SND_SOC_DAPM_MIXER_E ("HeadsetL Mixer" ,SND_SOC_NOPM ,0 ,0 , + &twl4030_dapm_hsol_controls[0 ], +ARRAY_SIZE (twl4030_dapm_hsol_controls), headsetl_event, +SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_POST_PMD ), +SND_SOC_DAPM_MIXER ("HeadsetR Mixer" ,SND_SOC_NOPM ,0 ,0 , + &twl4030_dapm_hsor_controls[0 ], +ARRAY_SIZE (twl4030_dapm_hsor_controls)),/* CarkitL/R */ -SND_SOC_DAPM_MUX ("CarkitL Mux" ,SND_SOC_NOPM ,0 ,0 , - &twl4030_dapm_carkitl_control), -SND_SOC_DAPM_MUX ("CarkitR Mux" ,SND_SOC_NOPM ,0 ,0 , - &twl4030_dapm_carkitr_control), +SND_SOC_DAPM_MIXER ("CarkitL Mixer" ,SND_SOC_NOPM ,0 ,0 , + &twl4030_dapm_carkitl_controls[0 ], +ARRAY_SIZE (twl4030_dapm_carkitl_controls)), +SND_SOC_DAPM_MIXER ("CarkitR Mixer" ,SND_SOC_NOPM ,0 ,0 , + &twl4030_dapm_carkitr_controls[0 ], +ARRAY_SIZE (twl4030_dapm_carkitr_controls)), + +/* Output MUX controls */ /* HandsfreeL/R */ SND_SOC_DAPM_MUX_E("HandsfreeL Mux", TWL4030_REG_HFL_CTL, 5, 0, &twl4030_dapm_handsfreel_control, handsfree_event,
@@ -1082,50 +1067,61 @@ static const struct snd_soc_dapm_route intercon[] = { {"ARXL2_APGA", NULL, "Analog L2 Playback Mixer"}, {"ARXR2_APGA", NULL, "Analog R2 Playback Mixer"}, + {"VDL_APGA", NULL, "DAC Voice"}, +/* Internal playback routings */ /* Earpiece */ - {"Earpiece Mux", "DACL1", "ARXL1_APGA"}, - {"Earpiece Mux", "DACL2", "ARXL2_APGA"}, - {"Earpiece Mux", "DACR1", "ARXR1_APGA"}, + {"Earpiece Mixer", "Voice", "VDL_APGA"}, + {"Earpiece Mixer", "AudioL1", "ARXL1_APGA"}, + {"Earpiece Mixer", "AudioL2", "ARXL2_APGA"}, + {"Earpiece Mixer", "AudioR1", "ARXR1_APGA"},/* PreDrivL */ - {"PredriveL Mux", "DACL1", "ARXL1_APGA"}, - {"PredriveL Mux", "DACL2", "ARXL2_APGA"}, - {"PredriveL Mux", "DACR2", "ARXR2_APGA"}, + {"PredriveL Mixer", "Voice", "VDL_APGA"}, + {"PredriveL Mixer", "AudioL1", "ARXL1_APGA"}, + {"PredriveL Mixer", "AudioL2", "ARXL2_APGA"}, + {"PredriveL Mixer", "AudioR2", "ARXR2_APGA"},/* PreDrivR */ - {"PredriveR Mux", "DACR1", "ARXR1_APGA"}, - {"PredriveR Mux", "DACR2", "ARXR2_APGA"}, - {"PredriveR Mux", "DACL2", "ARXL2_APGA"}, + {"PredriveR Mixer", "Voice", "VDL_APGA"}, + {"PredriveR Mixer", "AudioR1", "ARXR1_APGA"}, + {"PredriveR Mixer", "AudioR2", "ARXR2_APGA"}, + {"PredriveR Mixer", "AudioL2", "ARXL2_APGA"},/* HeadsetL */ - {"HeadsetL Mux", "DACL1", "ARXL1_APGA"}, - {"HeadsetL Mux", "DACL2", "ARXL2_APGA"}, + {"HeadsetL Mixer", "Voice", "VDL_APGA"}, + {"HeadsetL Mixer", "AudioL1", "ARXL1_APGA"}, + {"HeadsetL Mixer", "AudioL2", "ARXL2_APGA"},/* HeadsetR */ - {"HeadsetR Mux", "DACR1", "ARXR1_APGA"}, - {"HeadsetR Mux", "DACR2", "ARXR2_APGA"}, + {"HeadsetR Mixer", "Voice", "VDL_APGA"}, + {"HeadsetR Mixer", "AudioR1", "ARXR1_APGA"}, + {"HeadsetR Mixer", "AudioR2", "ARXR2_APGA"},/* CarkitL */ - {"CarkitL Mux", "DACL1", "ARXL1_APGA"}, - {"CarkitL Mux", "DACL2", "ARXL2_APGA"}, + {"CarkitL Mixer", "Voice", "VDL_APGA"}, + {"CarkitL Mixer", "AudioL1", "ARXL1_APGA"}, + {"CarkitL Mixer", "AudioL2", "ARXL2_APGA"},/* CarkitR */ - {"CarkitR Mux", "DACR1", "ARXR1_APGA"}, - {"CarkitR Mux", "DACR2", "ARXR2_APGA"}, + {"CarkitR Mixer", "Voice", "VDL_APGA"}, + {"CarkitR Mixer", "AudioR1", "ARXR1_APGA"}, + {"CarkitR Mixer", "AudioR2", "ARXR2_APGA"},/* HandsfreeL */ - {"HandsfreeL Mux", "DACL1", "ARXL1_APGA"}, - {"HandsfreeL Mux", "DACL2", "ARXL2_APGA"}, - {"HandsfreeL Mux", "DACR2", "ARXR2_APGA"}, + {"HandsfreeL Mux", "Voice", "VDL_APGA"}, + {"HandsfreeL Mux", "AudioL1", "ARXL1_APGA"}, + {"HandsfreeL Mux", "AudioL2", "ARXL2_APGA"}, + {"HandsfreeL Mux", "AudioR2", "ARXR2_APGA"},/* HandsfreeR */ - {"HandsfreeR Mux", "DACR1", "ARXR1_APGA"}, - {"HandsfreeR Mux", "DACR2", "ARXR2_APGA"}, - {"HandsfreeR Mux", "DACL2", "ARXL2_APGA"}, + {"HandsfreeR Mux", "Voice", "VDL_APGA"}, + {"HandsfreeR Mux", "AudioR1", "ARXR1_APGA"}, + {"HandsfreeR Mux", "AudioR2", "ARXR2_APGA"}, + {"HandsfreeR Mux", "AudioL2", "ARXL2_APGA"},/* outputs */ {"OUTL", NULL, "ARXL2_APGA"}, {"OUTR", NULL, "ARXR2_APGA"}, - {"EARPIECE", NULL, "Earpiece Mux"}, - {"PREDRIVEL", NULL, "PredriveL Mux"}, - {"PREDRIVER", NULL, "PredriveR Mux"}, - {"HSOL", NULL, "HeadsetL Mux"}, - {"HSOR", NULL, "HeadsetR Mux"}, - {"CARKITL", NULL, "CarkitL Mux"}, - {"CARKITR", NULL, "CarkitR Mux"}, + {"EARPIECE", NULL, "Earpiece Mixer"}, + {"PREDRIVEL", NULL, "PredriveL Mixer"}, + {"PREDRIVER", NULL, "PredriveR Mixer"}, + {"HSOL", NULL, "HeadsetL Mixer"}, + {"HSOR", NULL, "HeadsetR Mixer"}, + {"CARKITL", NULL, "CarkitL Mixer"}, + {"CARKITR", NULL, "CarkitR Mixer"}, {"HFL", NULL, "HandsfreeL Mux"}, {"HFR", NULL, "HandsfreeR Mux"},
Signature · 1 line
1.5.6.3
PATCH 17/21 ASoC: simplify the SSP DMA parameters settings by run-time generation
In reply to Mark BrownFrom: Eric Miao <[email protected]>
The SSP DMA parameters can actually be easily generated at run-time since they are almost similar except for the FIFO width and direction. Another benefit is the re-use of information from 'struct ssp_device', like SSDR physical FIFO address and DRCMR register index for both directions.
--- sound/soc/pxa/pxa-ssp.c | 203 ++++++++++------------------------------------- 1 files changed, 43 insertions(+), 160 deletions(-)
sound/soc/pxa/pxa-ssp.c +43 -160
@@ -50,139 +50,6 @@ struct ssp_priv {#endif }; -#define PXA2xx_SSP1_BASE 0x41000000 -#define PXA27x_SSP2_BASE 0x41700000 -#define PXA27x_SSP3_BASE 0x41900000 -#define PXA3xx_SSP4_BASE 0x41a00000 - -static struct pxa2xx_pcm_dma_params pxa_ssp1_pcm_mono_out = { - .name ="SSP1 PCM Mono out" , - .dev_addr = PXA2xx_SSP1_BASE +SSDR , - .drcmr = &DRCMR (14 ), - .dcmd =DCMD_INCSRCADDR |DCMD_FLOWTRG | -DCMD_BURST16 |DCMD_WIDTH2 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp1_pcm_mono_in = { - .name ="SSP1 PCM Mono in" , - .dev_addr = PXA2xx_SSP1_BASE +SSDR , - .drcmr = &DRCMR (13 ), - .dcmd =DCMD_INCTRGADDR |DCMD_FLOWSRC | -DCMD_BURST16 |DCMD_WIDTH2 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp1_pcm_stereo_out = { - .name ="SSP1 PCM Stereo out" , - .dev_addr = PXA2xx_SSP1_BASE +SSDR , - .drcmr = &DRCMR (14 ), - .dcmd =DCMD_INCSRCADDR |DCMD_FLOWTRG | -DCMD_BURST16 |DCMD_WIDTH4 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp1_pcm_stereo_in = { - .name ="SSP1 PCM Stereo in" , - .dev_addr = PXA2xx_SSP1_BASE +SSDR , - .drcmr = &DRCMR (13 ), - .dcmd =DCMD_INCTRGADDR |DCMD_FLOWSRC | -DCMD_BURST16 |DCMD_WIDTH4 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp2_pcm_mono_out = { - .name ="SSP2 PCM Mono out" , - .dev_addr = PXA27x_SSP2_BASE +SSDR , - .drcmr = &DRCMR (16 ), - .dcmd =DCMD_INCSRCADDR |DCMD_FLOWTRG | -DCMD_BURST16 |DCMD_WIDTH2 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp2_pcm_mono_in = { - .name ="SSP2 PCM Mono in" , - .dev_addr = PXA27x_SSP2_BASE +SSDR , - .drcmr = &DRCMR (15 ), - .dcmd =DCMD_INCTRGADDR |DCMD_FLOWSRC | -DCMD_BURST16 |DCMD_WIDTH2 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp2_pcm_stereo_out = { - .name ="SSP2 PCM Stereo out" , - .dev_addr = PXA27x_SSP2_BASE +SSDR , - .drcmr = &DRCMR (16 ), - .dcmd =DCMD_INCSRCADDR |DCMD_FLOWTRG | -DCMD_BURST16 |DCMD_WIDTH4 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp2_pcm_stereo_in = { - .name ="SSP2 PCM Stereo in" , - .dev_addr = PXA27x_SSP2_BASE +SSDR , - .drcmr = &DRCMR (15 ), - .dcmd =DCMD_INCTRGADDR |DCMD_FLOWSRC | -DCMD_BURST16 |DCMD_WIDTH4 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp3_pcm_mono_out = { - .name ="SSP3 PCM Mono out" , - .dev_addr = PXA27x_SSP3_BASE +SSDR , - .drcmr = &DRCMR (67 ), - .dcmd =DCMD_INCSRCADDR |DCMD_FLOWTRG | -DCMD_BURST16 |DCMD_WIDTH2 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp3_pcm_mono_in = { - .name ="SSP3 PCM Mono in" , - .dev_addr = PXA27x_SSP3_BASE +SSDR , - .drcmr = &DRCMR (66 ), - .dcmd =DCMD_INCTRGADDR |DCMD_FLOWSRC | -DCMD_BURST16 |DCMD_WIDTH2 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp3_pcm_stereo_out = { - .name ="SSP3 PCM Stereo out" , - .dev_addr = PXA27x_SSP3_BASE +SSDR , - .drcmr = &DRCMR (67 ), - .dcmd =DCMD_INCSRCADDR |DCMD_FLOWTRG | -DCMD_BURST16 |DCMD_WIDTH4 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp3_pcm_stereo_in = { - .name ="SSP3 PCM Stereo in" , - .dev_addr = PXA27x_SSP3_BASE +SSDR , - .drcmr = &DRCMR (66 ), - .dcmd =DCMD_INCTRGADDR |DCMD_FLOWSRC | -DCMD_BURST16 |DCMD_WIDTH4 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp4_pcm_mono_out = { - .name ="SSP4 PCM Mono out" , - .dev_addr = PXA3xx_SSP4_BASE +SSDR , - .drcmr = &DRCMR (67 ), - .dcmd =DCMD_INCSRCADDR |DCMD_FLOWTRG | -DCMD_BURST16 |DCMD_WIDTH2 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp4_pcm_mono_in = { - .name ="SSP4 PCM Mono in" , - .dev_addr = PXA3xx_SSP4_BASE +SSDR , - .drcmr = &DRCMR (66 ), - .dcmd =DCMD_INCTRGADDR |DCMD_FLOWSRC | -DCMD_BURST16 |DCMD_WIDTH2 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp4_pcm_stereo_out = { - .name ="SSP4 PCM Stereo out" , - .dev_addr = PXA3xx_SSP4_BASE +SSDR , - .drcmr = &DRCMR (67 ), - .dcmd =DCMD_INCSRCADDR |DCMD_FLOWTRG | -DCMD_BURST16 |DCMD_WIDTH4 , -}; - -static struct pxa2xx_pcm_dma_params pxa_ssp4_pcm_stereo_in = { - .name ="SSP4 PCM Stereo in" , - .dev_addr = PXA3xx_SSP4_BASE +SSDR , - .drcmr = &DRCMR (66 ), - .dcmd =DCMD_INCTRGADDR |DCMD_FLOWSRC | -DCMD_BURST16 |DCMD_WIDTH4 , -}; -static void dump_registers (struct ssp_device *ssp) { dev_dbg(&ssp->pdev->dev, "SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n",
@@ -194,25 +61,33 @@ static void dump_registers(struct ssp_device *ssp) ssp_read_reg(ssp, SSACD)); } -static struct pxa2xx_pcm_dma_params *ssp_dma_params[4 ][4 ] = { - { - &pxa_ssp1_pcm_mono_out, &pxa_ssp1_pcm_mono_in, - &pxa_ssp1_pcm_stereo_out, &pxa_ssp1_pcm_stereo_in, - }, - { - &pxa_ssp2_pcm_mono_out, &pxa_ssp2_pcm_mono_in, - &pxa_ssp2_pcm_stereo_out, &pxa_ssp2_pcm_stereo_in, - }, - { - &pxa_ssp3_pcm_mono_out, &pxa_ssp3_pcm_mono_in, - &pxa_ssp3_pcm_stereo_out, &pxa_ssp3_pcm_stereo_in, - }, - { - &pxa_ssp4_pcm_mono_out, &pxa_ssp4_pcm_mono_in, - &pxa_ssp4_pcm_stereo_out, &pxa_ssp4_pcm_stereo_in, - }, +struct pxa2xx_pcm_dma_data { +struct pxa2xx_pcm_dma_params params; +char name[20 ]; }; +static struct pxa2xx_pcm_dma_params * +ssp_get_dma_params (struct ssp_device *ssp,int stereo,int out) +{ +struct pxa2xx_pcm_dma_data *dma; + + dma =kzalloc (sizeof (struct pxa2xx_pcm_dma_data ),GFP_KERNEL ); +if (dma ==NULL ) +return NULL ; + +snprintf (dma->name,20 ,"SSP%d PCM %s %s" , ssp->port_id, + stereo ?"Stereo" :"Mono" , out ?"out" :"in" ); + + dma->params.name = dma->name; + dma->params.drcmr = &DRCMR (out ? ssp->drcmr_tx : ssp->drcmr_rx); + dma->params.dcmd = (out ? (DCMD_INCSRCADDR |DCMD_FLOWTRG ) : + (DCMD_INCTRGADDR |DCMD_FLOWSRC )) | + (stereo ?DCMD_WIDTH4 :DCMD_WIDTH2 ) |DCMD_BURST16 ; + dma->params.dev_addr = ssp->phys_base +SSDR ; + +return &dma->params; +} +static int pxa_ssp_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {
@@ -227,6 +102,11 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,clk_enable (priv->dev.ssp->clk);ssp_disable (&priv->dev); } + +if (cpu_dai->dma_data) { +kfree (cpu_dai->dma_data); + cpu_dai->dma_data =NULL ; + }return ret; }
@@ -241,6 +121,11 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,ssp_disable (&priv->dev);clk_disable (priv->dev.ssp->clk); } + +if (cpu_dai->dma_data) { +kfree (cpu_dai->dma_data); + cpu_dai->dma_data =NULL ; + } }#ifdef CONFIG_PM
@@ -653,25 +538,23 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;struct ssp_priv *priv = cpu_dai->private_data;struct ssp_device *ssp = priv->dev.ssp; -int dma =0 , chn =params_channels (params); +int chn =params_channels (params);u32 sscr0;u32 sspsp;int width =snd_pcm_format_physical_width (params_format (params));int ttsa =ssp_read_reg (ssp,SSTSA ) &0xf ; -/* select correct DMA params */ -if (substream->stream !=SNDRV_PCM_STREAM_PLAYBACK ) - dma =1 ;/* capture DMA offset is 1,3 */ +/* generate correct DMA params */ +if (cpu_dai->dma_data) +kfree (cpu_dai->dma_data); +/* Network mode with one active slot (ttsa == 1) can be used * to force 16-bit frame width on the wire (for S16_LE), even * with two channels. Use 16-bit DMA transfers for this case. */ -if (((chn ==2 ) && (ttsa !=1 )) || (width ==32 )) - dma +=2 ;/* 32-bit DMA offset is 2, 16-bit is 0 */ - - cpu_dai->dma_data = ssp_dma_params[cpu_dai->id][dma]; - -dev_dbg (&ssp->pdev->dev,"pxa_ssp_hw_params: dma %d\n" , dma); + cpu_dai->dma_data =ssp_get_dma_params (ssp, + ((chn ==2 ) && (ttsa !=1 )) || (width ==32 ), + substream->stream ==SNDRV_PCM_STREAM_PLAYBACK );/* we can only change the settings if the port is not in use */ if (ssp_read_reg (ssp,SSCR0 ) &SSCR0_SSE )
Signature · 1 line
1.5.6.3
PATCH 18/21 ASoC: change stereo/mono to 32-bit/16-bit for pxa-ssp
In reply to Mark BrownFrom: Eric Miao <[email protected]>
The original idea came from pHilipp, and this makes the code looks more consistent.
--- sound/soc/pxa/pxa-ssp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/pxa/pxa-ssp.c +3 -3
@@ -67,7 +67,7 @@ struct pxa2xx_pcm_dma_data { };static struct pxa2xx_pcm_dma_params * -ssp_get_dma_params (struct ssp_device *ssp,int stereo,int out) +ssp_get_dma_params (struct ssp_device *ssp,int width4,int out) {struct pxa2xx_pcm_dma_data *dma;
@@ -76,13 +76,13 @@ ssp_get_dma_params(struct ssp_device *ssp, int stereo, int out)return NULL ;snprintf (dma->name,20 ,"SSP%d PCM %s %s" , ssp->port_id, - stereo ?"Stereo" :"Mono" , out ?"out" :"in" ); + width4 ?"32-bit" :"16-bit" , out ?"out" :"in" ); dma->params.name = dma->name; dma->params.drcmr = &DRCMR (out ? ssp->drcmr_tx : ssp->drcmr_rx); dma->params.dcmd = (out ? (DCMD_INCSRCADDR |DCMD_FLOWTRG ) : (DCMD_INCTRGADDR |DCMD_FLOWSRC )) | - (stereo ?DCMD_WIDTH4 :DCMD_WIDTH2 ) |DCMD_BURST16 ; + (width4 ?DCMD_WIDTH4 :DCMD_WIDTH2 ) |DCMD_BURST16 ; dma->params.dev_addr = ssp->phys_base +SSDR ;return &dma->params;
Signature · 1 line
1.5.6.3
PATCH 19/21 ASoC: s3c-i2s-v2 needs to declare a license for modular builds
In reply to Mark BrownIt relies on EXPORT_SYMBOL_GPL() symbols.
--- sound/soc/s3c24xx/s3c-i2s-v2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
sound/soc/s3c24xx/s3c-i2s-v2.c +2 -1
@@ -636,5 +636,6 @@ int s3c_i2sv2_register_dai(struct snd_soc_dai *dai)return snd_soc_register_dai (dai); } -EXPORT_SYMBOL_GPL (s3c_i2sv2_register_dai); + +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.6.3
Re: [PATCH 19/21] ASoC: s3c-i2s-v2 needs to declare a license for modular builds
Quoted 12 lines · Mark Brown
It relies on
EXPORT_SYMBOL_GPL()symbols.Signed-off-by Mark Brown <[email protected]>--- sound/soc/s3c24xx/s3c-i2s-v2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)sound/soc/s3c24xx/s3c-i2s-v2.c +0
-0
sound/soc/s3c24xx/s3c-i2s-v2.c int s3c_i2sv2_register_dai(struct snd_soc_dai *dai) · line 641
Quoted 7 lines
sound/soc/s3c24xx/s3c-i2s-v2.c +2
-1@@ -636,5 +636,6 @@ int s3c_i2sv2_register_dai(struct snd_soc_dai *dai)return snd_soc_register_dai (dai); } -EXPORT_SYMBOL_GPL (s3c_i2sv2_register_dai); + +MODULE_LICENSE ("GPL" );
A MODULE_DESCRIPTION and MODULE_AUTHOUR tag woudln't go amiss either, if this is available on a branch i'll look at adding these.
Signature · 4 lines
Ben Q: What's a light-year? A: One-third less calories than a regular year.
Re: [PATCH 19/21] ASoC: s3c-i2s-v2 needs to declare a license for modular builds
Quoted 2 lines · Ben Dooks
A
MODULE_DESCRIPTIONandMODULE_AUTHOURtag woudln't go amiss either, if this is available on a branch i'll look at adding these.
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31
PATCH 20/21 ASoC: OMAP: Add 4 channel support to mcbsp
In reply to Mark BrownFrom: Peter Ujfalusi <[email protected]>
Add 4 channel support to omap-mcbsp.
This mode is going to be used by the twl4030 codec, when it is configured in Option1 mode.
--- sound/soc/omap/omap-mcbsp.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
sound/soc/omap/omap-mcbsp.c +3 -2
@@ -259,6 +259,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, regs->xcr2 |=XFRLEN2 (wpf -1 ); }case 1 : +case 4 :/* Set word per (McBSP) frame for phase1 */ regs->rcr1 |=RFRLEN1 (wpf -1 ); regs->xcr1 |=XFRLEN1 (wpf -1 );
@@ -506,13 +507,13 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = { .id = (link_id), \ .playback = { \ .channels_min = 1, \ - .channels_max = 2, \ + .channels_max = 4, \ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ .capture = { \ .channels_min = 1, \ - .channels_max = 2, \ + .channels_max = 4, \ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \
Signature · 1 line
1.5.6.3
PATCH 21/21 ASoC: TWL4030: Add 4 channel TDM support
In reply to Mark BrownFrom: Peter Ujfalusi <[email protected]>
Support for 4 channel TDM (SND_SOC_DAIFMT_DSP_A) for twl4030 codec.
The channel allocations are:
Playback:
TDM i2s TWL RX Channel 1 Left SDRL2 Channel 3 Right SDRR2 Channel 2 -- SDRL1 Channel 4 -- SDRR1
Capture:
TDM i2s TWL TX Channel 1 Left TXL1 Channel 3 Right TXR1 Channel 2 -- TXL2 Channel 4 -- TXR2
--- sound/soc/codecs/twl4030.c | 52 ++++++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/twl4030.h | 11 +++++++++ 2 files changed, 61 insertions(+), 2 deletions(-)
sound/soc/codecs/twl4030.c +50 -2
@@ -1251,6 +1251,28 @@ static void twl4030_constraints(struct twl4030_priv *twl4030, twl4030->channels); } +/* In case of 4 channel mode, the RX1 L/R for playback and the TX2 L/R for +* capture has to be enabled/disabled. */ +static void twl4030_tdm_enable (struct snd_soc_codec *codec,int direction, +int enable) +{ +u8 reg, mask; + + reg =twl4030_read_reg_cache (codec,TWL4030_REG_OPTION ); + +if (direction ==SNDRV_PCM_STREAM_PLAYBACK ) + mask =TWL4030_ARXL1_VRX_EN |TWL4030_ARXR1_EN ; +else + mask =TWL4030_ATXL2_VTXL_EN |TWL4030_ATXR2_VTXR_EN ; + +if (enable) + reg |= mask; +else + reg &= ~mask; + +twl4030_write (codec,TWL4030_REG_OPTION , reg); +} +static int twl4030_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {
@@ -1267,6 +1289,15 @@ static int twl4030_startup(struct snd_pcm_substream *substream,if (twl4030->configured)twl4030_constraints (twl4030, twl4030->master_substream); }else { +if (!(twl4030_read_reg_cache (codec,TWL4030_REG_CODEC_MODE ) & +TWL4030_OPTION_1 )) { +/* In option2 4 channel is not supported, set the +* constraint for the first stream for channels, the +* second stream will 'inherit' this cosntraint */ +snd_pcm_hw_constraint_minmax (substream->runtime, +SNDRV_PCM_HW_PARAM_CHANNELS , +2 ,2 ); + } twl4030->master_substream = substream; }
@@ -1292,6 +1323,10 @@ static void twl4030_shutdown(struct snd_pcm_substream *substream, twl4030->configured =0 ; else if (!twl4030->master_substream->runtime->channels) twl4030->configured =0 ; + +/* If the closing substream had 4 channel, do the necessary cleanup */ +if (substream->runtime->channels ==4 ) +twl4030_tdm_enable (codec, substream->stream,0 ); } static int twl4030_hw_params(struct snd_pcm_substream *substream,
@@ -1304,6 +1339,16 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream,struct twl4030_priv *twl4030 = codec->private_data;u8 mode, old_mode, format, old_format; +/* If the substream has 4 channel, do the necessary setup */ +if (params_channels (params) ==4 ) { +/* Safety check: are we in the correct operating mode? */ +if ((twl4030_read_reg_cache (codec,TWL4030_REG_CODEC_MODE ) & +TWL4030_OPTION_1 )) +twl4030_tdm_enable (codec, substream->stream,1 ); +else +return -EINVAL ; + } +if (twl4030->configured)/* Ignoring hw_params for already configured DAI */ return 0 ;
@@ -1461,6 +1506,9 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai,case SND_SOC_DAIFMT_I2S : format |=TWL4030_AIF_FORMAT_CODEC ;break ; +case SND_SOC_DAIFMT_DSP_A : + format |=TWL4030_AIF_FORMAT_TDM ; +break ;default :return -EINVAL ; }
@@ -1642,13 +1690,13 @@ struct snd_soc_dai twl4030_dai[] = { .playback = { .stream_name = "Playback", .channels_min = 2, - .channels_max = 2, + .channels_max = 4, .rates = TWL4030_RATES | SNDRV_PCM_RATE_96000, .formats = TWL4030_FORMATS,}, .capture = { .stream_name = "Capture", .channels_min = 2, - .channels_max = 2, + .channels_max = 4, .rates = TWL4030_RATES, .formats = TWL4030_FORMATS,}, .ops = &twl4030_dai_ops,
sound/soc/codecs/twl4030.h +11 -0
@@ -116,6 +116,17 @@#define TWL4030_OPTION_1 (1 << 0)#define TWL4030_OPTION_2 (0 << 0) +/* TWL4030_OPTION (0x02) Fields */ + +#define TWL4030_ATXL1_EN (1 << 0) +#define TWL4030_ATXR1_EN (1 << 1) +#define TWL4030_ATXL2_VTXL_EN (1 << 2) +#define TWL4030_ATXR2_VTXR_EN (1 << 3) +#define TWL4030_ARXL1_VRX_EN (1 << 4) +#define TWL4030_ARXR1_EN (1 << 5) +#define TWL4030_ARXL2_EN (1 << 6) +#define TWL4030_ARXR2_EN (1 << 7) +/* TWL4030_REG_MICBIAS_CTL (0x04) Fields */ #define TWL4030_MICBIAS2_CTL 0x40
Signature · 1 line
1.5.6.3
At Thu, 23 Apr 2009 20:54:20 +0100,
Quoted 8 lines · Mark Brown
The following changes since commit
9b5b0c01598f9782690b09ce6c49f4ba116dde44:
Mark Brown (1):Merge branch 'for-2.6.30' into for-2.6.31are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.gitfor-2.6.31
Pulled now to topic/asoc branch. Thanks.
Takashi
Quoted 52 lines
Eric Miao (2):
ASoC: simplify the SSP DMA parameters settings by run-time generation
ASoC: change stereo/mono to 32-bit/16-bit for pxa-sspJoonyoung Shim (2):
ASoC: OMAP: Add checking to detect bufferless pcms
ASoC: TWL4030: Add VDL path supportMark Brown (16):
ASoC: Factor out generic widget power checks
ASoC: Factor out DAPM power checks for DACs and ADCs
ASoC: Make the DAPM power check an operation on the widget
ASoC: Fix offset of freqmode in WM8580 PLL configuration
ASoC: Fix WM8580 volume update handling for large register changes
ASoC: Add power supply widget to DAPM
ASoC: Use DAPM supply widget for WM8903 charge pump
ASoC: SupportCLK_DSPin WM8903
ASoC: Optimise configuration of WM8903 DC servo
ASoC: Actively manage the DC servo for WM8903
ASoC: Remove redundant rate constraint for WM8903
ASoC: Implement WM8903 digital sidetone support
Merge commit 'takashi/fix/asoc' into for-2.6.30
Merge branch 'for-2.6.30' into for-2.6.31
ASoC: s3c-i2s-v2 needs to declare a license for modular builds Merge branch 'for-2.6.30' into for-2.6.31Peter Ujfalusi (2):
ASoC: OMAP: Add 4 channel support to mcbsp
ASoC: TWL4030: Add 4 channel TDM supportRussell King - ARM Linux (1):
ASoC: Fix warning in wm9705Takashi Iwai (1):
ASoC: remove non-existing referece toCONFIG_SND_SOC_CODEC_WM8991Documentation/sound/alsa/soc/dapm.txt | 1 + include/sound/soc-dapm.h | 9 +- sound/soc/codecs/Makefile | 1 - sound/soc/codecs/twl4030.c | 308 +++++++++++++++++++-------------- sound/soc/codecs/twl4030.h | 11 ++ sound/soc/codecs/wm8580.c | 16 +- sound/soc/codecs/wm8903.c | 118 ++++++++----- sound/soc/codecs/wm9705.c | 2 +- sound/soc/omap/omap-mcbsp.c | 5 +- sound/soc/omap/omap-pcm.c | 9 +- sound/soc/pxa/pxa-ssp.c | 203 +++++----------------- sound/soc/s3c24xx/s3c-i2s-v2.c | 3 +- sound/soc/soc-dapm.c | 139 +++++++++++----- 13 files changed, 438 insertions(+), 387 deletions(-)