ASoC: wm8985: add support for WM8758
Subsystems (3)
v3 cover ASoC: wm8985: add support for WM8758
The WM8758 chip is almost identical to WM8985 with the difference that it doesn't feature the AUX input. This patch set adds the WM8758 support into the WM8985 driver.
Changes in v3:
* merge the wm8985_xxx_snd_controls into wm8985_common_snd_controls and wm8985_specific_snd_controls in order to reduce the number of structures
use the static initialization in snd_soc_codec_driver for the common part
PATCH v3 1/2 ASoC: wm8985: add register definitions for WM8758
The WM8758 chip is almost identical to WM8985 with the difference that it doesn't feature the AUX input. This patch adds the register definitions for WM8758 specific bit fields to the header file.
---
v1: initial
v2: no change
v3: no change
sound/soc/codecs/wm8985.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
sound/soc/codecs/wm8985.h +38 -0
@@ -290,6 +290,9 @@#define WM8985_GPIO1GPD_MASK 0x0040/* GPIO1GPD */ #define WM8985_GPIO1GPD_SHIFT 6/* GPIO1GPD */ #define WM8985_GPIO1GPD_WIDTH 1/* GPIO1GPD */ +#define WM8758_OPCLKDIV_MASK 0x0030/* OPCLKDIV - [1:0] */ +#define WM8758_OPCLKDIV_SHIFT 4/* OPCLKDIV - [1:0] */ +#define WM8758_OPCLKDIV_WIDTH 2/* OPCLKDIV - [1:0] */ #define WM8985_GPIO1POL 0x0008/* GPIO1POL */ #define WM8985_GPIO1POL_MASK 0x0008/* GPIO1POL */ #define WM8985_GPIO1POL_SHIFT 3/* GPIO1POL */
@@ -301,6 +304,12 @@/* * R9 (0x09) - Jack Detect Control 1 */ +#define WM8758_JD_VMID1_MASK 0x0100/* JD_VMID1 */ +#define WM8758_JD_VMID1_SHIFT 8/* JD_VMID1 */ +#define WM8758_JD_VMID1_WIDTH 1/* JD_VMID1 */ +#define WM8758_JD_VMID0_MASK 0x0080/* JD_VMID0 */ +#define WM8758_JD_VMID0_SHIFT 7/* JD_VMID0 */ +#define WM8758_JD_VMID0_WIDTH 1/* JD_VMID0 */ #define WM8985_JD_EN 0x0040/* JD_EN */ #define WM8985_JD_EN_MASK 0x0040/* JD_EN */ #define WM8985_JD_EN_SHIFT 6/* JD_EN */
@@ -649,6 +658,12 @@#define WM8985_OUT4_2LNR_MASK 0x0020/* OUT4_2LNR */ #define WM8985_OUT4_2LNR_SHIFT 5/* OUT4_2LNR */ #define WM8985_OUT4_2LNR_WIDTH 1/* OUT4_2LNR */ +#define WM8758_VMIDTOG_MASK 0x0010/* VMIDTOG */ +#define WM8758_VMIDTOG_SHIFT 4/* VMIDTOG */ +#define WM8758_VMIDTOG_WIDTH 1/* VMIDTOG */ +#define WM8758_OUT2DEL_MASK 0x0008/* OUT2DEL */ +#define WM8758_OUT2DEL_SHIFT 3/* OUT2DEL */ +#define WM8758_OUT2DEL_WIDTH 1/* OUT2DEL */ #define WM8985_POBCTRL 0x0004/* POBCTRL */ #define WM8985_POBCTRL_MASK 0x0004/* POBCTRL */ #define WM8985_POBCTRL_SHIFT 2/* POBCTRL */
@@ -684,6 +699,9 @@#define WM8985_BEEPVOL_MASK 0x000E/* BEEPVOL - [3:1] */ #define WM8985_BEEPVOL_SHIFT 1/* BEEPVOL - [3:1] */ #define WM8985_BEEPVOL_WIDTH 3/* BEEPVOL - [3:1] */ +#define WM8758_DELEN2_MASK 0x0004/* DELEN2 */ +#define WM8758_DELEN2_SHIFT 2/* DELEN2 */ +#define WM8758_DELEN2_WIDTH 1/* DELEN2 */ #define WM8985_BEEPEN 0x0001/* BEEPEN */ #define WM8985_BEEPEN_MASK 0x0001/* BEEPEN */ #define WM8985_BEEPEN_SHIFT 0/* BEEPEN */
@@ -790,6 +808,14 @@/* * R49 (0x31) - Output ctrl */ +#define WM8758_HP_COM 0x0100/* HP_COM */ +#define WM8758_HP_COM_MASK 0x0100/* HP_COM */ +#define WM8758_HP_COM_SHIFT 8/* HP_COM */ +#define WM8758_HP_COM_WIDTH 1/* HP_COM */ +#define WM8758_LINE_COM 0x0080/* LINE_COM */ +#define WM8758_LINE_COM_MASK 0x0080/* LINE_COM */ +#define WM8758_LINE_COM_SHIFT 7/* LINE_COM */ +#define WM8758_LINE_COM_WIDTH 1/* LINE_COM */ #define WM8985_DACL2RMIX 0x0040/* DACL2RMIX */ #define WM8985_DACL2RMIX_MASK 0x0040/* DACL2RMIX */ #define WM8985_DACL2RMIX_SHIFT 6/* DACL2RMIX */
@@ -806,6 +832,14 @@#define WM8985_OUT3BOOST_MASK 0x0008/* OUT3BOOST */ #define WM8985_OUT3BOOST_SHIFT 3/* OUT3BOOST */ #define WM8985_OUT3BOOST_WIDTH 1/* OUT3BOOST */ +#define WM8758_OUT4ENDEL 0x0010/* OUT4ENDEL */ +#define WM8758_OUT4ENDEL_MASK 0x0010/* OUT4ENDEL */ +#define WM8758_OUT4ENDEL_SHIFT 4/* OUT4ENDEL */ +#define WM8758_OUT4ENDEL_WIDTH 1/* OUT4ENDEL */ +#define WM8758_OUT3ENDEL 0x0008/* OUT3ENDEL */ +#define WM8758_OUT3ENDEL_MASK 0x0008/* OUT3ENDEL */ +#define WM8758_OUT3ENDEL_SHIFT 3/* OUT3ENDEL */ +#define WM8758_OUT3ENDEL_WIDTH 1/* OUT3ENDEL */ #define WM8985_TSOPCTRL 0x0004/* TSOPCTRL */ #define WM8985_TSOPCTRL_MASK 0x0004/* TSOPCTRL */ #define WM8985_TSOPCTRL_SHIFT 2/* TSOPCTRL */
@@ -1021,6 +1055,10 @@#define WM8985_HALFIPBIAS_MASK 0x0080/* HALFIPBIAS */ #define WM8985_HALFIPBIAS_SHIFT 7/* HALFIPBIAS */ #define WM8985_HALFIPBIAS_WIDTH 1/* HALFIPBIAS */ +#define WM8758_HALFIPBIAS 0x0040/* HALFI_IPGA */ +#define WM8758_HALFI_IPGA_MASK 0x0040/* HALFI_IPGA */ +#define WM8758_HALFI_IPGA_SHIFT 6/* HALFI_IPGA */ +#define WM8758_HALFI_IPGA_WIDTH 1/* HALFI_IPGA */ #define WM8985_VBBIASTST_MASK 0x0060/* VBBIASTST - [6:5] */ #define WM8985_VBBIASTST_SHIFT 5/* VBBIASTST - [6:5] */ #define WM8985_VBBIASTST_WIDTH 2/* VBBIASTST - [6:5] */
Signature · 1 line
1.9.1
PATCH v3 2/2 ASoC: wm8985: add support for WM8758
In reply to Petr KulhavyThe WM8758 chip is almost identical to WM8985 with the difference that it doesn't feature the AUX input. This patch adds the WM8758 support into the WM8985 driver.
The chip selection is done by the I2C name. The SPI probe supports only the WM8985.
---
v1: initial
v2: use chip type enum instead of chip structure
do not copy the complete controls, widget, routes but only the differences and add widgets dynamically using add_widgets()
v3: merge the wm8985_xxx_snd_controls into wm8985_common_snd_controls and wm8985_specific_snd_controls
in order to reduce the number of structures
use the static initialization in snd_soc_codec_driver for the common part
sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wm8985.c | 160 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 123 insertions(+), 39 deletions(-)
sound/soc/codecs/Kconfig +1 -1
@@ -933,7 +933,7 @@ config SND_SOC_WM8983 tristate config SND_SOC_WM8985 - tristate + tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver" config SND_SOC_WM8988 tristate
sound/soc/codecs/wm8985.c +122 -38
301 lines not on this page · raw message
Signature · 1 line
1.9.1
Quoted 84 lines · Petr Kulhavy
The WM8758 chip is almost identical to WM8985 with the difference that it doesn't feature the AUX input. This patch adds the WM8758 support into the WM8985 driver.
The chip selection is done by the I2C name. The SPI probe supports only the WM8985.
Signed-off-by Petr Kulhavy <[email protected]>---
v1: initial
v2: use chip type enum instead of chip structure
do not copy the complete controls, widget, routes but only the differences and add widgets dynamically usingadd_widgets()
v3: merge thewm8985_xxx_snd_controlsintowm8985_common_snd_controlsandwm8985_specific_snd_controls
in order to reduce the number of structures
use the static initialization insnd_soc_codec_driverfor the common partsound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wm8985.c | 160 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 123 insertions(+), 39 deletions(-)sound/soc/codecs/Kconfig +1
-1@@ -933,7 +933,7 @@ config SND_SOC_WM8983 tristate config SND_SOC_WM8985 - tristate + tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver" config SND_SOC_WM8988 tristatesound/soc/codecs/wm8985.c +12
-3@@ -1,10 +1,13 @@/* -* wm8985.c -- WM8985 ALSA SoC Audio driver +* wm8985.c -- WM8985 / WM8758 ALSA SoC Audio driver * * Copyright 2010 Wolfson Microelectronics plc -* * Author: Dimitris Papastamos <[email protected]> * +* WM8758 support: +* Copyright: 2016 Barix AG +* Author: Petr Kulhavy <[email protected]> +* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -40,6 +43,11 @@ static const char *wm8985_supply_names[WM8985_NUM_SUPPLIES] = {"AVDD2" }; +enum wm8985_type { +WM8985 , +WM8758 , +}; +static const struct reg_default wm8985_reg_defaults[] = { {1 ,0x0000 },/* R1 - Power management 1 */ {2 ,0x0000 },/* R2 - Power management 2 */ @@ -181,6 +189,7 @@ static const int volume_update_regs[] = {struct wm8985_priv {struct regmap *regmap;struct regulator_bulk_data supplies[WM8985_NUM_SUPPLIES ]; +enum wm8985_type dev_type;unsigned int pllout;/* input rate to the MCLKDIV divider */ };@@ -283,7 +292,7 @@ static const char *depth_3d_text[] = { static const SOC_ENUM_SINGLE_DECL(depth_3d, WM8985_3D_CONTROL, 0, depth_3d_text); -static const struct snd_kcontrol_new wm8985_snd_controls[] = { +static const struct snd_kcontrol_new wm8985_common_snd_controls[] = {SOC_SINGLE ("Digital Loopback Switch" ,WM8985_COMPANDING_CONTROL ,0 ,1 ,0 ),
sound/soc/codecs/wm8985.c static const struct snd_kcontrol_new wm8985_snd_controls[] = { · line 332
Quoted 7 lines
sound/soc/codecs/wm8985.c +4
-0@@ -317,6 +326,10 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = {SOC_DOUBLE ("ADC Inversion Switch" ,WM8985_ADC_CONTROL ,0 ,1 ,1 ,0 ),SOC_SINGLE ("ADC 128x Oversampling Switch" ,WM8985_ADC_CONTROL ,8 ,1 ,0 ), +SOC_SINGLE ("High Pass Filter Switch" ,WM8985_ADC_CONTROL ,8 ,1 ,0 ), +SOC_ENUM ("High Pass Filter Mode" , filter_mode), + SOC_SINGLE("High Pass Filter Cutoff", WM8985_ADC_CONTROL, 4, 7, 0), +
Why are these moving? Eases review to keep unrelated changes out of the patch.
Quoted 36 lines
sound/soc/codecs/wm8985.c +6
-9SOC_DOUBLE_R_TLV ("Playback Volume" ,WM8985_LEFT_DAC_DIGITAL_VOL , WM8985_RIGHT_DAC_DIGITAL_VOL, 0, 255, 0, dac_tlv),@@ -344,15 +357,6 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = { WM8985_ROUT2_SPK_VOLUME_CTRL, 7, 1, 0),SOC_DOUBLE_R ("Speaker Switch" ,WM8985_LOUT2_SPK_VOLUME_CTRL ,WM8985_ROUT2_SPK_VOLUME_CTRL ,6 ,1 ,1 ), - -SOC_SINGLE ("High Pass Filter Switch" ,WM8985_ADC_CONTROL ,8 ,1 ,0 ), -SOC_ENUM ("High Pass Filter Mode" , filter_mode), -SOC_SINGLE ("High Pass Filter Cutoff" ,WM8985_ADC_CONTROL ,4 ,7 ,0 ), - -SOC_DOUBLE_R_TLV ("Aux Bypass Volume" , -WM8985_LEFT_MIXER_CTRL ,WM8985_RIGHT_MIXER_CTRL ,6 ,7 ,0 , - aux_tlv), -SOC_DOUBLE_R_TLV ("Input PGA Bypass Volume" ,WM8985_LEFT_MIXER_CTRL ,WM8985_RIGHT_MIXER_CTRL ,2 ,7 ,0 , bypass_tlv),@@ -373,6 +377,12 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = {SOC_SINGLE_TLV ("EQ5 Volume" ,WM8985_EQ5_HIGH_SHELF ,0 ,24 ,1 , eq_tlv), SOC_ENUM("3D Depth", depth_3d), +}; + +static const struct snd_kcontrol_new wm8985_specific_snd_controls[] = { +SOC_DOUBLE_R_TLV ("Aux Bypass Volume" , +WM8985_LEFT_MIXER_CTRL ,WM8985_RIGHT_MIXER_CTRL ,6 ,7 ,0 , + aux_tlv),SOC_ENUM ("Speaker Mode" , speaker_mode) };@@ -389,6 +399,16 @@ static const struct snd_kcontrol_new right_out_mixer[] = { SOC_DAPM_SINGLE("PCM Switch", WM8985_RIGHT_MIXER_CTRL, 0, 1, 0), };
sound/soc/codecs/wm8985.c static const struct snd_kcontrol_new right_out_mixer[] = { · line 411
Quoted 10 lines
sound/soc/codecs/wm8985.c +10
-0+static const struct snd_kcontrol_new wm8758_left_out_mixer[] = { +SOC_DAPM_SINGLE ("Line Switch" ,WM8985_LEFT_MIXER_CTRL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("PCM Switch" ,WM8985_LEFT_MIXER_CTRL ,0 ,1 ,0 ), +}; + +static const struct snd_kcontrol_new wm8758_right_out_mixer[] = { +SOC_DAPM_SINGLE ("Line Switch" ,WM8985_RIGHT_MIXER_CTRL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("PCM Switch" ,WM8985_RIGHT_MIXER_CTRL ,0 ,1 ,0 ), +}; +
I would be tempted to put the "Aux Switch" at the end of the existing array and then just specifying different sizes for each part in the SND_SOC_DAPM_MIXER macro, saves the need to duplicate these.
Quoted 6 lines
sound/soc/codecs/wm8985.c +0
-0static const struct snd_kcontrol_new left_input_mixer[] = {SOC_DAPM_SINGLE ("L2 Switch" ,WM8985_INPUT_CTRL ,2 ,1 ,0 ),SOC_DAPM_SINGLE ("MicN Switch" ,WM8985_INPUT_CTRL ,1 ,1 ,0 ),@@ -401,6 +421,16 @@ static const struct snd_kcontrol_new right_input_mixer[] = { SOC_DAPM_SINGLE("MicP Switch", WM8985_INPUT_CTRL, 4, 1, 0), };
sound/soc/codecs/wm8985.c static const struct snd_kcontrol_new right_input_mixer[] = { · line 432
Quoted 10 lines
sound/soc/codecs/wm8985.c +9
-0+static const struct snd_kcontrol_new wm8758_left_boost_mixer[] = { +SOC_DAPM_SINGLE_TLV ("L2 Volume" ,WM8985_LEFT_ADC_BOOST_CTRL , +4 ,7 ,0 , boost_tlv), +}; + +static const struct snd_kcontrol_new wm8758_right_boost_mixer[] = { +SOC_DAPM_SINGLE_TLV ("R2 Volume" ,WM8985_RIGHT_ADC_BOOST_CTRL , +4 ,7 ,0 , boost_tlv), +};
Ditto.
Apart from those minor comments this looks good to me though.
Thanks,
Charles
Hi Charles,
thanks a lot for your comments.
Quoted 5 lines · Charles Keepax
Quoted 4 lines · Petr Kulhavy
sound/soc/codecs/wm8985.c +0
-0@@ -317,6 +326,10 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = {SOC_DOUBLE ("ADC Inversion Switch" ,WM8985_ADC_CONTROL ,0 ,1 ,1 ,0 ), SOC_SINGLE("ADC 128x Oversampling Switch", WM8985_ADC_CONTROL, 8, 1, 0),
Quoted 7 lines
sound/soc/codecs/wm8985.c static const struct snd_kcontrol_new wm8985_snd_controls[] = { · line 332
Quoted 4 lines
sound/soc/codecs/wm8985.c +4
-0+SOC_SINGLE ("High Pass Filter Switch" ,WM8985_ADC_CONTROL ,8 ,1 ,0 ), +SOC_ENUM ("High Pass Filter Mode" , filter_mode), + SOC_SINGLE("High Pass Filter Cutoff", WM8985_ADC_CONTROL, 4, 7, 0), +Why are these moving? Eases review to keep unrelated changes out of the patch.
I couldn't resist to sort them in and it was too tempting to keep it in one patch ;-)
These ADC controls were originally among the DAC controls, so this place is in my view more suitable.
Quoted 36 lines
Quoted 36 lines
sound/soc/codecs/wm8985.c +6
-9SOC_DOUBLE_R_TLV ("Playback Volume" ,WM8985_LEFT_DAC_DIGITAL_VOL , WM8985_RIGHT_DAC_DIGITAL_VOL, 0, 255, 0, dac_tlv),@@ -344,15 +357,6 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = { WM8985_ROUT2_SPK_VOLUME_CTRL, 7, 1, 0),SOC_DOUBLE_R ("Speaker Switch" ,WM8985_LOUT2_SPK_VOLUME_CTRL ,WM8985_ROUT2_SPK_VOLUME_CTRL ,6 ,1 ,1 ), - -SOC_SINGLE ("High Pass Filter Switch" ,WM8985_ADC_CONTROL ,8 ,1 ,0 ), -SOC_ENUM ("High Pass Filter Mode" , filter_mode), -SOC_SINGLE ("High Pass Filter Cutoff" ,WM8985_ADC_CONTROL ,4 ,7 ,0 ), - -SOC_DOUBLE_R_TLV ("Aux Bypass Volume" , -WM8985_LEFT_MIXER_CTRL ,WM8985_RIGHT_MIXER_CTRL ,6 ,7 ,0 , - aux_tlv), -SOC_DOUBLE_R_TLV ("Input PGA Bypass Volume" ,WM8985_LEFT_MIXER_CTRL ,WM8985_RIGHT_MIXER_CTRL ,2 ,7 ,0 , bypass_tlv),@@ -373,6 +377,12 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = {SOC_SINGLE_TLV ("EQ5 Volume" ,WM8985_EQ5_HIGH_SHELF ,0 ,24 ,1 , eq_tlv), SOC_ENUM("3D Depth", depth_3d), +}; + +static const struct snd_kcontrol_new wm8985_specific_snd_controls[] = { +SOC_DOUBLE_R_TLV ("Aux Bypass Volume" , +WM8985_LEFT_MIXER_CTRL ,WM8985_RIGHT_MIXER_CTRL ,6 ,7 ,0 , + aux_tlv),SOC_ENUM ("Speaker Mode" , speaker_mode) };@@ -389,6 +399,16 @@ static const struct snd_kcontrol_new right_out_mixer[] = { SOC_DAPM_SINGLE("PCM Switch", WM8985_RIGHT_MIXER_CTRL, 0, 1, 0), };
Quoted 15 lines
sound/soc/codecs/wm8985.c static const struct snd_kcontrol_new right_out_mixer[] = { · line 411
Quoted 10 lines
sound/soc/codecs/wm8985.c +10
-0+static const struct snd_kcontrol_new wm8758_left_out_mixer[] = { +SOC_DAPM_SINGLE ("Line Switch" ,WM8985_LEFT_MIXER_CTRL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("PCM Switch" ,WM8985_LEFT_MIXER_CTRL ,0 ,1 ,0 ), +}; + +static const struct snd_kcontrol_new wm8758_right_out_mixer[] = { +SOC_DAPM_SINGLE ("Line Switch" ,WM8985_RIGHT_MIXER_CTRL ,1 ,1 ,0 ), +SOC_DAPM_SINGLE ("PCM Switch" ,WM8985_RIGHT_MIXER_CTRL ,0 ,1 ,0 ), +}; +I would be tempted to put the "Aux Switch" at the end of the existing array and then just specifying different sizes for each part in the
SND_SOC_DAPM_MIXERmacro, saves the need to duplicate these.
That's a good idea indeed!
I'm going to send another round.
Regards
Petr