*** SUBJECT HERE ***
Subsystems (4)
PATCH 1/4 mfd: wm5110: Make DSP memories readable
In reply to Charles KeepaxExpose the memory regions used by the DSP cores on WM5110 as readable and volatile.
--- drivers/mfd/wm5110-tables.c | 69 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 4 deletions(-)
drivers/mfd/wm5110-tables.c +65 -4
@@ -14,6 +14,7 @@#include <linux/mfd/arizona/core.h> #include <linux/mfd/arizona/registers.h> +#include <linux/device.h> #include "arizona.h"
@@ -1336,6 +1337,64 @@ static const struct reg_default wm5110_reg_default[] = { { 0x00001404, 0x0000 }, /* R5124 - DSP4 Status 1 */ }; +static bool wm5110_is_rev_b_adsp_memory (unsigned int reg) +{ +if ((reg >=0x100000 && reg <0x103000 ) || + (reg >=0x180000 && reg <0x181000 ) || + (reg >=0x190000 && reg <0x192000 ) || + (reg >=0x1a8000 && reg <0x1a9000 ) || + (reg >=0x200000 && reg <0x209000 ) || + (reg >=0x280000 && reg <0x281000 ) || + (reg >=0x290000 && reg <0x29a000 ) || + (reg >=0x2a8000 && reg <0x2aa000 ) || + (reg >=0x300000 && reg <0x30f000 ) || + (reg >=0x380000 && reg <0x382000 ) || + (reg >=0x390000 && reg <0x39e000 ) || + (reg >=0x3a8000 && reg <0x3b6000 ) || + (reg >=0x400000 && reg <0x403000 ) || + (reg >=0x480000 && reg <0x481000 ) || + (reg >=0x490000 && reg <0x492000 ) || + (reg >=0x4a8000 && reg <0x4a9000 )) +return true; +else +return false; +} + +static bool wm5110_is_rev_d_adsp_memory (unsigned int reg) +{ +if ((reg >=0x100000 && reg <0x106000 ) || + (reg >=0x180000 && reg <0x182000 ) || + (reg >=0x190000 && reg <0x198000 ) || + (reg >=0x1a8000 && reg <0x1aa000 ) || + (reg >=0x200000 && reg <0x20f000 ) || + (reg >=0x280000 && reg <0x282000 ) || + (reg >=0x290000 && reg <0x29c000 ) || + (reg >=0x2a6000 && reg <0x2b4000 ) || + (reg >=0x300000 && reg <0x30f000 ) || + (reg >=0x380000 && reg <0x382000 ) || + (reg >=0x390000 && reg <0x3a2000 ) || + (reg >=0x3a6000 && reg <0x3b4000 ) || + (reg >=0x400000 && reg <0x406000 ) || + (reg >=0x480000 && reg <0x482000 ) || + (reg >=0x490000 && reg <0x498000 ) || + (reg >=0x4a8000 && reg <0x4aa000 )) +return true; +else +return false; +} + +static bool wm5110_is_adsp_memory (struct device *dev,unsigned int reg) +{ +struct arizona *arizona =dev_get_drvdata (dev); + +switch (arizona->rev) { + case 0 ... 2: +return wm5110_is_rev_b_adsp_memory (reg); +default : +return wm5110_is_rev_d_adsp_memory (reg); + } +} +static bool wm5110_readable_register (struct device *dev,unsigned int reg) {switch (reg) {
@@ -2308,7 +2367,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)case ARIZONA_DSP4_STATUS_3 :return true;default : -return false; +return wm5110_is_adsp_memory (dev, reg); } }
@@ -2368,16 +2427,18 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)case ARIZONA_DSP4_STATUS_3 :return true;default : -return false; +return wm5110_is_adsp_memory (dev, reg); } } +#define WM5110_MAX_REGISTER 0x4a9fff +const struct regmap_config wm5110_spi_regmap = { .reg_bits =32 , .pad_bits =16 , .val_bits =16 , - .max_register =ARIZONA_DSP1_STATUS_2 , + .max_register =WM5110_MAX_REGISTER , .readable_reg = wm5110_readable_register, .volatile_reg = wm5110_volatile_register,
@@ -2391,7 +2452,7 @@ const struct regmap_config wm5110_i2c_regmap = { .reg_bits = 32, .val_bits = 16, - .max_register = ARIZONA_DSP1_STATUS_2, + .max_register = WM5110_MAX_REGISTER, .readable_reg = wm5110_readable_register, .volatile_reg = wm5110_volatile_register,
Signature · 1 line
1.7.2.5
cover *** SUBJECT HERE ***
Hi,
Small patch series adding some missing functionality on the WM5110. Given most of the changes are in ASoC I have generated the patches against Mark's tree but let me know if we want to push them through MFD instead and I can regenerate, but I suspect they will cause less conflicts going through ASoC.
Thanks,
Charles
Charles Keepax (3):
mfd: wm5110: Make DSP memories readable
ASoC: wm5110: Add basic support for ISRCs
ASoC: wm5110: Expose input high pass filter controls
Mark Brown (1):
ASoC: wm5110: Hook up ADSP2 cores
drivers/mfd/wm5110-tables.c | 73 +++++++- include/linux/mfd/arizona/registers.h | 37 ++++ sound/soc/codecs/Kconfig | 2 + sound/soc/codecs/arizona.c | 10 + sound/soc/codecs/arizona.h | 1 + sound/soc/codecs/wm5110.c | 316 ++++++++++++++++++++++++++++++++- 6 files changed, 433 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.2.5
PATCH 2/4 ASoC: wm5110: Hook up ADSP2 cores
From: Mark Brown <[email protected]>
--- sound/soc/codecs/Kconfig | 2 + sound/soc/codecs/wm5110.c | 119 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 119 insertions(+), 2 deletions(-)
sound/soc/codecs/Kconfig +2 -0
@@ -163,8 +163,10 @@ config SND_SOC_WM_HUBS config SND_SOC_WM_ADSP tristate default y if SND_SOC_WM5102=y + default y if SND_SOC_WM5110=y default y if SND_SOC_WM2200=y default m if SND_SOC_WM5102=m + default m if SND_SOC_WM5110=m default m if SND_SOC_WM2200=m config SND_SOC_AB8500_CODEC
sound/soc/codecs/wm5110.c +117 -2
180 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 3/4 ASoC: wm5110: Add basic support for ISRCs
In reply to Charles KeepaxAdd support for the ISRCs that matches the current support on the w5102.
--- sound/soc/codecs/wm5110.c | 178 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-)
sound/soc/codecs/wm5110.c +178 -0
@@ -258,6 +258,10 @@ SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),SOC_ENUM ("LHPF3 Mode" , arizona_lhpf3_mode),SOC_ENUM ("LHPF4 Mode" , arizona_lhpf4_mode), +SOC_VALUE_ENUM ("ISRC1 FSL" , arizona_isrc_fsl[0 ]), +SOC_VALUE_ENUM ("ISRC2 FSL" , arizona_isrc_fsl[1 ]), +SOC_VALUE_ENUM ("ISRC3 FSL" , arizona_isrc_fsl[2 ]), +ARIZONA_MIXER_CONTROLS ("DSP1L" ,ARIZONA_DSP1LMIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("DSP1R" ,ARIZONA_DSP1RMIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("DSP2L", ARIZONA_DSP2LMIX_INPUT_1_SOURCE),
@@ -474,6 +478,36 @@ ARIZONA_MUX_ENUMS(ASRC1R, ARIZONA_ASRC1RMIX_INPUT_1_SOURCE);ARIZONA_MUX_ENUMS (ASRC2L ,ARIZONA_ASRC2LMIX_INPUT_1_SOURCE );ARIZONA_MUX_ENUMS (ASRC2R ,ARIZONA_ASRC2RMIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC1INT1 ,ARIZONA_ISRC1INT1MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC1INT2 ,ARIZONA_ISRC1INT2MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC1INT3 ,ARIZONA_ISRC1INT3MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC1INT4 ,ARIZONA_ISRC1INT4MIX_INPUT_1_SOURCE ); + +ARIZONA_MUX_ENUMS (ISRC1DEC1 ,ARIZONA_ISRC1DEC1MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC1DEC2 ,ARIZONA_ISRC1DEC2MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC1DEC3 ,ARIZONA_ISRC1DEC3MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC1DEC4 ,ARIZONA_ISRC1DEC4MIX_INPUT_1_SOURCE ); + +ARIZONA_MUX_ENUMS (ISRC2INT1 ,ARIZONA_ISRC2INT1MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC2INT2 ,ARIZONA_ISRC2INT2MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC2INT3 ,ARIZONA_ISRC2INT3MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC2INT4 ,ARIZONA_ISRC2INT4MIX_INPUT_1_SOURCE ); + +ARIZONA_MUX_ENUMS (ISRC2DEC1 ,ARIZONA_ISRC2DEC1MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC2DEC2 ,ARIZONA_ISRC2DEC2MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC2DEC3 ,ARIZONA_ISRC2DEC3MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC2DEC4 ,ARIZONA_ISRC2DEC4MIX_INPUT_1_SOURCE ); + +ARIZONA_MUX_ENUMS (ISRC3INT1 ,ARIZONA_ISRC3INT1MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC3INT2 ,ARIZONA_ISRC3INT2MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC3INT3 ,ARIZONA_ISRC3INT3MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC3INT4 ,ARIZONA_ISRC3INT4MIX_INPUT_1_SOURCE ); + +ARIZONA_MUX_ENUMS (ISRC3DEC1 ,ARIZONA_ISRC3DEC1MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC3DEC2 ,ARIZONA_ISRC3DEC2MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC3DEC3 ,ARIZONA_ISRC3DEC3MIX_INPUT_1_SOURCE ); +ARIZONA_MUX_ENUMS (ISRC3DEC4 ,ARIZONA_ISRC3DEC4MIX_INPUT_1_SOURCE ); +static const char *wm5110_aec_loopback_texts[] = {"HPOUT1L" ,"HPOUT1R" ,"HPOUT2L" ,"HPOUT2R" ,"HPOUT3L" ,"HPOUT3R" ,"SPKOUTL" ,"SPKOUTR" ,"SPKDAT1L" ,"SPKDAT1R" ,"SPKDAT2L" ,"SPKDAT2R" ,
@@ -619,6 +653,60 @@ WM_ADSP2("DSP2", 1),WM_ADSP2 ("DSP3" ,2 ),WM_ADSP2 ("DSP4" ,3 ), +SND_SOC_DAPM_PGA ("ISRC1INT1" ,ARIZONA_ISRC_1_CTRL_3 , +ARIZONA_ISRC1_INT0_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC1INT2" ,ARIZONA_ISRC_1_CTRL_3 , +ARIZONA_ISRC1_INT1_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC1INT3" ,ARIZONA_ISRC_1_CTRL_3 , +ARIZONA_ISRC1_INT2_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC1INT4" ,ARIZONA_ISRC_1_CTRL_3 , +ARIZONA_ISRC1_INT3_ENA_SHIFT ,0 ,NULL ,0 ), + +SND_SOC_DAPM_PGA ("ISRC1DEC1" ,ARIZONA_ISRC_1_CTRL_3 , +ARIZONA_ISRC1_DEC0_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC1DEC2" ,ARIZONA_ISRC_1_CTRL_3 , +ARIZONA_ISRC1_DEC1_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC1DEC3" ,ARIZONA_ISRC_1_CTRL_3 , +ARIZONA_ISRC1_DEC2_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC1DEC4" ,ARIZONA_ISRC_1_CTRL_3 , +ARIZONA_ISRC1_DEC3_ENA_SHIFT ,0 ,NULL ,0 ), + +SND_SOC_DAPM_PGA ("ISRC2INT1" ,ARIZONA_ISRC_2_CTRL_3 , +ARIZONA_ISRC2_INT0_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC2INT2" ,ARIZONA_ISRC_2_CTRL_3 , +ARIZONA_ISRC2_INT1_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC2INT3" ,ARIZONA_ISRC_2_CTRL_3 , +ARIZONA_ISRC2_INT2_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC2INT4" ,ARIZONA_ISRC_2_CTRL_3 , +ARIZONA_ISRC2_INT3_ENA_SHIFT ,0 ,NULL ,0 ), + +SND_SOC_DAPM_PGA ("ISRC2DEC1" ,ARIZONA_ISRC_2_CTRL_3 , +ARIZONA_ISRC2_DEC0_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC2DEC2" ,ARIZONA_ISRC_2_CTRL_3 , +ARIZONA_ISRC2_DEC1_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC2DEC3" ,ARIZONA_ISRC_2_CTRL_3 , +ARIZONA_ISRC2_DEC2_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC2DEC4" ,ARIZONA_ISRC_2_CTRL_3 , +ARIZONA_ISRC2_DEC3_ENA_SHIFT ,0 ,NULL ,0 ), + +SND_SOC_DAPM_PGA ("ISRC3INT1" ,ARIZONA_ISRC_3_CTRL_3 , +ARIZONA_ISRC3_INT0_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC3INT2" ,ARIZONA_ISRC_3_CTRL_3 , +ARIZONA_ISRC3_INT1_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC3INT3" ,ARIZONA_ISRC_3_CTRL_3 , +ARIZONA_ISRC3_INT2_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC3INT4" ,ARIZONA_ISRC_3_CTRL_3 , +ARIZONA_ISRC3_INT3_ENA_SHIFT ,0 ,NULL ,0 ), + +SND_SOC_DAPM_PGA ("ISRC3DEC1" ,ARIZONA_ISRC_3_CTRL_3 , +ARIZONA_ISRC3_DEC0_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC3DEC2" ,ARIZONA_ISRC_3_CTRL_3 , +ARIZONA_ISRC3_DEC1_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC3DEC3" ,ARIZONA_ISRC_3_CTRL_3 , +ARIZONA_ISRC3_DEC2_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ISRC3DEC4" ,ARIZONA_ISRC_3_CTRL_3 , +ARIZONA_ISRC3_DEC3_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_VALUE_MUX ("AEC Loopback" ,ARIZONA_DAC_AEC_CONTROL_1 ,ARIZONA_AEC_LOOPBACK_ENA_SHIFT ,0 , &wm5110_aec_loopback_mux),
@@ -826,6 +914,36 @@ ARIZONA_DSP_WIDGETS(DSP2, "DSP2"),ARIZONA_DSP_WIDGETS (DSP3 ,"DSP3" ),ARIZONA_DSP_WIDGETS (DSP4 ,"DSP4" ), +ARIZONA_MUX_WIDGETS (ISRC1DEC1 ,"ISRC1DEC1" ), +ARIZONA_MUX_WIDGETS (ISRC1DEC2 ,"ISRC1DEC2" ), +ARIZONA_MUX_WIDGETS (ISRC1DEC3 ,"ISRC1DEC3" ), +ARIZONA_MUX_WIDGETS (ISRC1DEC4 ,"ISRC1DEC4" ), + +ARIZONA_MUX_WIDGETS (ISRC1INT1 ,"ISRC1INT1" ), +ARIZONA_MUX_WIDGETS (ISRC1INT2 ,"ISRC1INT2" ), +ARIZONA_MUX_WIDGETS (ISRC1INT3 ,"ISRC1INT3" ), +ARIZONA_MUX_WIDGETS (ISRC1INT4 ,"ISRC1INT4" ), + +ARIZONA_MUX_WIDGETS (ISRC2DEC1 ,"ISRC2DEC1" ), +ARIZONA_MUX_WIDGETS (ISRC2DEC2 ,"ISRC2DEC2" ), +ARIZONA_MUX_WIDGETS (ISRC2DEC3 ,"ISRC2DEC3" ), +ARIZONA_MUX_WIDGETS (ISRC2DEC4 ,"ISRC2DEC4" ), + +ARIZONA_MUX_WIDGETS (ISRC2INT1 ,"ISRC2INT1" ), +ARIZONA_MUX_WIDGETS (ISRC2INT2 ,"ISRC2INT2" ), +ARIZONA_MUX_WIDGETS (ISRC2INT3 ,"ISRC2INT3" ), +ARIZONA_MUX_WIDGETS (ISRC2INT4 ,"ISRC2INT4" ), + +ARIZONA_MUX_WIDGETS (ISRC3DEC1 ,"ISRC3DEC1" ), +ARIZONA_MUX_WIDGETS (ISRC3DEC2 ,"ISRC3DEC2" ), +ARIZONA_MUX_WIDGETS (ISRC3DEC3 ,"ISRC3DEC3" ), +ARIZONA_MUX_WIDGETS (ISRC3DEC4 ,"ISRC3DEC4" ), + +ARIZONA_MUX_WIDGETS (ISRC3INT1 ,"ISRC3INT1" ), +ARIZONA_MUX_WIDGETS (ISRC3INT2 ,"ISRC3INT2" ), +ARIZONA_MUX_WIDGETS (ISRC3INT3 ,"ISRC3INT3" ), +ARIZONA_MUX_WIDGETS (ISRC3INT4 ,"ISRC3INT4" ), +SND_SOC_DAPM_OUTPUT ("HPOUT1L" ),SND_SOC_DAPM_OUTPUT ("HPOUT1R" ), SND_SOC_DAPM_OUTPUT("HPOUT2L"),
@@ -895,6 +1013,30 @@ SND_SOC_DAPM_OUTPUT("MICSUPP"), { name, "ASRC1R", "ASRC1R" }, \ { name, "ASRC2L", "ASRC2L" }, \ { name, "ASRC2R", "ASRC2R" }, \ + { name, "ISRC1DEC1", "ISRC1DEC1" }, \ + { name, "ISRC1DEC2", "ISRC1DEC2" }, \ + { name, "ISRC1DEC3", "ISRC1DEC3" }, \ + { name, "ISRC1DEC4", "ISRC1DEC4" }, \ + { name, "ISRC1INT1", "ISRC1INT1" }, \ + { name, "ISRC1INT2", "ISRC1INT2" }, \ + { name, "ISRC1INT3", "ISRC1INT3" }, \ + { name, "ISRC1INT4", "ISRC1INT4" }, \ + { name, "ISRC2DEC1", "ISRC2DEC1" }, \ + { name, "ISRC2DEC2", "ISRC2DEC2" }, \ + { name, "ISRC2DEC3", "ISRC2DEC3" }, \ + { name, "ISRC2DEC4", "ISRC2DEC4" }, \ + { name, "ISRC2INT1", "ISRC2INT1" }, \ + { name, "ISRC2INT2", "ISRC2INT2" }, \ + { name, "ISRC2INT3", "ISRC2INT3" }, \ + { name, "ISRC2INT4", "ISRC2INT4" }, \ + { name, "ISRC3DEC1", "ISRC3DEC1" }, \ + { name, "ISRC3DEC2", "ISRC3DEC2" }, \ + { name, "ISRC3DEC3", "ISRC3DEC3" }, \ + { name, "ISRC3DEC4", "ISRC3DEC4" }, \ + { name, "ISRC3INT1", "ISRC3INT1" }, \ + { name, "ISRC3INT2", "ISRC3INT2" }, \ + { name, "ISRC3INT3", "ISRC3INT3" }, \ + { name, "ISRC3INT4", "ISRC3INT4" }, \ { name, "DSP1.1", "DSP1" }, \ { name, "DSP1.2", "DSP1" }, \ { name, "DSP1.3", "DSP1" }, \
@@ -1117,6 +1259,36 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {ARIZONA_DSP_ROUTES ("DSP3" ),ARIZONA_DSP_ROUTES ("DSP4" ), +ARIZONA_MUX_ROUTES ("ISRC1INT1" ,"ISRC1INT1" ), +ARIZONA_MUX_ROUTES ("ISRC1INT2" ,"ISRC1INT2" ), +ARIZONA_MUX_ROUTES ("ISRC1INT3" ,"ISRC1INT3" ), +ARIZONA_MUX_ROUTES ("ISRC1INT4" ,"ISRC1INT4" ), + +ARIZONA_MUX_ROUTES ("ISRC1DEC1" ,"ISRC1DEC1" ), +ARIZONA_MUX_ROUTES ("ISRC1DEC2" ,"ISRC1DEC2" ), +ARIZONA_MUX_ROUTES ("ISRC1DEC3" ,"ISRC1DEC3" ), +ARIZONA_MUX_ROUTES ("ISRC1DEC4" ,"ISRC1DEC4" ), + +ARIZONA_MUX_ROUTES ("ISRC2INT1" ,"ISRC2INT1" ), +ARIZONA_MUX_ROUTES ("ISRC2INT2" ,"ISRC2INT2" ), +ARIZONA_MUX_ROUTES ("ISRC2INT3" ,"ISRC2INT3" ), +ARIZONA_MUX_ROUTES ("ISRC2INT4" ,"ISRC2INT4" ), + +ARIZONA_MUX_ROUTES ("ISRC2DEC1" ,"ISRC2DEC1" ), +ARIZONA_MUX_ROUTES ("ISRC2DEC2" ,"ISRC2DEC2" ), +ARIZONA_MUX_ROUTES ("ISRC2DEC3" ,"ISRC2DEC3" ), +ARIZONA_MUX_ROUTES ("ISRC2DEC4" ,"ISRC2DEC4" ), + +ARIZONA_MUX_ROUTES ("ISRC3INT1" ,"ISRC3INT1" ), +ARIZONA_MUX_ROUTES ("ISRC3INT2" ,"ISRC3INT2" ), +ARIZONA_MUX_ROUTES ("ISRC3INT3" ,"ISRC3INT3" ), +ARIZONA_MUX_ROUTES ("ISRC3INT4" ,"ISRC3INT4" ), + +ARIZONA_MUX_ROUTES ("ISRC3DEC1" ,"ISRC3DEC1" ), +ARIZONA_MUX_ROUTES ("ISRC3DEC2" ,"ISRC3DEC2" ), +ARIZONA_MUX_ROUTES ("ISRC3DEC3" ,"ISRC3DEC3" ), +ARIZONA_MUX_ROUTES ("ISRC3DEC4" ,"ISRC3DEC4" ), + { "AEC Loopback", "HPOUT1L", "OUT1L" }, { "AEC Loopback", "HPOUT1R", "OUT1R" }, { "HPOUT1L", NULL, "OUT1L" },
@@ -1419,6 +1591,12 @@ static int wm5110_probe(struct platform_device *pdev)ARIZONA_IRQ_FLL2_LOCK ,ARIZONA_IRQ_FLL2_CLOCK_OK , &wm5110->fll[1]); +/* SR2 fixed at 8kHz, SR3 fixed at 16kHz */ +regmap_update_bits (arizona->regmap,ARIZONA_SAMPLE_RATE_2 , +ARIZONA_SAMPLE_RATE_2_MASK ,0x11 ); +regmap_update_bits (arizona->regmap,ARIZONA_SAMPLE_RATE_3 , +ARIZONA_SAMPLE_RATE_3_MASK ,0x12 ); +for (i =0 ; i <ARRAY_SIZE (wm5110_dai); i++)arizona_init_dai (&wm5110->core, i);
Signature · 1 line
1.7.2.5
PATCH 4/4 ASoC: wm5110: Expose input high pass filter controls
In reply to Charles Keepax--- drivers/mfd/wm5110-tables.c | 4 +++ include/linux/mfd/arizona/registers.h | 37 +++++++++++++++++++++++++++++++++ sound/soc/codecs/arizona.c | 10 +++++++++ sound/soc/codecs/arizona.h | 1 + sound/soc/codecs/wm5110.c | 19 +++++++++++++++++ 5 files changed, 71 insertions(+), 0 deletions(-)
drivers/mfd/wm5110-tables.c +4 -0
@@ -518,6 +518,7 @@ static const struct reg_default wm5110_reg_default[] = { { 0x00000300, 0x0000 }, /* R768 - Input Enables */ { 0x00000308, 0x0000 }, /* R776 - Input Rate */ { 0x00000309, 0x0022 }, /* R777 - Input Volume Ramp */ + { 0x0000030C, 0x0002 }, /* R780 - HPF Control */ { 0x00000310, 0x2080 }, /* R784 - IN1L Control */ { 0x00000311, 0x0180 }, /* R785 - ADC Digital Volume 1L */ { 0x00000312, 0x0000 }, /* R786 - DMIC1L Control */
@@ -539,6 +540,7 @@ static const struct reg_default wm5110_reg_default[] = { { 0x00000328, 0x2000 }, /* R808 - IN4L Control */ { 0x00000329, 0x0180 }, /* R809 - ADC Digital Volume 4L */ { 0x0000032A, 0x0000 }, /* R810 - DMIC4L Control */ + { 0x0000032C, 0x0000 }, /* R812 - IN4R Control */ { 0x0000032D, 0x0180 }, /* R813 - ADC Digital Volume 4R */ { 0x0000032E, 0x0000 }, /* R814 - DMIC4R Control */ { 0x00000400, 0x0000 }, /* R1024 - Output Enables 1 */
@@ -1512,6 +1514,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)case ARIZONA_INPUT_ENABLES_STATUS :case ARIZONA_INPUT_RATE :case ARIZONA_INPUT_VOLUME_RAMP : +case ARIZONA_HPF_CONTROL :case ARIZONA_IN1L_CONTROL :case ARIZONA_ADC_DIGITAL_VOLUME_1L :case ARIZONA_DMIC1L_CONTROL :
@@ -1533,6 +1536,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)case ARIZONA_IN4L_CONTROL :case ARIZONA_ADC_DIGITAL_VOLUME_4L :case ARIZONA_DMIC4L_CONTROL : +case ARIZONA_IN4R_CONTROL :case ARIZONA_ADC_DIGITAL_VOLUME_4R :case ARIZONA_DMIC4R_CONTROL :case ARIZONA_OUTPUT_ENABLES_1 :
include/linux/mfd/arizona/registers.h +37 -0
@@ -139,6 +139,7 @@#define ARIZONA_INPUT_ENABLES_STATUS 0x301#define ARIZONA_INPUT_RATE 0x308#define ARIZONA_INPUT_VOLUME_RAMP 0x309 +#define ARIZONA_HPF_CONTROL 0x30C#define ARIZONA_IN1L_CONTROL 0x310#define ARIZONA_ADC_DIGITAL_VOLUME_1L 0x311#define ARIZONA_DMIC1L_CONTROL 0x312
@@ -160,6 +161,7 @@#define ARIZONA_IN4L_CONTROL 0x328#define ARIZONA_ADC_DIGITAL_VOLUME_4L 0x329#define ARIZONA_DMIC4L_CONTROL 0x32A +#define ARIZONA_IN4R_CONTROL 0x32C#define ARIZONA_ADC_DIGITAL_VOLUME_4R 0x32D#define ARIZONA_DMIC4R_CONTROL 0x32E#define ARIZONA_OUTPUT_ENABLES_1 0x400
@@ -2293,8 +2295,18 @@#define ARIZONA_IN_VI_RAMP_WIDTH 3/* IN_VI_RAMP - [2:0] */ /* +* R780 (0x30C) - HPF Control +*/ +#define ARIZONA_IN_HPF_CUT_MASK 0x0007/* IN_HPF_CUT [2:0] */ +#define ARIZONA_IN_HPF_CUT_SHIFT 0/* IN_HPF_CUT [2:0] */ +#define ARIZONA_IN_HPF_CUT_WIDTH 3/* IN_HPF_CUT [2:0] */ + +/* * R784 (0x310) - IN1L Control */ +#define ARIZONA_IN1L_HPF_MASK 0x8000/* IN1L_HPF - [15] */ +#define ARIZONA_IN1L_HPF_SHIFT 15/* IN1L_HPF - [15] */ +#define ARIZONA_IN1L_HPF_WIDTH 1/* IN1L_HPF - [15] */ #define ARIZONA_IN1_OSR_MASK 0x6000/* IN1_OSR - [14:13] */ #define ARIZONA_IN1_OSR_SHIFT 13/* IN1_OSR - [14:13] */ #define ARIZONA_IN1_OSR_WIDTH 2/* IN1_OSR - [14:13] */
@@ -2333,6 +2345,9 @@/* * R788 (0x314) - IN1R Control */ +#define ARIZONA_IN1R_HPF_MASK 0x8000/* IN1R_HPF - [15] */ +#define ARIZONA_IN1R_HPF_SHIFT 15/* IN1R_HPF - [15] */ +#define ARIZONA_IN1R_HPF_WIDTH 1/* IN1R_HPF - [15] */ #define ARIZONA_IN1R_PGA_VOL_MASK 0x00FE/* IN1R_PGA_VOL - [7:1] */ #define ARIZONA_IN1R_PGA_VOL_SHIFT 1/* IN1R_PGA_VOL - [7:1] */ #define ARIZONA_IN1R_PGA_VOL_WIDTH 7/* IN1R_PGA_VOL - [7:1] */
@@ -2362,6 +2377,9 @@/* * R792 (0x318) - IN2L Control */ +#define ARIZONA_IN2L_HPF_MASK 0x8000/* IN2L_HPF - [15] */ +#define ARIZONA_IN2L_HPF_SHIFT 15/* IN2L_HPF - [15] */ +#define ARIZONA_IN2L_HPF_WIDTH 1/* IN2L_HPF - [15] */ #define ARIZONA_IN2_OSR_MASK 0x6000/* IN2_OSR - [14:13] */ #define ARIZONA_IN2_OSR_SHIFT 13/* IN2_OSR - [14:13] */ #define ARIZONA_IN2_OSR_WIDTH 2/* IN2_OSR - [14:13] */
@@ -2400,6 +2418,9 @@/* * R796 (0x31C) - IN2R Control */ +#define ARIZONA_IN2R_HPF_MASK 0x8000/* IN2R_HPF - [15] */ +#define ARIZONA_IN2R_HPF_SHIFT 15/* IN2R_HPF - [15] */ +#define ARIZONA_IN2R_HPF_WIDTH 1/* IN2R_HPF - [15] */ #define ARIZONA_IN2R_PGA_VOL_MASK 0x00FE/* IN2R_PGA_VOL - [7:1] */ #define ARIZONA_IN2R_PGA_VOL_SHIFT 1/* IN2R_PGA_VOL - [7:1] */ #define ARIZONA_IN2R_PGA_VOL_WIDTH 7/* IN2R_PGA_VOL - [7:1] */
@@ -2429,6 +2450,9 @@/* * R800 (0x320) - IN3L Control */ +#define ARIZONA_IN3L_HPF_MASK 0x8000/* IN3L_HPF - [15] */ +#define ARIZONA_IN3L_HPF_SHIFT 15/* IN3L_HPF - [15] */ +#define ARIZONA_IN3L_HPF_WIDTH 1/* IN3L_HPF - [15] */ #define ARIZONA_IN3_OSR_MASK 0x6000/* IN3_OSR - [14:13] */ #define ARIZONA_IN3_OSR_SHIFT 13/* IN3_OSR - [14:13] */ #define ARIZONA_IN3_OSR_WIDTH 2/* IN3_OSR - [14:13] */
@@ -2467,6 +2491,9 @@/* * R804 (0x324) - IN3R Control */ +#define ARIZONA_IN3R_HPF_MASK 0x8000/* IN3R_HPF - [15] */ +#define ARIZONA_IN3R_HPF_SHIFT 15/* IN3R_HPF - [15] */ +#define ARIZONA_IN3R_HPF_WIDTH 1/* IN3R_HPF - [15] */ #define ARIZONA_IN3R_PGA_VOL_MASK 0x00FE/* IN3R_PGA_VOL - [7:1] */ #define ARIZONA_IN3R_PGA_VOL_SHIFT 1/* IN3R_PGA_VOL - [7:1] */ #define ARIZONA_IN3R_PGA_VOL_WIDTH 7/* IN3R_PGA_VOL - [7:1] */
@@ -2496,6 +2523,9 @@/* * R808 (0x328) - IN4 Control */ +#define ARIZONA_IN4L_HPF_MASK 0x8000/* IN4L_HPF - [15] */ +#define ARIZONA_IN4L_HPF_SHIFT 15/* IN4L_HPF - [15] */ +#define ARIZONA_IN4L_HPF_WIDTH 1/* IN4L_HPF - [15] */ #define ARIZONA_IN4_OSR_MASK 0x6000/* IN4_OSR - [14:13] */ #define ARIZONA_IN4_OSR_SHIFT 13/* IN4_OSR - [14:13] */ #define ARIZONA_IN4_OSR_WIDTH 2/* IN4_OSR - [14:13] */
@@ -2526,6 +2556,13 @@#define ARIZONA_IN4L_DMIC_DLY_WIDTH 6/* IN4L_DMIC_DLY - [5:0] */ /* +* R812 (0x32C) - IN4R Control +*/ +#define ARIZONA_IN4R_HPF_MASK 0x8000/* IN4R_HPF - [15] */ +#define ARIZONA_IN4R_HPF_SHIFT 15/* IN4R_HPF - [15] */ +#define ARIZONA_IN4R_HPF_WIDTH 1/* IN4R_HPF - [15] */ + +/* * R813 (0x32D) - ADC Digital Volume 4R */ #define ARIZONA_IN_VU 0x0200/* IN_VU */
sound/soc/codecs/arizona.c +10 -0
@@ -560,6 +560,16 @@ const struct soc_enum arizona_ng_hold = 4, arizona_ng_hold_text);EXPORT_SYMBOL_GPL (arizona_ng_hold); +static const char *const arizona_in_hpf_cut_text[] = { +"2.5Hz" ,"5Hz" ,"10Hz" ,"20Hz" ,"40Hz" +}; + +const struct soc_enum arizona_in_hpf_cut_enum = +SOC_ENUM_SINGLE (ARIZONA_HPF_CONTROL ,ARIZONA_IN_HPF_CUT_SHIFT , +ARRAY_SIZE (arizona_in_hpf_cut_text), + arizona_in_hpf_cut_text); +EXPORT_SYMBOL_GPL (arizona_in_hpf_cut_enum); +static const char *const arizona_in_dmic_osr_text[] = {"1.536MHz" ,"3.072MHz" ,"6.144MHz" , };
sound/soc/codecs/arizona.h +1 -0
@@ -199,6 +199,7 @@ extern const struct soc_enum arizona_lhpf3_mode;extern const struct soc_enum arizona_lhpf4_mode;extern const struct soc_enum arizona_ng_hold; +extern const struct soc_enum arizona_in_hpf_cut_enum;extern const struct soc_enum arizona_in_dmic_osr[]; extern int arizona_in_ev(struct snd_soc_dapm_widget *w,
sound/soc/codecs/wm5110.c +19 -0
@@ -155,6 +155,25 @@ SOC_SINGLE_RANGE_TLV("IN3L Volume", ARIZONA_IN3L_CONTROL,SOC_SINGLE_RANGE_TLV ("IN3R Volume" ,ARIZONA_IN3R_CONTROL ,ARIZONA_IN3R_PGA_VOL_SHIFT ,0x40 ,0x5f ,0 , ana_tlv), +SOC_ENUM ("IN HPF Cutoff Frequency" , arizona_in_hpf_cut_enum), + +SOC_SINGLE ("IN1L HPF Switch" ,ARIZONA_IN1L_CONTROL , +ARIZONA_IN1L_HPF_SHIFT ,1 ,0 ), +SOC_SINGLE ("IN1R HPF Switch" ,ARIZONA_IN1R_CONTROL , +ARIZONA_IN1R_HPF_SHIFT ,1 ,0 ), +SOC_SINGLE ("IN2L HPF Switch" ,ARIZONA_IN2L_CONTROL , +ARIZONA_IN2L_HPF_SHIFT ,1 ,0 ), +SOC_SINGLE ("IN2R HPF Switch" ,ARIZONA_IN2R_CONTROL , +ARIZONA_IN2R_HPF_SHIFT ,1 ,0 ), +SOC_SINGLE ("IN3L HPF Switch" ,ARIZONA_IN3L_CONTROL , +ARIZONA_IN3L_HPF_SHIFT ,1 ,0 ), +SOC_SINGLE ("IN3R HPF Switch" ,ARIZONA_IN3R_CONTROL , +ARIZONA_IN3R_HPF_SHIFT ,1 ,0 ), +SOC_SINGLE ("IN4L HPF Switch" ,ARIZONA_IN4L_CONTROL , +ARIZONA_IN4L_HPF_SHIFT ,1 ,0 ), +SOC_SINGLE ("IN4R HPF Switch" ,ARIZONA_IN4R_CONTROL , +ARIZONA_IN4R_HPF_SHIFT ,1 ,0 ), +SOC_SINGLE_TLV ("IN1L Digital Volume" ,ARIZONA_ADC_DIGITAL_VOLUME_1L ,ARIZONA_IN1L_DIG_VOL_SHIFT ,0xbf ,0 , digital_tlv), SOC_SINGLE_TLV("IN1R Digital Volume", ARIZONA_ADC_DIGITAL_VOLUME_1R,
Signature · 1 line
1.7.2.5