ASoC: arizona: Add a couple of missing consts
Subsystems (3)
PATCH 1/4 ASoC: arizona: Add a couple of missing consts
--- sound/soc/codecs/arizona.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/arizona.c +4 -4
@@ -630,7 +630,7 @@ const struct soc_enum arizona_asrc_rate1 = arizona_rate_text, arizona_rate_val);EXPORT_SYMBOL_GPL (arizona_asrc_rate1); -static const char *arizona_vol_ramp_text[] = { +static const char *const arizona_vol_ramp_text[] = {"0ms/6dB" ,"0.5ms/6dB" ,"1ms/6dB" ,"2ms/6dB" ,"4ms/6dB" ,"8ms/6dB" ,"15ms/6dB" ,"30ms/6dB" , };
@@ -659,7 +659,7 @@ SOC_ENUM_SINGLE_DECL(arizona_out_vi_ramp, arizona_vol_ramp_text);EXPORT_SYMBOL_GPL (arizona_out_vi_ramp); -static const char *arizona_lhpf_mode_text[] = { +static const char *const arizona_lhpf_mode_text[] = {"Low-pass" ,"High-pass" };
@@ -687,7 +687,7 @@ SOC_ENUM_SINGLE_DECL(arizona_lhpf4_mode, arizona_lhpf_mode_text);EXPORT_SYMBOL_GPL (arizona_lhpf4_mode); -static const char *arizona_ng_hold_text[] = { +static const char *const arizona_ng_hold_text[] = {"30ms" ,"120ms" ,"250ms" ,"500ms" , };
@@ -1764,7 +1764,7 @@ restore_aif:return ret; } -static const char *arizona_dai_clk_str (int clk_id) +static const char *const arizona_dai_clk_str (int clk_id) {switch (clk_id) {case ARIZONA_CLK_SYSCLK :
Signature · 1 line
2.1.4
PATCH 2/4 ASoC: wm5110: Add missing route from OUT3R to SYSCLK
From: Ajit Pandey <[email protected]>
Output 3 is stereo on wm5110 and all inputs/outputs should have a connection to SYSCLK. This patch adds the missing DAPM route.
--- sound/soc/codecs/wm5110.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wm5110.c +1 -0
@@ -1728,6 +1728,7 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { { "OUT2L", NULL, "SYSCLK" }, { "OUT2R", NULL, "SYSCLK" }, { "OUT3L", NULL, "SYSCLK" }, + { "OUT3R", NULL, "SYSCLK" }, { "OUT4L", NULL, "SYSCLK" }, { "OUT4R", NULL, "SYSCLK" }, { "OUT5L", NULL, "SYSCLK" },
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: wm5110: Add missing route from OUT3R to SYSCLK" to the asoc tree
The patch
ASoC: wm5110: Add missing route from OUT3R to SYSCLK
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
d72fea6214f3fee2355d8cb6c51348059d98768bMon Sep 17 00:00:00 2001
From: Ajit Pandey <[email protected]>
Date: Mon, 13 Jun 2016 13:35:15 +0100
Subject: [PATCH] ASoC: wm5110: Add missing route from OUT3R to SYSCLK
Output 3 is stereo on wm5110 and all inputs/outputs should have a connection to SYSCLK. This patch adds the missing DAPM route.
--- sound/soc/codecs/wm5110.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wm5110.c +1 -0
@@ -1723,6 +1723,7 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { { "OUT2L", NULL, "SYSCLK" }, { "OUT2R", NULL, "SYSCLK" }, { "OUT3L", NULL, "SYSCLK" }, + { "OUT3R", NULL, "SYSCLK" }, { "OUT4L", NULL, "SYSCLK" }, { "OUT4R", NULL, "SYSCLK" }, { "OUT5L", NULL, "SYSCLK" },
Signature · 1 line
2.8.1
PATCH 3/4 ASoC: wm5102: Correct supported channels on trace compressed DAI
In reply to Charles KeepaxThe audio trace firmware on wm5102 only supports 4 channels correct the DAI driver structure to reflect this.
--- sound/soc/codecs/wm5102.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm5102.c +1 -1
@@ -1873,7 +1873,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = { .capture = { .stream_name = "Audio Trace CPU", .channels_min = 1, - .channels_max = 6, + .channels_max = 4, .rates = WM5102_RATES, .formats = WM5102_FORMATS, },
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: wm5102: Correct supported channels on trace compressed DAI" to the asoc tree
The patch
ASoC: wm5102: Correct supported channels on trace compressed DAI
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
19edeb30c55079c9bba4573d700bbcafed03303cMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 13 Jun 2016 13:35:16 +0100
Subject: [PATCH] ASoC: wm5102: Correct supported channels on trace compressed
DAI
The audio trace firmware on wm5102 only supports 4 channels correct the DAI driver structure to reflect this.
--- sound/soc/codecs/wm5102.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm5102.c +1 -1
@@ -1872,7 +1872,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = { .capture = { .stream_name = "Audio Trace CPU", .channels_min = 1, - .channels_max = 6, + .channels_max = 4, .rates = WM5102_RATES, .formats = WM5102_FORMATS, },
Signature · 1 line
2.8.1
PATCH 4/4 ASoC: wm5102: Revert manual speaker enable
In reply to Charles KeepaxThe OUT4L and OUT4R widgets are not registered PRE_PMU or POST_PMD events, as such the manual speaker enable on wm5102 does not actually ever run. Furthermore since the issue actually only affected rev B of the silicon which never shipped in volume, simply remove the work around from the code.
--- sound/soc/codecs/arizona.c | 42 ------------------------------------------ sound/soc/codecs/arizona.h | 3 --- 2 files changed, 45 deletions(-)
sound/soc/codecs/arizona.c +0 -42
@@ -85,30 +85,9 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w, {struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);struct arizona *arizona =dev_get_drvdata (codec->dev->parent); -struct arizona_priv *priv =snd_soc_codec_get_drvdata (codec); -bool manual_ena = false;int val; -switch (arizona->type) { -case WM5102 : -switch (arizona->rev) { -case 0 : -break ; -default : - manual_ena = true; -break ; - } -default : -break ; - } -switch (event) { -case SND_SOC_DAPM_PRE_PMU : -if (!priv->spk_ena && manual_ena) { -regmap_write_async (arizona->regmap,0x4f5 ,0x25a ); - priv->spk_ena_pending = true; - } -break ;case SND_SOC_DAPM_POST_PMU : val =snd_soc_read (codec,ARIZONA_INTERRUPT_RAW_STATUS_3 );if (val &ARIZONA_SPK_OVERHEAT_STS ) {
@@ -120,33 +99,12 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w,regmap_update_bits_async (arizona->regmap,ARIZONA_OUTPUT_ENABLES_1 ,1 << w->shift,1 << w->shift); - -if (priv->spk_ena_pending) { -msleep (75 ); -regmap_write_async (arizona->regmap,0x4f5 ,0xda ); - priv->spk_ena_pending = false; - priv->spk_ena++; - }break ;case SND_SOC_DAPM_PRE_PMD : -if (manual_ena) { - priv->spk_ena--; -if (!priv->spk_ena) -regmap_write_async (arizona->regmap, -0x4f5 ,0x25a ); - } -regmap_update_bits_async (arizona->regmap,ARIZONA_OUTPUT_ENABLES_1 ,1 << w->shift,0 );break ; -case SND_SOC_DAPM_POST_PMD : -if (manual_ena) { -if (!priv->spk_ena) -regmap_write_async (arizona->regmap, -0x4f5 ,0x0da ); - } -break ;default :break ; }
sound/soc/codecs/arizona.h +0 -3
@@ -90,9 +90,6 @@ struct arizona_priv {unsigned int out_down_pending;unsigned int out_down_delay; - unsigned int spk_ena:2; - unsigned int spk_ena_pending:1; -unsigned int dvfs_reqs;struct mutex dvfs_lock;bool dvfs_cached;
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: wm5102: Revert manual speaker enable" to the asoc tree
The patch
ASoC: wm5102: Revert manual speaker enable
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
10867b32a1cc2fb0b370c3d3601fccc587165128Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 13 Jun 2016 13:35:17 +0100
Subject: [PATCH] ASoC: wm5102: Revert manual speaker enable
The OUT4L and OUT4R widgets are not registered PRE_PMU or POST_PMD events, as such the manual speaker enable on wm5102 does not actually ever run. Furthermore since the issue actually only affected rev B of the silicon which never shipped in volume, simply remove the work around from the code.
--- sound/soc/codecs/arizona.c | 42 ------------------------------------------ sound/soc/codecs/arizona.h | 3 --- 2 files changed, 45 deletions(-)
sound/soc/codecs/arizona.c +0 -42
@@ -85,30 +85,9 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w, {struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm);struct arizona *arizona =dev_get_drvdata (codec->dev->parent); -struct arizona_priv *priv =snd_soc_codec_get_drvdata (codec); -bool manual_ena = false;int val; -switch (arizona->type) { -case WM5102 : -switch (arizona->rev) { -case 0 : -break ; -default : - manual_ena = true; -break ; - } -default : -break ; - } -switch (event) { -case SND_SOC_DAPM_PRE_PMU : -if (!priv->spk_ena && manual_ena) { -regmap_write_async (arizona->regmap,0x4f5 ,0x25a ); - priv->spk_ena_pending = true; - } -break ;case SND_SOC_DAPM_POST_PMU : val =snd_soc_read (codec,ARIZONA_INTERRUPT_RAW_STATUS_3 );if (val &ARIZONA_SPK_OVERHEAT_STS ) {
@@ -120,33 +99,12 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w,regmap_update_bits_async (arizona->regmap,ARIZONA_OUTPUT_ENABLES_1 ,1 << w->shift,1 << w->shift); - -if (priv->spk_ena_pending) { -msleep (75 ); -regmap_write_async (arizona->regmap,0x4f5 ,0xda ); - priv->spk_ena_pending = false; - priv->spk_ena++; - }break ;case SND_SOC_DAPM_PRE_PMD : -if (manual_ena) { - priv->spk_ena--; -if (!priv->spk_ena) -regmap_write_async (arizona->regmap, -0x4f5 ,0x25a ); - } -regmap_update_bits_async (arizona->regmap,ARIZONA_OUTPUT_ENABLES_1 ,1 << w->shift,0 );break ; -case SND_SOC_DAPM_POST_PMD : -if (manual_ena) { -if (!priv->spk_ena) -regmap_write_async (arizona->regmap, -0x4f5 ,0x0da ); - } -break ;default :break ; }
sound/soc/codecs/arizona.h +0 -3
@@ -87,9 +87,6 @@ struct arizona_priv {unsigned int out_down_pending;unsigned int out_down_delay; - unsigned int spk_ena:2; - unsigned int spk_ena_pending:1; -unsigned int dvfs_reqs;struct mutex dvfs_lock;bool dvfs_cached;
Signature · 1 line
2.8.1
Mark Brown
maintainerApplied "ASoC: arizona: Add a couple of missing consts" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: arizona: Add a couple of missing consts
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
a3178a3ed7986f44be7502d7dc6091ff932d9776Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 13 Jun 2016 13:35:14 +0100
Subject: [PATCH] ASoC: arizona: Add a couple of missing consts
--- sound/soc/codecs/arizona.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/arizona.c +4 -4
@@ -619,7 +619,7 @@ const struct soc_enum arizona_asrc_rate1 = arizona_rate_text, arizona_rate_val);EXPORT_SYMBOL_GPL (arizona_asrc_rate1); -static const char *arizona_vol_ramp_text[] = { +static const char *const arizona_vol_ramp_text[] = {"0ms/6dB" ,"0.5ms/6dB" ,"1ms/6dB" ,"2ms/6dB" ,"4ms/6dB" ,"8ms/6dB" ,"15ms/6dB" ,"30ms/6dB" , };
@@ -648,7 +648,7 @@ SOC_ENUM_SINGLE_DECL(arizona_out_vi_ramp, arizona_vol_ramp_text);EXPORT_SYMBOL_GPL (arizona_out_vi_ramp); -static const char *arizona_lhpf_mode_text[] = { +static const char *const arizona_lhpf_mode_text[] = {"Low-pass" ,"High-pass" };
@@ -676,7 +676,7 @@ SOC_ENUM_SINGLE_DECL(arizona_lhpf4_mode, arizona_lhpf_mode_text);EXPORT_SYMBOL_GPL (arizona_lhpf4_mode); -static const char *arizona_ng_hold_text[] = { +static const char *const arizona_ng_hold_text[] = {"30ms" ,"120ms" ,"250ms" ,"500ms" , };
@@ -1753,7 +1753,7 @@ restore_aif:return ret; } -static const char *arizona_dai_clk_str (int clk_id) +static const char *const arizona_dai_clk_str (int clk_id) {switch (clk_id) {case ARIZONA_CLK_SYSCLK :
Signature · 1 line
2.8.1