Commit e7ca8fcd authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next

...@@ -1002,7 +1002,8 @@ config SND_SOC_WM8983 ...@@ -1002,7 +1002,8 @@ config SND_SOC_WM8983
tristate tristate
config SND_SOC_WM8985 config SND_SOC_WM8985
tristate tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
depends on SND_SOC_I2C_AND_SPI
config SND_SOC_WM8988 config SND_SOC_WM8988
tristate tristate
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -486,7 +485,7 @@ SND_SOC_DAPM_DAC("Voice DAC", "Voice Playback", WM8753_PWR1, 4, 0), ...@@ -486,7 +485,7 @@ SND_SOC_DAPM_DAC("Voice DAC", "Voice Playback", WM8753_PWR1, 4, 0),
SND_SOC_DAPM_OUTPUT("MONO1"), SND_SOC_DAPM_OUTPUT("MONO1"),
SND_SOC_DAPM_MUX("Mono 2 Mux", SND_SOC_NOPM, 0, 0, &wm8753_mono2_controls), SND_SOC_DAPM_MUX("Mono 2 Mux", SND_SOC_NOPM, 0, 0, &wm8753_mono2_controls),
SND_SOC_DAPM_OUTPUT("MONO2"), SND_SOC_DAPM_OUTPUT("MONO2"),
SND_SOC_DAPM_MIXER("Out3 Left + Right", -1, 0, 0, NULL, 0), SND_SOC_DAPM_MIXER("Out3 Left + Right", SND_SOC_NOPM, 0, 0, NULL, 0),
SND_SOC_DAPM_MUX("Out3 Mux", SND_SOC_NOPM, 0, 0, &wm8753_out3_controls), SND_SOC_DAPM_MUX("Out3 Mux", SND_SOC_NOPM, 0, 0, &wm8753_out3_controls),
SND_SOC_DAPM_PGA("Out 3", WM8753_PWR3, 4, 0, NULL, 0), SND_SOC_DAPM_PGA("Out 3", WM8753_PWR3, 4, 0, NULL, 0),
SND_SOC_DAPM_OUTPUT("OUT3"), SND_SOC_DAPM_OUTPUT("OUT3"),
......
This diff is collapsed.
...@@ -290,6 +290,9 @@ ...@@ -290,6 +290,9 @@
#define WM8985_GPIO1GPD_MASK 0x0040 /* GPIO1GPD */ #define WM8985_GPIO1GPD_MASK 0x0040 /* GPIO1GPD */
#define WM8985_GPIO1GPD_SHIFT 6 /* GPIO1GPD */ #define WM8985_GPIO1GPD_SHIFT 6 /* GPIO1GPD */
#define WM8985_GPIO1GPD_WIDTH 1 /* 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 0x0008 /* GPIO1POL */
#define WM8985_GPIO1POL_MASK 0x0008 /* GPIO1POL */ #define WM8985_GPIO1POL_MASK 0x0008 /* GPIO1POL */
#define WM8985_GPIO1POL_SHIFT 3 /* GPIO1POL */ #define WM8985_GPIO1POL_SHIFT 3 /* GPIO1POL */
...@@ -301,6 +304,12 @@ ...@@ -301,6 +304,12 @@
/* /*
* R9 (0x09) - Jack Detect Control 1 * 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 0x0040 /* JD_EN */
#define WM8985_JD_EN_MASK 0x0040 /* JD_EN */ #define WM8985_JD_EN_MASK 0x0040 /* JD_EN */
#define WM8985_JD_EN_SHIFT 6 /* JD_EN */ #define WM8985_JD_EN_SHIFT 6 /* JD_EN */
...@@ -649,6 +658,12 @@ ...@@ -649,6 +658,12 @@
#define WM8985_OUT4_2LNR_MASK 0x0020 /* OUT4_2LNR */ #define WM8985_OUT4_2LNR_MASK 0x0020 /* OUT4_2LNR */
#define WM8985_OUT4_2LNR_SHIFT 5 /* OUT4_2LNR */ #define WM8985_OUT4_2LNR_SHIFT 5 /* OUT4_2LNR */
#define WM8985_OUT4_2LNR_WIDTH 1 /* 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 0x0004 /* POBCTRL */
#define WM8985_POBCTRL_MASK 0x0004 /* POBCTRL */ #define WM8985_POBCTRL_MASK 0x0004 /* POBCTRL */
#define WM8985_POBCTRL_SHIFT 2 /* POBCTRL */ #define WM8985_POBCTRL_SHIFT 2 /* POBCTRL */
...@@ -684,6 +699,9 @@ ...@@ -684,6 +699,9 @@
#define WM8985_BEEPVOL_MASK 0x000E /* BEEPVOL - [3:1] */ #define WM8985_BEEPVOL_MASK 0x000E /* BEEPVOL - [3:1] */
#define WM8985_BEEPVOL_SHIFT 1 /* BEEPVOL - [3:1] */ #define WM8985_BEEPVOL_SHIFT 1 /* BEEPVOL - [3:1] */
#define WM8985_BEEPVOL_WIDTH 3 /* 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 0x0001 /* BEEPEN */
#define WM8985_BEEPEN_MASK 0x0001 /* BEEPEN */ #define WM8985_BEEPEN_MASK 0x0001 /* BEEPEN */
#define WM8985_BEEPEN_SHIFT 0 /* BEEPEN */ #define WM8985_BEEPEN_SHIFT 0 /* BEEPEN */
...@@ -790,6 +808,14 @@ ...@@ -790,6 +808,14 @@
/* /*
* R49 (0x31) - Output ctrl * 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 0x0040 /* DACL2RMIX */
#define WM8985_DACL2RMIX_MASK 0x0040 /* DACL2RMIX */ #define WM8985_DACL2RMIX_MASK 0x0040 /* DACL2RMIX */
#define WM8985_DACL2RMIX_SHIFT 6 /* DACL2RMIX */ #define WM8985_DACL2RMIX_SHIFT 6 /* DACL2RMIX */
...@@ -806,6 +832,14 @@ ...@@ -806,6 +832,14 @@
#define WM8985_OUT3BOOST_MASK 0x0008 /* OUT3BOOST */ #define WM8985_OUT3BOOST_MASK 0x0008 /* OUT3BOOST */
#define WM8985_OUT3BOOST_SHIFT 3 /* OUT3BOOST */ #define WM8985_OUT3BOOST_SHIFT 3 /* OUT3BOOST */
#define WM8985_OUT3BOOST_WIDTH 1 /* 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 0x0004 /* TSOPCTRL */
#define WM8985_TSOPCTRL_MASK 0x0004 /* TSOPCTRL */ #define WM8985_TSOPCTRL_MASK 0x0004 /* TSOPCTRL */
#define WM8985_TSOPCTRL_SHIFT 2 /* TSOPCTRL */ #define WM8985_TSOPCTRL_SHIFT 2 /* TSOPCTRL */
...@@ -1021,6 +1055,10 @@ ...@@ -1021,6 +1055,10 @@
#define WM8985_HALFIPBIAS_MASK 0x0080 /* HALFIPBIAS */ #define WM8985_HALFIPBIAS_MASK 0x0080 /* HALFIPBIAS */
#define WM8985_HALFIPBIAS_SHIFT 7 /* HALFIPBIAS */ #define WM8985_HALFIPBIAS_SHIFT 7 /* HALFIPBIAS */
#define WM8985_HALFIPBIAS_WIDTH 1 /* 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_MASK 0x0060 /* VBBIASTST - [6:5] */
#define WM8985_VBBIASTST_SHIFT 5 /* VBBIASTST - [6:5] */ #define WM8985_VBBIASTST_SHIFT 5 /* VBBIASTST - [6:5] */
#define WM8985_VBBIASTST_WIDTH 2 /* VBBIASTST - [6:5] */ #define WM8985_VBBIASTST_WIDTH 2 /* VBBIASTST - [6:5] */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment