* Re: [PATCH] extcon: arizona: support inverted jack detect switch
2014-05-20 11:56 [PATCH] extcon: arizona: support inverted jack detect switch Richard Fitzgerald
@ 2014-05-20 12:10 ` Lee Jones
2014-05-21 2:18 ` Chanwoo Choi
2014-05-23 11:54 ` [PATCH V2] " Richard Fitzgerald
2 siblings, 0 replies; 6+ messages in thread
From: Lee Jones @ 2014-05-20 12:10 UTC (permalink / raw)
To: Richard Fitzgerald
Cc: myungjoo.ham, cw00.choi, sameo, broonie, ckeepax, linux-kernel,
patches
On Tue, 20 May 2014, Richard Fitzgerald wrote:
> Add pdata option for inverted jack detect switch that
> opens when jack is inserted.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> ---
> drivers/extcon/extcon-arizona.c | 29 +++++++++++++++++++++--------
> include/linux/mfd/arizona/pdata.h | 3 +++
For the MFD part:
Acked-by: Lee Jones <lee.jones@linaro.org>
> 2 files changed, 24 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
> index 98a14f6..af926b9 100644
> --- a/drivers/extcon/extcon-arizona.c
> +++ b/drivers/extcon/extcon-arizona.c
> @@ -962,10 +962,16 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
>
> if (arizona->pdata.jd_gpio5) {
> mask = ARIZONA_MICD_CLAMP_STS;
> - present = 0;
> + if (arizona->pdata.jd_invert)
> + present = ARIZONA_MICD_CLAMP_STS;
> + else
> + present = 0;
> } else {
> mask = ARIZONA_JD1_STS;
> - present = ARIZONA_JD1_STS;
> + if (arizona->pdata.jd_invert)
> + present = 0;
> + else
> + present = ARIZONA_JD1_STS;
> }
>
> ret = regmap_read(arizona->regmap, ARIZONA_AOD_IRQ_RAW_STATUS, &val);
> @@ -1096,6 +1102,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
> struct arizona_pdata *pdata = &arizona->pdata;
> struct arizona_extcon_info *info;
> unsigned int val;
> + unsigned int clamp_mode;
> int jack_irq_fall, jack_irq_rise;
> int ret, mode, i, j;
>
> @@ -1302,16 +1309,22 @@ static int arizona_extcon_probe(struct platform_device *pdev)
> regmap_write(arizona->regmap, ARIZONA_GPIO5_CTRL,
> val);
>
> - regmap_update_bits(arizona->regmap,
> - ARIZONA_MICD_CLAMP_CONTROL,
> - ARIZONA_MICD_CLAMP_MODE_MASK, 0x9);
> + if (arizona->pdata.jd_invert)
> + clamp_mode = 0xb;
> + else
> + clamp_mode = 0x9;
> } else {
> - regmap_update_bits(arizona->regmap,
> - ARIZONA_MICD_CLAMP_CONTROL,
> - ARIZONA_MICD_CLAMP_MODE_MASK, 0x4);
> + if (arizona->pdata.jd_invert)
> + clamp_mode = 0x5;
> + else
> + clamp_mode = 0x4;
> }
>
> regmap_update_bits(arizona->regmap,
> + ARIZONA_MICD_CLAMP_CONTROL,
> + ARIZONA_MICD_CLAMP_MODE_MASK, clamp_mode);
> +
> + regmap_update_bits(arizona->regmap,
> ARIZONA_JACK_DETECT_DEBOUNCE,
> ARIZONA_MICD_CLAMP_DB,
> ARIZONA_MICD_CLAMP_DB);
> diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
> index 12a5c13..4578c72 100644
> --- a/include/linux/mfd/arizona/pdata.h
> +++ b/include/linux/mfd/arizona/pdata.h
> @@ -127,6 +127,9 @@ struct arizona_pdata {
> /** Internal pull on GPIO5 is disabled when used for jack detection */
> bool jd_gpio5_nopull;
>
> + /** set to true if jackdet contact opens on insert */
> + bool jd_invert;
> +
> /** Use the headphone detect circuit to identify the accessory */
> bool hpdet_acc_id;
>
--
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] 6+ messages in thread* Re: [PATCH] extcon: arizona: support inverted jack detect switch
2014-05-20 11:56 [PATCH] extcon: arizona: support inverted jack detect switch Richard Fitzgerald
2014-05-20 12:10 ` Lee Jones
@ 2014-05-21 2:18 ` Chanwoo Choi
2014-05-23 11:54 ` [PATCH V2] " Richard Fitzgerald
2 siblings, 0 replies; 6+ messages in thread
From: Chanwoo Choi @ 2014-05-21 2:18 UTC (permalink / raw)
To: Richard Fitzgerald
Cc: myungjoo.ham, sameo, lee.jones, broonie, ckeepax, linux-kernel,
patches
Hi Richard,
On 05/20/2014 08:56 PM, Richard Fitzgerald wrote:
> Add pdata option for inverted jack detect switch that
> opens when jack is inserted.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> ---
> drivers/extcon/extcon-arizona.c | 29 +++++++++++++++++++++--------
> include/linux/mfd/arizona/pdata.h | 3 +++
> 2 files changed, 24 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
> index 98a14f6..af926b9 100644
> --- a/drivers/extcon/extcon-arizona.c
> +++ b/drivers/extcon/extcon-arizona.c
> @@ -962,10 +962,16 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
>
> if (arizona->pdata.jd_gpio5) {
> mask = ARIZONA_MICD_CLAMP_STS;
> - present = 0;
> + if (arizona->pdata.jd_invert)
> + present = ARIZONA_MICD_CLAMP_STS;
> + else
> + present = 0;
> } else {
> mask = ARIZONA_JD1_STS;
> - present = ARIZONA_JD1_STS;
> + if (arizona->pdata.jd_invert)
> + present = 0;
> + else
> + present = ARIZONA_JD1_STS;
> }
>
> ret = regmap_read(arizona->regmap, ARIZONA_AOD_IRQ_RAW_STATUS, &val);
> @@ -1096,6 +1102,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
> struct arizona_pdata *pdata = &arizona->pdata;
> struct arizona_extcon_info *info;
> unsigned int val;
> + unsigned int clamp_mode;
> int jack_irq_fall, jack_irq_rise;
> int ret, mode, i, j;
>
> @@ -1302,16 +1309,22 @@ static int arizona_extcon_probe(struct platform_device *pdev)
> regmap_write(arizona->regmap, ARIZONA_GPIO5_CTRL,
> val);
>
> - regmap_update_bits(arizona->regmap,
> - ARIZONA_MICD_CLAMP_CONTROL,
> - ARIZONA_MICD_CLAMP_MODE_MASK, 0x9);
> + if (arizona->pdata.jd_invert)
> + clamp_mode = 0xb;
What is meaning of '0xb'?
I prefer to use defined constant instead of using hex value directly.
For exmaple,
#define XXX_CLAMP_MODE 0xb
> + else
> + clamp_mode = 0x9;
ditto.
> } else {
> - regmap_update_bits(arizona->regmap,
> - ARIZONA_MICD_CLAMP_CONTROL,
> - ARIZONA_MICD_CLAMP_MODE_MASK, 0x4);
> + if (arizona->pdata.jd_invert)
> + clamp_mode = 0x5;
ditto.
> + else
> + clamp_mode = 0x4;
ditto.
> }
>
> regmap_update_bits(arizona->regmap,
> + ARIZONA_MICD_CLAMP_CONTROL,
> + ARIZONA_MICD_CLAMP_MODE_MASK, clamp_mode);
> +
> + regmap_update_bits(arizona->regmap,
> ARIZONA_JACK_DETECT_DEBOUNCE,
> ARIZONA_MICD_CLAMP_DB,
> ARIZONA_MICD_CLAMP_DB);
> diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
> index 12a5c13..4578c72 100644
> --- a/include/linux/mfd/arizona/pdata.h
> +++ b/include/linux/mfd/arizona/pdata.h
> @@ -127,6 +127,9 @@ struct arizona_pdata {
> /** Internal pull on GPIO5 is disabled when used for jack detection */
> bool jd_gpio5_nopull;
>
> + /** set to true if jackdet contact opens on insert */
> + bool jd_invert;
> +
> /** Use the headphone detect circuit to identify the accessory */
> bool hpdet_acc_id;
>
>
Thanks,
Chanwoo Choi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH V2] extcon: arizona: support inverted jack detect switch
2014-05-20 11:56 [PATCH] extcon: arizona: support inverted jack detect switch Richard Fitzgerald
2014-05-20 12:10 ` Lee Jones
2014-05-21 2:18 ` Chanwoo Choi
@ 2014-05-23 11:54 ` Richard Fitzgerald
2014-05-23 12:39 ` Lee Jones
2014-05-28 4:43 ` Chanwoo Choi
2 siblings, 2 replies; 6+ messages in thread
From: Richard Fitzgerald @ 2014-05-23 11:54 UTC (permalink / raw)
To: myungjoo.ham, cw00.choi; +Cc: sameo, broonie, patches, linux-kernel, lee.jones
Add config option for inverted jack detect switch that
opens when jack is inserted.
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 34 ++++++++++++++++++++++++++--------
include/linux/mfd/arizona/pdata.h | 3 +++
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 98a14f6..4c73d25 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -39,6 +39,11 @@
#define ARIZONA_ACCDET_MODE_HPL 1
#define ARIZONA_ACCDET_MODE_HPR 2
+#define ARIZONA_MICD_CLAMP_MODE_JDL 0x4
+#define ARIZONA_MICD_CLAMP_MODE_JDH 0x5
+#define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9
+#define ARIZONA_MICD_CLAMP_MODE_JDH_GP5H 0xb
+
#define ARIZONA_HPDET_MAX 10000
#define HPDET_DEBOUNCE 500
@@ -962,10 +967,16 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
if (arizona->pdata.jd_gpio5) {
mask = ARIZONA_MICD_CLAMP_STS;
- present = 0;
+ if (arizona->pdata.jd_invert)
+ present = ARIZONA_MICD_CLAMP_STS;
+ else
+ present = 0;
} else {
mask = ARIZONA_JD1_STS;
- present = ARIZONA_JD1_STS;
+ if (arizona->pdata.jd_invert)
+ present = 0;
+ else
+ present = ARIZONA_JD1_STS;
}
ret = regmap_read(arizona->regmap, ARIZONA_AOD_IRQ_RAW_STATUS, &val);
@@ -1096,6 +1107,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
struct arizona_pdata *pdata = &arizona->pdata;
struct arizona_extcon_info *info;
unsigned int val;
+ unsigned int clamp_mode;
int jack_irq_fall, jack_irq_rise;
int ret, mode, i, j;
@@ -1302,16 +1314,22 @@ static int arizona_extcon_probe(struct platform_device *pdev)
regmap_write(arizona->regmap, ARIZONA_GPIO5_CTRL,
val);
- regmap_update_bits(arizona->regmap,
- ARIZONA_MICD_CLAMP_CONTROL,
- ARIZONA_MICD_CLAMP_MODE_MASK, 0x9);
+ if (arizona->pdata.jd_invert)
+ clamp_mode = ARIZONA_MICD_CLAMP_MODE_JDH_GP5H;
+ else
+ clamp_mode = ARIZONA_MICD_CLAMP_MODE_JDL_GP5H;
} else {
- regmap_update_bits(arizona->regmap,
- ARIZONA_MICD_CLAMP_CONTROL,
- ARIZONA_MICD_CLAMP_MODE_MASK, 0x4);
+ if (arizona->pdata.jd_invert)
+ clamp_mode = ARIZONA_MICD_CLAMP_MODE_JDH;
+ else
+ clamp_mode = ARIZONA_MICD_CLAMP_MODE_JDL;
}
regmap_update_bits(arizona->regmap,
+ ARIZONA_MICD_CLAMP_CONTROL,
+ ARIZONA_MICD_CLAMP_MODE_MASK, clamp_mode);
+
+ regmap_update_bits(arizona->regmap,
ARIZONA_JACK_DETECT_DEBOUNCE,
ARIZONA_MICD_CLAMP_DB,
ARIZONA_MICD_CLAMP_DB);
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 12a5c13..4578c72 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -127,6 +127,9 @@ struct arizona_pdata {
/** Internal pull on GPIO5 is disabled when used for jack detection */
bool jd_gpio5_nopull;
+ /** set to true if jackdet contact opens on insert */
+ bool jd_invert;
+
/** Use the headphone detect circuit to identify the accessory */
bool hpdet_acc_id;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH V2] extcon: arizona: support inverted jack detect switch
2014-05-23 11:54 ` [PATCH V2] " Richard Fitzgerald
@ 2014-05-23 12:39 ` Lee Jones
2014-05-28 4:43 ` Chanwoo Choi
1 sibling, 0 replies; 6+ messages in thread
From: Lee Jones @ 2014-05-23 12:39 UTC (permalink / raw)
To: Richard Fitzgerald
Cc: myungjoo.ham, cw00.choi, sameo, broonie, patches, linux-kernel
> Add config option for inverted jack detect switch that
> opens when jack is inserted.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
I already Acked this. Don't forget to carry that forward to mitigate
adding unnecessary delay to acceptance.
> ---
> drivers/extcon/extcon-arizona.c | 34 ++++++++++++++++++++++++++--------
> include/linux/mfd/arizona/pdata.h | 3 +++
> 2 files changed, 29 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
> index 98a14f6..4c73d25 100644
> --- a/drivers/extcon/extcon-arizona.c
> +++ b/drivers/extcon/extcon-arizona.c
> @@ -39,6 +39,11 @@
> #define ARIZONA_ACCDET_MODE_HPL 1
> #define ARIZONA_ACCDET_MODE_HPR 2
>
> +#define ARIZONA_MICD_CLAMP_MODE_JDL 0x4
> +#define ARIZONA_MICD_CLAMP_MODE_JDH 0x5
> +#define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9
> +#define ARIZONA_MICD_CLAMP_MODE_JDH_GP5H 0xb
> +
> #define ARIZONA_HPDET_MAX 10000
>
> #define HPDET_DEBOUNCE 500
> @@ -962,10 +967,16 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
>
> if (arizona->pdata.jd_gpio5) {
> mask = ARIZONA_MICD_CLAMP_STS;
> - present = 0;
> + if (arizona->pdata.jd_invert)
> + present = ARIZONA_MICD_CLAMP_STS;
> + else
> + present = 0;
> } else {
> mask = ARIZONA_JD1_STS;
> - present = ARIZONA_JD1_STS;
> + if (arizona->pdata.jd_invert)
> + present = 0;
> + else
> + present = ARIZONA_JD1_STS;
> }
>
> ret = regmap_read(arizona->regmap, ARIZONA_AOD_IRQ_RAW_STATUS, &val);
> @@ -1096,6 +1107,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
> struct arizona_pdata *pdata = &arizona->pdata;
> struct arizona_extcon_info *info;
> unsigned int val;
> + unsigned int clamp_mode;
> int jack_irq_fall, jack_irq_rise;
> int ret, mode, i, j;
>
> @@ -1302,16 +1314,22 @@ static int arizona_extcon_probe(struct platform_device *pdev)
> regmap_write(arizona->regmap, ARIZONA_GPIO5_CTRL,
> val);
>
> - regmap_update_bits(arizona->regmap,
> - ARIZONA_MICD_CLAMP_CONTROL,
> - ARIZONA_MICD_CLAMP_MODE_MASK, 0x9);
> + if (arizona->pdata.jd_invert)
> + clamp_mode = ARIZONA_MICD_CLAMP_MODE_JDH_GP5H;
> + else
> + clamp_mode = ARIZONA_MICD_CLAMP_MODE_JDL_GP5H;
> } else {
> - regmap_update_bits(arizona->regmap,
> - ARIZONA_MICD_CLAMP_CONTROL,
> - ARIZONA_MICD_CLAMP_MODE_MASK, 0x4);
> + if (arizona->pdata.jd_invert)
> + clamp_mode = ARIZONA_MICD_CLAMP_MODE_JDH;
> + else
> + clamp_mode = ARIZONA_MICD_CLAMP_MODE_JDL;
> }
>
> regmap_update_bits(arizona->regmap,
> + ARIZONA_MICD_CLAMP_CONTROL,
> + ARIZONA_MICD_CLAMP_MODE_MASK, clamp_mode);
> +
> + regmap_update_bits(arizona->regmap,
> ARIZONA_JACK_DETECT_DEBOUNCE,
> ARIZONA_MICD_CLAMP_DB,
> ARIZONA_MICD_CLAMP_DB);
> diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
> index 12a5c13..4578c72 100644
> --- a/include/linux/mfd/arizona/pdata.h
> +++ b/include/linux/mfd/arizona/pdata.h
> @@ -127,6 +127,9 @@ struct arizona_pdata {
> /** Internal pull on GPIO5 is disabled when used for jack detection */
> bool jd_gpio5_nopull;
>
> + /** set to true if jackdet contact opens on insert */
> + bool jd_invert;
> +
> /** Use the headphone detect circuit to identify the accessory */
> bool hpdet_acc_id;
>
--
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] 6+ messages in thread* Re: [PATCH V2] extcon: arizona: support inverted jack detect switch
2014-05-23 11:54 ` [PATCH V2] " Richard Fitzgerald
2014-05-23 12:39 ` Lee Jones
@ 2014-05-28 4:43 ` Chanwoo Choi
1 sibling, 0 replies; 6+ messages in thread
From: Chanwoo Choi @ 2014-05-28 4:43 UTC (permalink / raw)
To: Richard Fitzgerald
Cc: myungjoo.ham, sameo, broonie, patches, linux-kernel, lee.jones
On 05/23/2014 08:54 PM, Richard Fitzgerald wrote:
> Add config option for inverted jack detect switch that
> opens when jack is inserted.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> ---
> drivers/extcon/extcon-arizona.c | 34 ++++++++++++++++++++++++++--------
> include/linux/mfd/arizona/pdata.h | 3 +++
> 2 files changed, 29 insertions(+), 8 deletions(-)
Applied.
Thanks,
Chanwoo Choi
^ permalink raw reply [flat|nested] 6+ messages in thread