mfd: wm5110: Expose DRE control registers
Subsystems (4)
PATCH 1/2 mfd: wm5110: Expose DRE control registers
Certain use-cases require the DRE to be disabled so expose registers necessary to control the DRE enables.
Signed-off-by Charles Keepax <[email protected]>
--- drivers/mfd/wm5110-tables.c | 2 ++ include/linux/mfd/arizona/registers.h | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-)
drivers/mfd/wm5110-tables.c +2 -0
@@ -601,6 +601,7 @@ static const struct reg_default wm5110_reg_default[] = { { 0x0000043D, 0x0180 }, /* R1085 - DAC Digital Volume 6R */ { 0x0000043E, 0x0080 }, /* R1086 - DAC Volume Limit 6R */ { 0x0000043F, 0x0800 }, /* R1087 - Noise Gate Select 6R */ + { 0x00000440, 0x8FFF }, /* R1088 - DRE Enable */ { 0x00000450, 0x0000 }, /* R1104 - DAC AEC Control 1 */ { 0x00000458, 0x0000 }, /* R1112 - Noise Gate Control */ { 0x00000480, 0x0040 }, /* R1152 - Class W ANC Threshold 1 */
@@ -1631,6 +1632,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)case ARIZONA_DAC_DIGITAL_VOLUME_6R :case ARIZONA_DAC_VOLUME_LIMIT_6R :case ARIZONA_NOISE_GATE_SELECT_6R : +case ARIZONA_DRE_ENABLE :case ARIZONA_DAC_AEC_CONTROL_1 :case ARIZONA_NOISE_GATE_CONTROL :case ARIZONA_PDM_SPK1_CTRL_1 :
include/linux/mfd/arizona/registers.h +4 -0
@@ -3207,6 +3207,10 @@/* * R1088 (0x440) - DRE Enable */ +#define ARIZONA_DRE3R_ENA 0x0020/* DRE3R_ENA */ +#define ARIZONA_DRE3R_ENA_MASK 0x0020/* DRE3R_ENA */ +#define ARIZONA_DRE3R_ENA_SHIFT 5/* DRE3R_ENA */ +#define ARIZONA_DRE3R_ENA_WIDTH 1/* DRE3R_ENA */ #define ARIZONA_DRE3L_ENA 0x0010/* DRE3L_ENA */ #define ARIZONA_DRE3L_ENA_MASK 0x0010/* DRE3L_ENA */ #define ARIZONA_DRE3L_ENA_SHIFT 4/* DRE3L_ENA */
Signature · 1 line
1.7.2.5
PATCH 2/2 ASoC: wm5110: Expose switch controls for DRE
Certain use-cases require the DRE to be disabled so expose controls for the enables.
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
@@ -346,6 +346,13 @@ SOC_DOUBLE("SPKDAT1 Switch", ARIZONA_PDM_SPK1_CTRL_1, ARIZONA_SPK1L_MUTE_SHIFT,SOC_DOUBLE ("SPKDAT2 Switch" ,ARIZONA_PDM_SPK2_CTRL_1 ,ARIZONA_SPK2L_MUTE_SHIFT ,ARIZONA_SPK2R_MUTE_SHIFT ,1 ,1 ), +SOC_DOUBLE ("HPOUT1 DRE Switch" ,ARIZONA_DRE_ENABLE , +ARIZONA_DRE1L_ENA_SHIFT ,ARIZONA_DRE1R_ENA_SHIFT ,1 ,0 ), +SOC_DOUBLE ("HPOUT2 DRE Switch" ,ARIZONA_DRE_ENABLE , +ARIZONA_DRE2L_ENA_SHIFT ,ARIZONA_DRE2R_ENA_SHIFT ,1 ,0 ), +SOC_DOUBLE ("HPOUT3 DRE Switch" ,ARIZONA_DRE_ENABLE , +ARIZONA_DRE3L_ENA_SHIFT ,ARIZONA_DRE3R_ENA_SHIFT ,1 ,0 ), +SOC_ENUM ("Output Ramp Up" , arizona_out_vi_ramp), SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
Signature · 1 line
1.7.2.5
Quoted 8 lines · Charles Keepax
Certain use-cases require the DRE to be disabled so expose registers necessary to control the DRE enables.
Signed-off-by Charles Keepax <[email protected]>--- drivers/mfd/wm5110-tables.c | 2 ++ include/linux/mfd/arizona/registers.h | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-)
Acked-by Lee Jones <[email protected]>
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 2 lines · Charles Keepax
Certain use-cases require the DRE to be disabled so expose registers necessary to control the DRE enables.
Applied both, thanks.