Skip to contentSkip to conversation

mfd: wm5110: Correct default for HEADPHONE_DETECT_1

PATCH Applied Charles Keepax 2 participants 4 messages Mar 20, 2014 – Mar 21, 2014

Subsystems (2)
Multifunction devices (MFD) Wolfson microelectronics drivers
lore
Share & tools
lore

Charles Keepax

author
#0 lore raw

PATCH 1/2 mfd: wm5110: Correct default for HEADPHONE_DETECT_1

Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/wm5110-tables.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mfd/wm5110-tables.c +1 -1
index ca99685..178e041 100644
@@ -538,7 +538,7 @@ static const struct reg_default wm5110_reg_default[] = {
 	{ 0x00000219, 0x01A6 },    /* R537   - Mic Bias Ctrl 2 */
 	{ 0x0000021A, 0x01A6 },    /* R538   - Mic Bias Ctrl 3 */
 	{ 0x00000293, 0x0000 },    /* R659   - Accessory Detect Mode 1 */
-	{ 0x0000029B, 0x0020 },    /* R667   - Headphone Detect 1 */
+	{ 0x0000029B, 0x0028 },    /* R667   - Headphone Detect 1 */
 	{ 0x0000029C, 0x0000 },    /* R668   - Headphone Detect 2 */
 	{ 0x000002A2, 0x0000 },    /* R674   - Micd clamp control */
 	{ 0x000002A3, 0x1102 },    /* R675   - Mic Detect 1 */
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH 2/2 mfd: arizona: Mark DSP clocking register as volatile

The DSPs will often control there own clock speeds whilst running as such we should mark the registers controlling this as volatile.

Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/wm5102-tables.c |    1 +
 drivers/mfd/wm5110-tables.c |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
drivers/mfd/wm5102-tables.c +1 -0
index 187ee86..a856ac7 100644
@@ -1925,6 +1925,7 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
 	case ARIZONA_AOD_IRQ1:
 	case ARIZONA_AOD_IRQ2:
 	case ARIZONA_AOD_IRQ_RAW_STATUS:
+	case ARIZONA_DSP1_CLOCKING_1:
 	case ARIZONA_DSP1_STATUS_1:
 	case ARIZONA_DSP1_STATUS_2:
 	case ARIZONA_DSP1_STATUS_3:
drivers/mfd/wm5110-tables.c +4 -0
index 178e041..1942b6f 100644
@@ -2652,6 +2652,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)
 	case ARIZONA_DSP1_SCRATCH_1:
 	case ARIZONA_DSP1_SCRATCH_2:
 	case ARIZONA_DSP1_SCRATCH_3:
+	case ARIZONA_DSP1_CLOCKING_1:
 	case ARIZONA_DSP2_STATUS_1:
 	case ARIZONA_DSP2_STATUS_2:
 	case ARIZONA_DSP2_STATUS_3:

@@ -2680,6 +2681,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)
 	case ARIZONA_DSP2_SCRATCH_1:
 	case ARIZONA_DSP2_SCRATCH_2:
 	case ARIZONA_DSP2_SCRATCH_3:
+	case ARIZONA_DSP2_CLOCKING_1:
 	case ARIZONA_DSP3_STATUS_1:
 	case ARIZONA_DSP3_STATUS_2:
 	case ARIZONA_DSP3_STATUS_3:

@@ -2708,6 +2710,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)
 	case ARIZONA_DSP3_SCRATCH_1:
 	case ARIZONA_DSP3_SCRATCH_2:
 	case ARIZONA_DSP3_SCRATCH_3:
+	case ARIZONA_DSP3_CLOCKING_1:
 	case ARIZONA_DSP4_STATUS_1:
 	case ARIZONA_DSP4_STATUS_2:
 	case ARIZONA_DSP4_STATUS_3:

@@ -2736,6 +2739,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)
 	case ARIZONA_DSP4_SCRATCH_1:
 	case ARIZONA_DSP4_SCRATCH_2:
 	case ARIZONA_DSP4_SCRATCH_3:
+	case ARIZONA_DSP4_CLOCKING_1:
 		return true;
 	default:
 		return wm5110_is_adsp_memory(dev, reg);
Signature · 1 line
1.7.2.5
Applied
#2 lore raw

Re: [PATCH 2/2] mfd: arizona: Mark DSP clocking register as volatile

Quoted 8 lines

The DSPs will often control there own clock speeds whilst running as such we should mark the registers controlling this as volatile.

Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/wm5102-tables.c |    1 +
 drivers/mfd/wm5110-tables.c |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Applied
#3 lore raw
In reply to Charles Keepax
Quoted 4 lines
Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/wm5110-tables.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog