WM8350 updates
Subsystems (2)
cover WM8350 updates
I saw you had applied most of the outstanding patches for the WM8350 except for these two so I figured they may have been lost in the shuffle and am resending them:
The following changes since commit e3d31e08fa03bb896ddea609dc5a703cf072babc:
Mark Brown (1):
mfd: Use bulk read to fill WM8350 register cache
are available in the git repository at:
git://opensource.wolfsonmicro.com/linux-2.6-audioplus for-sameo
Mark Brown (2):
mfd: Support active high IRQs on WM835x
mfd: Ensure all WM8350 IRQs are masked at startup
drivers/mfd/wm8350-core.c | 23 ++++++++++++++++++++++- include/linux/mfd/wm8350/core.h | 2 ++ 2 files changed, 24 insertions(+), 1 deletions(-)
PATCH 1/2 mfd: Support active high IRQs on WM835x
--- drivers/mfd/wm8350-core.c | 16 +++++++++++++++- include/linux/mfd/wm8350/core.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletions(-)
drivers/mfd/wm8350-core.c +15 -1
@@ -1426,7 +1426,21 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,mutex_init (&wm8350->irq_mutex);INIT_WORK (&wm8350->irq_work, wm8350_irq_worker);if (irq) { - ret =request_irq (irq, wm8350_irq,0 , +int flags =0 ; + +if (pdata && pdata->irq_high) { + flags |=IRQF_TRIGGER_HIGH ; + +wm8350_set_bits (wm8350,WM8350_SYSTEM_CONTROL_1 , +WM8350_IRQ_POL ); + }else { + flags |=IRQF_TRIGGER_LOW ; + +wm8350_clear_bits (wm8350,WM8350_SYSTEM_CONTROL_1 , +WM8350_IRQ_POL ); + } + + ret =request_irq (irq, wm8350_irq, flags,"wm8350" , wm8350);if (ret !=0 ) { dev_err(wm8350->dev, "Failed to request IRQ: %d\n",
include/linux/mfd/wm8350/core.h +2 -0
@@ -640,9 +640,11 @@ struct wm8350 {* * @init: Function called during driver initialisation. Should be * used by the platform to configure GPIO functions and similar. +* @irq_high: Set if WM8350 IRQ is active high. */ struct wm8350_platform_data {int (*init)(struct wm8350 *wm8350); +int irq_high; };
Signature · 1 line
1.5.6.5
PATCH 2/2 mfd: Ensure all WM8350 IRQs are masked at startup
The IRQs might have been left enabled in hardware, generating spurious IRQs before the drivers have registered.
--- drivers/mfd/wm8350-core.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/mfd/wm8350-core.c +7 -0
@@ -1422,6 +1422,13 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,return ret; } +wm8350_reg_write (wm8350,WM8350_SYSTEM_INTERRUPTS_MASK ,0xFFFF ); +wm8350_reg_write (wm8350,WM8350_INT_STATUS_1_MASK ,0xFFFF ); +wm8350_reg_write (wm8350,WM8350_INT_STATUS_2_MASK ,0xFFFF ); +wm8350_reg_write (wm8350,WM8350_UNDER_VOLTAGE_INT_STATUS_MASK ,0xFFFF ); +wm8350_reg_write (wm8350,WM8350_GPIO_INT_STATUS_MASK ,0xFFFF ); +wm8350_reg_write (wm8350,WM8350_COMPARATOR_INT_STATUS_MASK ,0xFFFF ); +mutex_init (&wm8350->auxadc_mutex);mutex_init (&wm8350->irq_mutex);INIT_WORK (&wm8350->irq_work, wm8350_irq_worker);
Signature · 1 line
1.5.6.5
Quoted 3 lines · Mark Brown
I saw you had applied most of the outstanding patches for the WM8350 except for these two so I figured they may have been lost in the shuffle and am resending them:
Ok, I got them now. Will apply, thanks.
Cheers,
Samuel.
Quoted 15 lines
The following changes since commit
e3d31e08fa03bb896ddea609dc5a703cf072babc:
Mark Brown (1):
mfd: Use bulk read to fill WM8350 register cacheare available in the git repository at:
git://opensource.wolfsonmicro.com/linux-2.6-audioplusfor-sameoMark Brown (2):
mfd: Support active high IRQs on WM835x
mfd: Ensure all WM8350 IRQs are masked at startupdrivers/mfd/wm8350-core.c | 23 ++++++++++++++++++++++- include/linux/mfd/wm8350/core.h | 2 ++ 2 files changed, 24 insertions(+), 1 deletions(-)
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/