mfd: madera: Add register definitions for accessory detect
Subsystems (2)
Richard Fitzgerald
maintainerPATCH 1/2 mfd: madera: Add register definitions for accessory detect
Add some register definitions for accessory detection, used by the extcon driver.
--- include/linux/mfd/madera/registers.h | 51 ++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
include/linux/mfd/madera/registers.h +51 -0
@@ -1219,9 +1219,11 @@#define MADERA_IRQ1_STATUS_33 0x1820#define MADERA_IRQ1_MASK_1 0x1840#define MADERA_IRQ1_MASK_2 0x1841 +#define MADERA_IRQ1_MASK_6 0x1845#define MADERA_IRQ1_MASK_33 0x1860#define MADERA_IRQ1_RAW_STATUS_1 0x1880#define MADERA_IRQ1_RAW_STATUS_2 0x1881 +#define MADERA_IRQ1_RAW_STATUS_7 0x1886#define MADERA_IRQ1_RAW_STATUS_15 0x188E#define MADERA_IRQ1_RAW_STATUS_33 0x18A0#define MADERA_INTERRUPT_DEBOUNCE_7 0x1A06
@@ -1664,6 +1666,42 @@#define MADERA_MICB2A_ENA_SHIFT 0#define MADERA_MICB2A_ENA_WIDTH 1 +/* (0x0225) - HP Ctrl 1L */ +#define MADERA_RMV_SHRT_HP1L 0x4000 +#define MADERA_RMV_SHRT_HP1L_MASK 0x4000 +#define MADERA_RMV_SHRT_HP1L_SHIFT 14 +#define MADERA_RMV_SHRT_HP1L_WIDTH 1 +#define MADERA_HP1L_FLWR 0x0004 +#define MADERA_HP1L_FLWR_MASK 0x0004 +#define MADERA_HP1L_FLWR_SHIFT 2 +#define MADERA_HP1L_FLWR_WIDTH 1 +#define MADERA_HP1L_SHRTI 0x0002 +#define MADERA_HP1L_SHRTI_MASK 0x0002 +#define MADERA_HP1L_SHRTI_SHIFT 1 +#define MADERA_HP1L_SHRTI_WIDTH 1 +#define MADERA_HP1L_SHRTO 0x0001 +#define MADERA_HP1L_SHRTO_MASK 0x0001 +#define MADERA_HP1L_SHRTO_SHIFT 0 +#define MADERA_HP1L_SHRTO_WIDTH 1 + +/* (0x0226) - HP Ctrl 1R */ +#define MADERA_RMV_SHRT_HP1R 0x4000 +#define MADERA_RMV_SHRT_HP1R_MASK 0x4000 +#define MADERA_RMV_SHRT_HP1R_SHIFT 14 +#define MADERA_RMV_SHRT_HP1R_WIDTH 1 +#define MADERA_HP1R_FLWR 0x0004 +#define MADERA_HP1R_FLWR_MASK 0x0004 +#define MADERA_HP1R_FLWR_SHIFT 2 +#define MADERA_HP1R_FLWR_WIDTH 1 +#define MADERA_HP1R_SHRTI 0x0002 +#define MADERA_HP1R_SHRTI_MASK 0x0002 +#define MADERA_HP1R_SHRTI_SHIFT 1 +#define MADERA_HP1R_SHRTI_WIDTH 1 +#define MADERA_HP1R_SHRTO 0x0001 +#define MADERA_HP1R_SHRTO_MASK 0x0001 +#define MADERA_HP1R_SHRTO_SHIFT 0 +#define MADERA_HP1R_SHRTO_WIDTH 1 +/* (0x0293) Accessory_Detect_Mode_1 */ #define MADERA_ACCDET_SRC 0x2000#define MADERA_ACCDET_SRC_MASK 0x2000
@@ -3766,6 +3804,19 @@#define MADERA_DSP1_BUS_ERR_EINT1_SHIFT 0#define MADERA_DSP1_BUS_ERR_EINT1_WIDTH 1 +/* (0x1845) IRQ1_Mask_6 */ +#define MADERA_IM_MICDET2_EINT1 0x0200 +#define MADERA_IM_MICDET2_EINT1_MASK 0x0200 +#define MADERA_IM_MICDET2_EINT1_SHIFT 9 +#define MADERA_IM_MICDET2_EINT1_WIDTH 1 +#define MADERA_IM_MICDET1_EINT1 0x0100 +#define MADERA_IM_MICDET1_EINT1_MASK 0x0100 +#define MADERA_IM_MICDET1_EINT1_SHIFT 8 +#define MADERA_IM_MICDET1_EINT1_WIDTH 1 +#define MADERA_IM_HPDET_EINT1 0x0001 +#define MADERA_IM_HPDET_EINT1_MASK 0x0001 +#define MADERA_IM_HPDET_EINT1_SHIFT 0 +#define MADERA_IM_HPDET_EINT1_WIDTH 1/* (0x184E) IRQ1_Mask_15 */ #define MADERA_IM_SPK_OVERHEAT_WARN_EINT1 0x0004#define MADERA_IM_SPK_OVERHEAT_WARN_EINT1_MASK 0x0004
Signature · 1 line
2.11.0
Richard Fitzgerald
maintainerPATCH 2/2 mfd: madera: Don't use regmap_read_poll_timeout to poll for BOOT_DONE
While polling for BOOT_DONE the chip could NAK a read because it is still booting, which would terminate the regmap_read_poll_timeout() with an error.
Instead implement a polling loop that ignores read errors so we always poll until the chip signals boot or the loop times out.
--- drivers/mfd/madera-core.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-)
drivers/mfd/madera-core.c +24 -14
@@ -132,33 +132,43 @@ const char *madera_name_from_type(enum madera_type type) }EXPORT_SYMBOL_GPL (madera_name_from_type); -#define MADERA_BOOT_POLL_MAX_INTERVAL_US 5000 -#define MADERA_BOOT_POLL_TIMEOUT_US 25000 +#define MADERA_BOOT_POLL_INTERVAL_USEC 5000 +#define MADERA_BOOT_POLL_TIMEOUT_USEC 25000static int madera_wait_for_boot (struct madera *madera) { -unsigned int val; -int ret; +ktime_t timeout; +unsigned int val =0 ; +int ret =0 ;/* * We can't use an interrupt as we need to runtime resume to do so, * so we poll the status bit. This won't race with the interrupt * handler because it will be blocked on runtime resume. +* The chip could NAK a read request while it is booting so ignore +* errors from regmap_read. */ - ret =regmap_read_poll_timeout (madera->regmap, -MADERA_IRQ1_RAW_STATUS_1 , - val, - (val &MADERA_BOOT_DONE_STS1 ), -MADERA_BOOT_POLL_MAX_INTERVAL_US , -MADERA_BOOT_POLL_TIMEOUT_US ); - -if (ret) -dev_err (madera->dev,"Polling BOOT_DONE_STS failed: %d\n" , ret); +regmap_read (madera->regmap,MADERA_IRQ1_RAW_STATUS_1 , &val); +if (val &MADERA_BOOT_DONE_STS1 ) + goto done; + + timeout =ktime_add_us (ktime_get (),MADERA_BOOT_POLL_TIMEOUT_USEC ); +do { +usleep_range (MADERA_BOOT_POLL_INTERVAL_USEC /2 , +MADERA_BOOT_POLL_INTERVAL_USEC ); +regmap_read (madera->regmap,MADERA_IRQ1_RAW_STATUS_1 , &val); +if (val &MADERA_BOOT_DONE_STS1 ) + goto done; + }while (ktime_compare (ktime_get (), timeout) <=0 ); + +dev_err (madera->dev,"Polling BOOT_DONE_STS timed out\n" ); + ret = -ETIMEDOUT ;/* * BOOT_DONE defaults to unmasked on boot so we must ack it. -* Do this unconditionally to avoid interrupt storms. +* Do this even after a timeout to avoid interrupt storms. */ +done:regmap_write (madera->regmap,MADERA_IRQ1_STATUS_1 ,MADERA_BOOT_DONE_EINT1 );
Signature · 1 line
2.11.0
Re: [PATCH 2/2] mfd: madera: Don't use regmap_read_poll_timeout to poll for BOOT_DONE
Quoted 42 lines · Richard Fitzgerald
While polling for
BOOT_DONEthe chip could NAK a read because it is still booting, which would terminate theregmap_read_poll_timeout()with an error.Instead implement a polling loop that ignores read errors so we always poll until the chip signals boot or the loop times out.
Signed-off-by Richard Fitzgerald <[email protected]>--- drivers/mfd/madera-core.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-)drivers/mfd/madera-core.c +7
-6@@ -132,33 +132,43 @@ const char *madera_name_from_type(enum madera_type type) }EXPORT_SYMBOL_GPL (madera_name_from_type); -#define MADERA_BOOT_POLL_MAX_INTERVAL_US 5000 -#define MADERA_BOOT_POLL_TIMEOUT_US 25000 +#define MADERA_BOOT_POLL_INTERVAL_USEC 5000 +#define MADERA_BOOT_POLL_TIMEOUT_USEC 25000static int madera_wait_for_boot (struct madera *madera) { -unsigned int val; -int ret; +ktime_t timeout; +unsigned int val =0 ; +int ret =0 ;/* * We can't use an interrupt as we need to runtime resume to do so, * so we poll the status bit. This won't race with the interrupt * handler because it will be blocked on runtime resume. +* The chip could NAK a read request while it is booting so ignore +* errors from regmap_read. */ - ret = regmap_read_poll_timeout(madera->regmap, - MADERA_IRQ1_RAW_STATUS_1,
drivers/mfd/madera-core.c const char *madera_name_from_type(enum madera_type type) · line 153
Quoted 10 lines
drivers/mfd/madera-core.c +3
-7- val, - (val &MADERA_BOOT_DONE_STS1 ), -MADERA_BOOT_POLL_MAX_INTERVAL_US , - MADERA_BOOT_POLL_TIMEOUT_US); - -if (ret) -dev_err (madera->dev,"Polling BOOT_DONE_STS failed: %d\n" , ret); +regmap_read (madera->regmap,MADERA_IRQ1_RAW_STATUS_1 , &val); +if (val &MADERA_BOOT_DONE_STS1 ) + goto done;
Move the usleep_range() invokation to after the regmap_read(), then you can remove these 3 lines and have the same semantics.
Quoted 21 lines
drivers/mfd/madera-core.c +13
-1+ timeout =ktime_add_us (ktime_get (),MADERA_BOOT_POLL_TIMEOUT_USEC ); +do { +usleep_range (MADERA_BOOT_POLL_INTERVAL_USEC /2 , +MADERA_BOOT_POLL_INTERVAL_USEC ); +regmap_read (madera->regmap,MADERA_IRQ1_RAW_STATUS_1 , &val); +if (val &MADERA_BOOT_DONE_STS1 ) + goto done; + }while (ktime_compare (ktime_get (), timeout) <=0 ); + +dev_err (madera->dev,"Polling BOOT_DONE_STS timed out\n" ); + ret = -ETIMEDOUT ;/* * BOOT_DONE defaults to unmasked on boot so we must ack it. -* Do this unconditionally to avoid interrupt storms. +* Do this even after a timeout to avoid interrupt storms. */ +done:regmap_write (madera->regmap,MADERA_IRQ1_STATUS_1 ,MADERA_BOOT_DONE_EINT1 );
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Lee Jones
AppliedQuoted 7 lines · Richard Fitzgerald
Add some register definitions for accessory detection, used by the extcon driver.
Signed-off-by Richard Fitzgerald <[email protected]>--- include/linux/mfd/madera/registers.h | 51 ++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog