ASoC: arizona: Add default cases for event switches
Subsystems (3)
PATCH 1/4 ASoC: arizona: Add default cases for event switches
Since the addition of the WILL_PMU / WILL_PMD several of the switches in arizona.c no longer cover all cases or have a default case. Whilst this isn't causing any problems in the interests of robustness add default cases.
--- sound/soc/codecs/arizona.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
sound/soc/codecs/arizona.c +7 -0
@@ -147,6 +147,8 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w, 0x4f5, 0x0da); }break ; +default : +break ; }return 0 ;
@@ -725,6 +727,9 @@ int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, reg =snd_soc_read (codec,ARIZONA_INPUT_ENABLES );if (reg ==0 )arizona_in_set_vu (codec,0 ); +break ; +default : +break ; }return 0 ;
@@ -806,6 +811,8 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w,break ; }break ; +default : +break ; }return 0 ;
Signature · 1 line
1.7.2.5
PATCH 2/4 ASoC: arizona: Add utility function to check if an input is analog
We will occasionally require to take different action based on if an input is analog or digital so add a helper function to return if an input is analog.
--- sound/soc/codecs/arizona.c | 9 +++++++++ sound/soc/codecs/arizona.h | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-)
sound/soc/codecs/arizona.c +9 -0
@@ -691,6 +691,15 @@ static void arizona_in_set_vu(struct snd_soc_codec *codec, int ena) ARIZONA_IN_VU, val); } +bool arizona_input_analog (struct snd_soc_codec *codec,int shift) +{ +unsigned int reg =ARIZONA_IN1L_CONTROL + ((shift /2 ) *8 ); +unsigned int val =snd_soc_read (codec, reg); + +return !(val &ARIZONA_IN1_MODE_MASK ); +} +EXPORT_SYMBOL_GPL (arizona_input_analog); +int arizona_in_ev (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/codecs/arizona.h +2 -0
@@ -294,4 +294,6 @@ extern int arizona_init_dai(struct arizona_priv *priv, int dai);int arizona_set_output_mode (struct snd_soc_codec *codec,int output,bool diff); +extern bool arizona_input_analog (struct snd_soc_codec *codec,int shift); +#endif
Signature · 1 line
1.7.2.5
Mark Brown
maintainerApplied "ASoC: arizona: Add utility function to check if an input is analog" to the asoc tree
The patch
ASoC: arizona: Add utility function to check if an input is analog
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
002b083b8da96fd6c546fab2608803e7ce47627dMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Wed, 16 Sep 2015 13:59:41 +0100
Subject: [PATCH] ASoC: arizona: Add utility function to check if an input is
analog
We will occasionally require to take different action based on if an input is analog or digital so add a helper function to return if an input is analog.
--- sound/soc/codecs/arizona.c | 9 +++++++++ sound/soc/codecs/arizona.h | 2 ++ 2 files changed, 11 insertions(+)
sound/soc/codecs/arizona.c +9 -0
@@ -691,6 +691,15 @@ static void arizona_in_set_vu(struct snd_soc_codec *codec, int ena) ARIZONA_IN_VU, val); } +bool arizona_input_analog (struct snd_soc_codec *codec,int shift) +{ +unsigned int reg =ARIZONA_IN1L_CONTROL + ((shift /2 ) *8 ); +unsigned int val =snd_soc_read (codec, reg); + +return !(val &ARIZONA_IN1_MODE_MASK ); +} +EXPORT_SYMBOL_GPL (arizona_input_analog); +int arizona_in_ev (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/codecs/arizona.h +2 -0
@@ -294,4 +294,6 @@ extern int arizona_init_dai(struct arizona_priv *priv, int dai);int arizona_set_output_mode (struct snd_soc_codec *codec,int output,bool diff); +extern bool arizona_input_analog (struct snd_soc_codec *codec,int shift); +#endif
Signature · 1 line
2.5.0
PATCH 3/4 ASoC: Add SOC_SINGLE_RANGE_EXT_TLV macro
In reply to Charles KeepaxAdd a version of the SOC_SINGLE_RANGE_TLV macro that allows a custom get and put to be specified.
--- include/sound/soc.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
include/sound/soc.h +12 -0
@@ -226,6 +226,18 @@ .info = snd_soc_info_volsw, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert, 0) } +#define SOC_SINGLE_RANGE_EXT_TLV (xname, xreg, xshift, xmin, xmax, xinvert, \ + xhandler_get, xhandler_put, 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_range, \ + .get = xhandler_get, .put = xhandler_put, \ + .private_value = (unsigned long)&(struct soc_mixer_control) \ + {.reg = xreg, .rreg = xreg, .shift = xshift, \ + .rshift = xshift, .min = xmin, .max = xmax, \ + .platform_max = xmax, .invert = xinvert} }#define SOC_DOUBLE_EXT_TLV (xname, xreg, shift_left, shift_right, xmax, xinvert,\ xhandler_get, xhandler_put, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
Signature · 1 line
1.7.2.5
Mark Brown
maintainerApplied "ASoC: Add SOC_SINGLE_RANGE_EXT_TLV macro" to the asoc tree
The patch
ASoC: Add SOC_SINGLE_RANGE_EXT_TLV macro
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
a54e22f40480eb63533d3f0520e9c84b102dd09fMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Wed, 16 Sep 2015 13:59:42 +0100
Subject: [PATCH] ASoC: Add SOC_SINGLE_RANGE_EXT_TLV macro
Add a version of the SOC_SINGLE_RANGE_TLV macro that allows a custom get and put to be specified.
--- include/sound/soc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/sound/soc.h +12 -0
@@ -226,6 +226,18 @@ .info = snd_soc_info_volsw, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert, 0) } +#define SOC_SINGLE_RANGE_EXT_TLV (xname, xreg, xshift, xmin, xmax, xinvert, \ + xhandler_get, xhandler_put, 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_range, \ + .get = xhandler_get, .put = xhandler_put, \ + .private_value = (unsigned long)&(struct soc_mixer_control) \ + {.reg = xreg, .rreg = xreg, .shift = xshift, \ + .rshift = xshift, .min = xmin, .max = xmax, \ + .platform_max = xmax, .invert = xinvert} }#define SOC_DOUBLE_EXT_TLV (xname, xreg, shift_left, shift_right, xmax, xinvert,\ xhandler_get, xhandler_put, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
Signature · 1 line
2.5.0
PATCH 4/4 ASoC: wm5110: Add additional analogue input enable for early revs
In reply to Charles KeepaxEarlier revisions of the wm5110/8280 silicon require a slightly more complex procedure to enable analogue inputs. This patch adds this into the driver.
--- sound/soc/codecs/wm5110.c | 179 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 155 insertions(+), 24 deletions(-)
sound/soc/codecs/wm5110.c +155 -24
@@ -38,6 +38,12 @@struct wm5110_priv {struct arizona_priv core;struct arizona_fll fll[2 ]; + +unsigned int in_value; +int in_pre_pending; +int in_post_pending; + +unsigned int in_pga_cache[6 ]; };static const struct wm_adsp_region wm5110_dsp1_regions[] = {
@@ -428,6 +434,119 @@ err:return ret; } +static int wm5110_in_pga_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol); +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec); +struct snd_soc_card *card = dapm->card; +int ret; + +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); + + ret =snd_soc_get_volsw_range (kcontrol, ucontrol); + +mutex_unlock (&card->dapm_mutex); + +return ret; +} + +static int wm5110_in_pga_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol); +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec); +struct snd_soc_card *card = dapm->card; +int ret; + +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); + + ret =snd_soc_put_volsw_range (kcontrol, ucontrol); + +mutex_unlock (&card->dapm_mutex); + +return ret; +} + +static int wm5110_in_analog_ev (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event) +{ +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); +struct arizona_priv *priv =snd_soc_codec_get_drvdata (codec); +struct wm5110_priv *wm5110 =snd_soc_codec_get_drvdata (codec); +struct arizona *arizona = priv->arizona; +unsigned int reg, mask; +struct reg_sequence analog_seq[] = { + {0x80 ,0x3 }, + {0x35d ,0 }, + {0x80 ,0x0 }, + }; + + reg =ARIZONA_IN1L_CONTROL + ((w->shift ^0x1 ) *4 ); + mask =ARIZONA_IN1L_PGA_VOL_MASK ; + +switch (event) { +case SND_SOC_DAPM_WILL_PMU : + wm5110->in_value |=0x3 << ((w->shift ^0x1 ) *2 ); + wm5110->in_pre_pending++; + wm5110->in_post_pending++; +return 0 ; +case SND_SOC_DAPM_PRE_PMU : + wm5110->in_pga_cache[w->shift] =snd_soc_read (codec, reg); + +snd_soc_update_bits (codec, reg, mask, +0x40 <<ARIZONA_IN1L_PGA_VOL_SHIFT ); + + wm5110->in_pre_pending--; +if (wm5110->in_pre_pending ==0 ) { + analog_seq[1 ].def = wm5110->in_value; +regmap_multi_reg_write_bypassed (arizona->regmap, + analog_seq, +ARRAY_SIZE (analog_seq)); + +msleep (55 ); + + wm5110->in_value =0 ; + } + +break ; +case SND_SOC_DAPM_POST_PMU : +snd_soc_update_bits (codec, reg, mask, + wm5110->in_pga_cache[w->shift]); + + wm5110->in_post_pending--; +if (wm5110->in_post_pending ==0 ) +regmap_multi_reg_write_bypassed (arizona->regmap, + analog_seq, +ARRAY_SIZE (analog_seq)); +break ; +default : +break ; + } + +return 0 ; +} + +static int wm5110_in_ev (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event) +{ +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); +struct arizona_priv *priv =snd_soc_codec_get_drvdata (codec); +struct arizona *arizona = priv->arizona; + +switch (arizona->rev) { + case 0 ... 4: +if (arizona_input_analog (codec, w->shift)) +wm5110_in_analog_ev (w, kcontrol, event); + +break ; +default : +break ; + } + +return arizona_in_ev (w, kcontrol, event); +} + static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0); static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);
@@ -454,18 +573,24 @@ SOC_ENUM("IN2 OSR", arizona_in_dmic_osr[1]),SOC_ENUM ("IN3 OSR" , arizona_in_dmic_osr[2 ]),SOC_ENUM ("IN4 OSR" , arizona_in_dmic_osr[3 ]), -SOC_SINGLE_RANGE_TLV ("IN1L Volume" ,ARIZONA_IN1L_CONTROL , -ARIZONA_IN1L_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , ana_tlv), -SOC_SINGLE_RANGE_TLV ("IN1R Volume" ,ARIZONA_IN1R_CONTROL , -ARIZONA_IN1R_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , ana_tlv), -SOC_SINGLE_RANGE_TLV ("IN2L Volume" ,ARIZONA_IN2L_CONTROL , -ARIZONA_IN2L_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , ana_tlv), -SOC_SINGLE_RANGE_TLV ("IN2R Volume" ,ARIZONA_IN2R_CONTROL , -ARIZONA_IN2R_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , ana_tlv), -SOC_SINGLE_RANGE_TLV ("IN3L Volume" ,ARIZONA_IN3L_CONTROL , -ARIZONA_IN3L_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , ana_tlv), -SOC_SINGLE_RANGE_TLV ("IN3R Volume" ,ARIZONA_IN3R_CONTROL , -ARIZONA_IN3R_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , ana_tlv), +SOC_SINGLE_RANGE_EXT_TLV ("IN1L Volume" ,ARIZONA_IN1L_CONTROL , +ARIZONA_IN1L_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , + wm5110_in_pga_get, wm5110_in_pga_put, ana_tlv), +SOC_SINGLE_RANGE_EXT_TLV ("IN1R Volume" ,ARIZONA_IN1R_CONTROL , +ARIZONA_IN1R_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , + wm5110_in_pga_get, wm5110_in_pga_put, ana_tlv), +SOC_SINGLE_RANGE_EXT_TLV ("IN2L Volume" ,ARIZONA_IN2L_CONTROL , +ARIZONA_IN2L_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , + wm5110_in_pga_get, wm5110_in_pga_put, ana_tlv), +SOC_SINGLE_RANGE_EXT_TLV ("IN2R Volume" ,ARIZONA_IN2R_CONTROL , +ARIZONA_IN2R_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , + wm5110_in_pga_get, wm5110_in_pga_put, ana_tlv), +SOC_SINGLE_RANGE_EXT_TLV ("IN3L Volume" ,ARIZONA_IN3L_CONTROL , +ARIZONA_IN3L_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , + wm5110_in_pga_get, wm5110_in_pga_put, ana_tlv), +SOC_SINGLE_RANGE_EXT_TLV ("IN3R Volume" ,ARIZONA_IN3R_CONTROL , +ARIZONA_IN3R_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , + wm5110_in_pga_get, wm5110_in_pga_put, ana_tlv), SOC_ENUM("IN HPF Cutoff Frequency", arizona_in_hpf_cut_enum),
@@ -896,29 +1021,35 @@ SND_SOC_DAPM_OUTPUT("DRC1 Signal Activity"),SND_SOC_DAPM_OUTPUT ("DRC2 Signal Activity" ),SND_SOC_DAPM_PGA_E ("IN1L PGA" ,ARIZONA_INPUT_ENABLES ,ARIZONA_IN1L_ENA_SHIFT , -0 ,NULL ,0 , arizona_in_ev, +0 ,NULL ,0 , wm5110_in_ev,SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD | -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU ), +SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | +SND_SOC_DAPM_WILL_PMU ),SND_SOC_DAPM_PGA_E ("IN1R PGA" ,ARIZONA_INPUT_ENABLES ,ARIZONA_IN1R_ENA_SHIFT , -0 ,NULL ,0 , arizona_in_ev, +0 ,NULL ,0 , wm5110_in_ev,SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD | -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU ), +SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | +SND_SOC_DAPM_WILL_PMU ),SND_SOC_DAPM_PGA_E ("IN2L PGA" ,ARIZONA_INPUT_ENABLES ,ARIZONA_IN2L_ENA_SHIFT , -0 ,NULL ,0 , arizona_in_ev, +0 ,NULL ,0 , wm5110_in_ev,SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD | -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU ), +SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | +SND_SOC_DAPM_WILL_PMU ),SND_SOC_DAPM_PGA_E ("IN2R PGA" ,ARIZONA_INPUT_ENABLES ,ARIZONA_IN2R_ENA_SHIFT , -0 ,NULL ,0 , arizona_in_ev, +0 ,NULL ,0 , wm5110_in_ev,SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD | -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU ), +SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | +SND_SOC_DAPM_WILL_PMU ),SND_SOC_DAPM_PGA_E ("IN3L PGA" ,ARIZONA_INPUT_ENABLES ,ARIZONA_IN3L_ENA_SHIFT , -0 ,NULL ,0 , arizona_in_ev, +0 ,NULL ,0 , wm5110_in_ev,SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD | -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU ), +SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | +SND_SOC_DAPM_WILL_PMU ),SND_SOC_DAPM_PGA_E ("IN3R PGA" ,ARIZONA_INPUT_ENABLES ,ARIZONA_IN3R_ENA_SHIFT , -0 ,NULL ,0 , arizona_in_ev, +0 ,NULL ,0 , wm5110_in_ev,SND_SOC_DAPM_PRE_PMD |SND_SOC_DAPM_POST_PMD | -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU ), +SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | +SND_SOC_DAPM_WILL_PMU ), SND_SOC_DAPM_PGA_E("IN4L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN4L_ENA_SHIFT, 0, NULL, 0, arizona_in_ev, SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
Signature · 1 line
1.7.2.5
Mark Brown
maintainerRe: [PATCH 4/4] ASoC: wm5110: Add additional analogue input enable for early revs
sound/soc/codecs/wm5110.c err: · line 449
Quoted 13 lines · Charles Keepax
sound/soc/codecs/wm5110.c +13
-0+static int wm5110_in_pga_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol); +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec); +struct snd_soc_card *card = dapm->card; +int ret; + +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); + + ret =snd_soc_get_volsw_range (kcontrol, ucontrol); + +mutex_unlock (&card->dapm_mutex);
Can we please have a comment explaining why we need the lock (I see why but someone reading the code in the future might not)?
Re: [PATCH 4/4] ASoC: wm5110: Add additional analogue input enable for early revs
Quoted 18 lines · Mark Brown
sound/soc/codecs/wm5110.c err: · line 449
Quoted 13 lines · Charles Keepax
sound/soc/codecs/wm5110.c +13
-0+static int wm5110_in_pga_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_codec *codec =snd_soc_kcontrol_codec (kcontrol); +struct snd_soc_dapm_context *dapm =snd_soc_codec_get_dapm (codec); +struct snd_soc_card *card = dapm->card; +int ret; + +mutex_lock_nested (&card->dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME ); + + ret =snd_soc_get_volsw_range (kcontrol, ucontrol); + +mutex_unlock (&card->dapm_mutex);Can we please have a comment explaining why we need the lock (I see why but someone reading the code in the future might not)?
Yes no problem will fire a new version out today.
Thanks,
Charles
Mark Brown
maintainerApplied "ASoC: arizona: Add default cases for event switches" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: arizona: Add default cases for event switches
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
bee261b8964d7751fdd63d7f636c42741294a30cMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Wed, 16 Sep 2015 13:59:40 +0100
Subject: [PATCH] ASoC: arizona: Add default cases for event switches
Since the addition of the WILL_PMU / WILL_PMD several of the switches in arizona.c no longer cover all cases or have a default case. Whilst this isn't causing any problems in the interests of robustness add default cases.
--- sound/soc/codecs/arizona.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/codecs/arizona.c +7 -0
@@ -147,6 +147,8 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w, 0x4f5, 0x0da); }break ; +default : +break ; }return 0 ;
@@ -725,6 +727,9 @@ int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, reg =snd_soc_read (codec,ARIZONA_INPUT_ENABLES );if (reg ==0 )arizona_in_set_vu (codec,0 ); +break ; +default : +break ; }return 0 ;
@@ -806,6 +811,8 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w,break ; }break ; +default : +break ; }return 0 ;
Signature · 1 line
2.5.0