mfd: wm5110: Add registers for headphone short circuit control
Subsystems (4)
PATCH 2/2 ASoC: wm5110: Add controls for headphone short circuit protection
In reply to Charles KeepaxAdd controls to enable/disable the headphone short circuit protection of the headphone outputs.
Signed-off-by Charles Keepax <[email protected]>
--- sound/soc/codecs/wm5110.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
sound/soc/codecs/wm5110.c +7 -0
@@ -267,6 +267,13 @@ ARIZONA_MIXER_CONTROLS("SPKDAT1R", ARIZONA_OUT5RMIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("SPKDAT2L" ,ARIZONA_OUT6LMIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("SPKDAT2R" ,ARIZONA_OUT6RMIX_INPUT_1_SOURCE ), +SOC_SINGLE ("HPOUT1 SC Protect" ,ARIZONA_HP1_SHORT_CIRCUIT_CTRL , +ARIZONA_HP1_SC_ENA_SHIFT ,1 ,0 ), +SOC_SINGLE ("HPOUT2 SC Protect" ,ARIZONA_HP2_SHORT_CIRCUIT_CTRL , +ARIZONA_HP2_SC_ENA_SHIFT ,1 ,0 ), +SOC_SINGLE ("HPOUT3 SC Protect" ,ARIZONA_HP3_SHORT_CIRCUIT_CTRL , +ARIZONA_HP3_SC_ENA_SHIFT ,1 ,0 ), +SOC_DOUBLE_R ("HPOUT1 Digital Switch" ,ARIZONA_DAC_DIGITAL_VOLUME_1L ,ARIZONA_DAC_DIGITAL_VOLUME_1R ,ARIZONA_OUT1L_MUTE_SHIFT ,1 ,1 ), SOC_DOUBLE_R("HPOUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,
Signature · 1 line
1.7.2.5
PATCH 1/2 mfd: wm5110: Add registers for headphone short circuit control
Add the registers necessary to enable/disable the headphone short circuit protection.
Signed-off-by Charles Keepax <[email protected]>
--- drivers/mfd/wm5110-tables.c | 6 ++++++ include/linux/mfd/arizona/registers.h | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-)
drivers/mfd/wm5110-tables.c +6 -0
@@ -637,6 +637,9 @@ static const struct reg_default wm5110_reg_default[] = { { 0x00000491, 0x0000 }, /* R1169 - PDM SPK1 CTRL 2 */ { 0x00000492, 0x0069 }, /* R1170 - PDM SPK2 CTRL 1 */ { 0x00000493, 0x0000 }, /* R1171 - PDM SPK2 CTRL 2 */ + { 0x000004A0, 0x3480 }, /* R1184 - HP1 Short Circuit Ctrl */ + { 0x000004A1, 0x3480 }, /* R1185 - HP2 Short Circuit Ctrl */ + { 0x000004A2, 0x3480 }, /* R1186 - HP3 Short Circuit Ctrl */ { 0x00000500, 0x000C }, /* R1280 - AIF1 BCLK Ctrl */ { 0x00000501, 0x0008 }, /* R1281 - AIF1 Tx Pin Ctrl */ { 0x00000502, 0x0000 }, /* R1282 - AIF1 Rx Pin Ctrl */
@@ -1633,6 +1636,9 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)case ARIZONA_PDM_SPK1_CTRL_2 :case ARIZONA_PDM_SPK2_CTRL_1 :case ARIZONA_PDM_SPK2_CTRL_2 : +case ARIZONA_HP1_SHORT_CIRCUIT_CTRL : +case ARIZONA_HP2_SHORT_CIRCUIT_CTRL : +case ARIZONA_HP3_SHORT_CIRCUIT_CTRL :case ARIZONA_AIF1_BCLK_CTRL :case ARIZONA_AIF1_TX_PIN_CTRL :case ARIZONA_AIF1_RX_PIN_CTRL :
include/linux/mfd/arizona/registers.h +27 -0
@@ -226,6 +226,9 @@#define ARIZONA_PDM_SPK1_CTRL_2 0x491#define ARIZONA_PDM_SPK2_CTRL_1 0x492#define ARIZONA_PDM_SPK2_CTRL_2 0x493 +#define ARIZONA_HP1_SHORT_CIRCUIT_CTRL 0x4A0 +#define ARIZONA_HP2_SHORT_CIRCUIT_CTRL 0x4A1 +#define ARIZONA_HP3_SHORT_CIRCUIT_CTRL 0x4A2#define ARIZONA_SPK_CTRL_2 0x4B5#define ARIZONA_SPK_CTRL_3 0x4B6#define ARIZONA_DAC_COMP_1 0x4DC
@@ -3297,6 +3300,30 @@#define ARIZONA_SPK2_FMT_WIDTH 1/* SPK2_FMT */ /* +* R1184 (0x4A0) - HP1 Short Circuit Ctrl +*/ +#define ARIZONA_HP1_SC_ENA 0x1000/* HP1_SC_ENA */ +#define ARIZONA_HP1_SC_ENA_MASK 0x1000/* HP1_SC_ENA */ +#define ARIZONA_HP1_SC_ENA_SHIFT 12/* HP1_SC_ENA */ +#define ARIZONA_HP1_SC_ENA_WIDTH 1/* HP1_SC_ENA */ + +/* +* R1185 (0x4A1) - HP2 Short Circuit Ctrl +*/ +#define ARIZONA_HP2_SC_ENA 0x1000/* HP2_SC_ENA */ +#define ARIZONA_HP2_SC_ENA_MASK 0x1000/* HP2_SC_ENA */ +#define ARIZONA_HP2_SC_ENA_SHIFT 12/* HP2_SC_ENA */ +#define ARIZONA_HP2_SC_ENA_WIDTH 1/* HP2_SC_ENA */ + +/* +* R1186 (0x4A2) - HP3 Short Circuit Ctrl +*/ +#define ARIZONA_HP3_SC_ENA 0x1000/* HP3_SC_ENA */ +#define ARIZONA_HP3_SC_ENA_MASK 0x1000/* HP3_SC_ENA */ +#define ARIZONA_HP3_SC_ENA_SHIFT 12/* HP3_SC_ENA */ +#define ARIZONA_HP3_SC_ENA_WIDTH 1/* HP3_SC_ENA */ + +/* * R1244 (0x4DC) - DAC comp 1 */ #define ARIZONA_OUT_COMP_COEFF_MASK 0xFFFF/* OUT_COMP_COEFF - [15:0] */
Signature · 1 line
1.7.2.5
Mark Brown
maintainerRe: [PATCH 2/2] ASoC: wm5110: Add controls for headphone short circuit protection
In reply to Charles Keepaxsound/soc/codecs/wm5110.c ARIZONA_MIXER_CONTROLS("SPKDAT1R", ARIZONA_OUT5RMIX_INPUT_1_SOURCE), · line 271
Quoted 2 lines · Charles Keepax
sound/soc/codecs/wm5110.c +2
-0+SOC_SINGLE ("HPOUT1 SC Protect" ,ARIZONA_HP1_SHORT_CIRCUIT_CTRL , + ARIZONA_HP1_SC_ENA_SHIFT, 1, 0),
Boolean controls should be called ... Switch.