* [PATCH 1/2] mfd: wm5110: Correct default for HEADPHONE_DETECT_1
@ 2014-03-20 16:49 Charles Keepax
2014-03-20 16:49 ` [PATCH 2/2] mfd: arizona: Mark DSP clocking register as volatile Charles Keepax
2014-03-21 10:54 ` [PATCH 1/2] mfd: wm5110: Correct default for HEADPHONE_DETECT_1 Lee Jones
0 siblings, 2 replies; 4+ messages in thread
From: Charles Keepax @ 2014-03-20 16:49 UTC (permalink / raw)
To: lee.jones; +Cc: sameo, patches, linux-kernel
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/wm5110-tables.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index ca99685..178e041 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -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 */
--
1.7.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] mfd: arizona: Mark DSP clocking register as volatile
2014-03-20 16:49 [PATCH 1/2] mfd: wm5110: Correct default for HEADPHONE_DETECT_1 Charles Keepax
@ 2014-03-20 16:49 ` Charles Keepax
2014-03-21 10:55 ` Lee Jones
2014-03-21 10:54 ` [PATCH 1/2] mfd: wm5110: Correct default for HEADPHONE_DETECT_1 Lee Jones
1 sibling, 1 reply; 4+ messages in thread
From: Charles Keepax @ 2014-03-20 16:49 UTC (permalink / raw)
To: lee.jones; +Cc: sameo, patches, linux-kernel
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 <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/wm5102-tables.c | 1 +
drivers/mfd/wm5110-tables.c | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index 187ee86..a856ac7 100644
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -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:
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index 178e041..1942b6f 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -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);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] mfd: arizona: Mark DSP clocking register as volatile
2014-03-20 16:49 ` [PATCH 2/2] mfd: arizona: Mark DSP clocking register as volatile Charles Keepax
@ 2014-03-21 10:55 ` Lee Jones
0 siblings, 0 replies; 4+ messages in thread
From: Lee Jones @ 2014-03-21 10:55 UTC (permalink / raw)
To: Charles Keepax; +Cc: sameo, patches, linux-kernel
> 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 <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm5102-tables.c | 1 +
> drivers/mfd/wm5110-tables.c | 4 ++++
> 2 files changed, 5 insertions(+), 0 deletions(-)
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] mfd: wm5110: Correct default for HEADPHONE_DETECT_1
2014-03-20 16:49 [PATCH 1/2] mfd: wm5110: Correct default for HEADPHONE_DETECT_1 Charles Keepax
2014-03-20 16:49 ` [PATCH 2/2] mfd: arizona: Mark DSP clocking register as volatile Charles Keepax
@ 2014-03-21 10:54 ` Lee Jones
1 sibling, 0 replies; 4+ messages in thread
From: Lee Jones @ 2014-03-21 10:54 UTC (permalink / raw)
To: Charles Keepax; +Cc: sameo, patches, linux-kernel
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm5110-tables.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-21 10:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-20 16:49 [PATCH 1/2] mfd: wm5110: Correct default for HEADPHONE_DETECT_1 Charles Keepax
2014-03-20 16:49 ` [PATCH 2/2] mfd: arizona: Mark DSP clocking register as volatile Charles Keepax
2014-03-21 10:55 ` Lee Jones
2014-03-21 10:54 ` [PATCH 1/2] mfd: wm5110: Correct default for HEADPHONE_DETECT_1 Lee Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.