ASoC: wm8985: add support for WM8758
Subsystems (3)
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.
PATCH 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.
--- 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
Mark Brown
maintainerApplied "ASoC: wm8985: add register definitions for WM8758" to the asoc tree
The patch
ASoC: wm8985: add register definitions for WM8758
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
6c9ae721dc5024bc67617f46f0faede6445c4b78Mon Sep 17 00:00:00 2001
From: Petr Kulhavy <[email protected]>
Date: Mon, 23 May 2016 16:11:24 +0200
Subject: [PATCH] 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.
--- 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
2.8.1
PATCH 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.
--- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wm8985.c | 281 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 277 insertions(+), 6 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 +276 -5
360 lines not on this page · raw message
Signature · 1 line
1.9.1
Mark Brown
maintainerReview
Quoted 7 lines · Petr Kulhavy
(quoted diff) +3
-0+static const struct snd_kcontrol_new wm8758_snd_controls[] = { + SOC_SINGLE("Digital Loopback Switch", WM8985_COMPANDING_CONTROL, + 0, 1, 0), static const struct snd_kcontrol_new wm8985_snd_controls[] = { SOC_SINGLE("Digital Loopback Switch", WM8985_COMPANDING_CONTROL, 0, 1, 0),
Rather than completely duplicating the set of controls it is better to have one table with all the shared controls and then extra tables for those that are device specific that are registered in probe, that way we only define things once. The wm8904 driver provides an example of doing this sort of thing.