* [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection
@ 2015-09-10 11:41 Charles Keepax
[not found] ` <1441885307-24499-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Charles Keepax @ 2015-09-10 11:41 UTC (permalink / raw)
To: cw00.choi, lee.jones
Cc: myungjoo.ham, sameo, devicetree, linux-kernel, patches
On Florida some additional settings are required to get accurate
measurements at the top end of the headphone detection range. This patch
adds the bits required for this.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/wm5110-tables.c | 2 ++
include/linux/mfd/arizona/registers.h | 8 ++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index acb3bb2..78032e8 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -1908,6 +1908,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
case ARIZONA_HP1_SHORT_CIRCUIT_CTRL:
case ARIZONA_HP2_SHORT_CIRCUIT_CTRL:
case ARIZONA_HP3_SHORT_CIRCUIT_CTRL:
+ case ARIZONA_HP_TEST_CTRL_1:
case ARIZONA_AIF1_BCLK_CTRL:
case ARIZONA_AIF1_TX_PIN_CTRL:
case ARIZONA_AIF1_RX_PIN_CTRL:
@@ -2853,6 +2854,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)
case ARIZONA_INPUT_ENABLES_STATUS:
case ARIZONA_OUTPUT_STATUS_1:
case ARIZONA_RAW_OUTPUT_STATUS_1:
+ case ARIZONA_HP_TEST_CTRL_1:
case ARIZONA_SLIMBUS_RX_PORT_STATUS:
case ARIZONA_SLIMBUS_TX_PORT_STATUS:
case ARIZONA_INTERRUPT_STATUS_1:
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index e96644c..fe1b5d0 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -237,6 +237,7 @@
#define ARIZONA_HP1_SHORT_CIRCUIT_CTRL 0x4A0
#define ARIZONA_HP2_SHORT_CIRCUIT_CTRL 0x4A1
#define ARIZONA_HP3_SHORT_CIRCUIT_CTRL 0x4A2
+#define ARIZONA_HP_TEST_CTRL_1 0x4A4
#define ARIZONA_SPK_CTRL_2 0x4B5
#define ARIZONA_SPK_CTRL_3 0x4B6
#define ARIZONA_DAC_COMP_1 0x4DC
@@ -3548,6 +3549,13 @@
#define ARIZONA_HP3_SC_ENA_WIDTH 1 /* HP3_SC_ENA */
/*
+ * R1188 (0x4A4) HP Test Ctrl 1
+ */
+#define ARIZONA_HP1_TST_CAP_SEL_MASK 0x0003 /* HP1_TST_CAP_SEL - [1:0] */
+#define ARIZONA_HP1_TST_CAP_SEL_SHIFT 0 /* HP1_TST_CAP_SEL - [1:0] */
+#define ARIZONA_HP1_TST_CAP_SEL_WIDTH 2 /* HP1_TST_CAP_SEL - [1:0] */
+
+/*
* R1244 (0x4DC) - DAC comp 1
*/
#define ARIZONA_OUT_COMP_COEFF_MASK 0xFFFF /* OUT_COMP_COEFF - [15:0] */
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread[parent not found: <1441885307-24499-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>]
* [PATCH 2/6] extcon: arizona: Additional settings to improve accuracy of HP detect
[not found] ` <1441885307-24499-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
@ 2015-09-10 11:41 ` Charles Keepax
2015-09-11 8:16 ` Chanwoo Choi
2015-09-10 11:41 ` [PATCH 3/6] extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS Charles Keepax
1 sibling, 1 reply; 14+ messages in thread
From: Charles Keepax @ 2015-09-10 11:41 UTC (permalink / raw)
To: cw00.choi-Sze3O3UU22JBDgjK7y7TUQ,
lee.jones-QSEj5FYQhm4dnm+yROfE0A
Cc: myungjoo.ham-Sze3O3UU22JBDgjK7y7TUQ, sameo-VuQAYsv1563Yd54FQh9/CA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
patches-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E
If the TST_CAP_SEL bits aren't set correctly on wm5110/8280 there will
be a 100k load along side the headphones, which will affect the accurary
towards the very top of the detection range. This patch sets those bits.
Signed-off-by: Charles Keepax <ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
---
drivers/extcon/extcon-arizona.c | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index b48fb29..7bfaacd 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -43,6 +43,9 @@
#define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9
#define ARIZONA_MICD_CLAMP_MODE_JDH_GP5H 0xb
+#define ARIZONA_TST_CAP_DEFAULT 0x3
+#define ARIZONA_TST_CAP_CLAMP 0x1
+
#define ARIZONA_HPDET_MAX 10000
#define HPDET_DEBOUNCE 500
@@ -147,6 +150,7 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
{
struct arizona *arizona = info->arizona;
unsigned int mask = 0, val = 0;
+ unsigned int cap_sel = 0;
int ret;
switch (arizona->type) {
@@ -154,10 +158,21 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
case WM8280:
mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
ARIZONA_HP1L_SHRTI;
- if (clamp)
+ if (clamp) {
val = ARIZONA_HP1L_SHRTO;
- else
+ cap_sel = ARIZONA_TST_CAP_CLAMP;
+ } else {
val = ARIZONA_HP1L_FLWR | ARIZONA_HP1L_SHRTI;
+ cap_sel = ARIZONA_TST_CAP_DEFAULT;
+ }
+
+ ret = regmap_update_bits(arizona->regmap,
+ ARIZONA_HP_TEST_CTRL_1,
+ ARIZONA_HP1_TST_CAP_SEL_MASK,
+ cap_sel);
+ if (ret != 0)
+ dev_warn(arizona->dev,
+ "Failed to set TST_CAP_SEL: %d\n", ret);
break;
default:
mask = ARIZONA_RMV_SHRT_HP1L;
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 2/6] extcon: arizona: Additional settings to improve accuracy of HP detect
2015-09-10 11:41 ` [PATCH 2/6] extcon: arizona: Additional settings to improve accuracy of HP detect Charles Keepax
@ 2015-09-11 8:16 ` Chanwoo Choi
0 siblings, 0 replies; 14+ messages in thread
From: Chanwoo Choi @ 2015-09-11 8:16 UTC (permalink / raw)
To: Charles Keepax, lee.jones
Cc: myungjoo.ham, sameo, devicetree, linux-kernel, patches
On 2015년 09월 10일 20:41, Charles Keepax wrote:
> If the TST_CAP_SEL bits aren't set correctly on wm5110/8280 there will
> be a 100k load along side the headphones, which will affect the accurary
> towards the very top of the detection range. This patch sets those bits.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/extcon/extcon-arizona.c | 19 +++++++++++++++++--
> 1 files changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
> index b48fb29..7bfaacd 100644
> --- a/drivers/extcon/extcon-arizona.c
> +++ b/drivers/extcon/extcon-arizona.c
> @@ -43,6 +43,9 @@
> #define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9
> #define ARIZONA_MICD_CLAMP_MODE_JDH_GP5H 0xb
>
> +#define ARIZONA_TST_CAP_DEFAULT 0x3
> +#define ARIZONA_TST_CAP_CLAMP 0x1
> +
> #define ARIZONA_HPDET_MAX 10000
>
> #define HPDET_DEBOUNCE 500
> @@ -147,6 +150,7 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
> {
> struct arizona *arizona = info->arizona;
> unsigned int mask = 0, val = 0;
> + unsigned int cap_sel = 0;
> int ret;
>
> switch (arizona->type) {
> @@ -154,10 +158,21 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
> case WM8280:
> mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
> ARIZONA_HP1L_SHRTI;
> - if (clamp)
> + if (clamp) {
> val = ARIZONA_HP1L_SHRTO;
> - else
> + cap_sel = ARIZONA_TST_CAP_CLAMP;
> + } else {
> val = ARIZONA_HP1L_FLWR | ARIZONA_HP1L_SHRTI;
> + cap_sel = ARIZONA_TST_CAP_DEFAULT;
> + }
> +
> + ret = regmap_update_bits(arizona->regmap,
> + ARIZONA_HP_TEST_CTRL_1,
> + ARIZONA_HP1_TST_CAP_SEL_MASK,
> + cap_sel);
> + if (ret != 0)
> + dev_warn(arizona->dev,
> + "Failed to set TST_CAP_SEL: %d\n", ret);
> break;
> default:
> mask = ARIZONA_RMV_SHRT_HP1L;
>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Thanks,
Chanwoo Choi
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/6] extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS
[not found] ` <1441885307-24499-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2015-09-10 11:41 ` [PATCH 2/6] extcon: arizona: Additional settings to improve accuracy of HP detect Charles Keepax
@ 2015-09-10 11:41 ` Charles Keepax
[not found] ` <1441885307-24499-3-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
1 sibling, 1 reply; 14+ messages in thread
From: Charles Keepax @ 2015-09-10 11:41 UTC (permalink / raw)
To: cw00.choi-Sze3O3UU22JBDgjK7y7TUQ,
lee.jones-QSEj5FYQhm4dnm+yROfE0A
Cc: myungjoo.ham-Sze3O3UU22JBDgjK7y7TUQ, sameo-VuQAYsv1563Yd54FQh9/CA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
patches-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E
From: Nariman Poushin <nariman-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
The polarity of MICD_CLAMP_STS does not change when different clamp
modes are used, this patch corrects this issue.
Signed-off-by: Nariman Poushin <nariman-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
Signed-off-by: Charles Keepax <ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
---
drivers/extcon/extcon-arizona.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 7bfaacd..6d030a0 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -1059,10 +1059,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
if (arizona->pdata.jd_gpio5) {
mask = ARIZONA_MICD_CLAMP_STS;
- if (arizona->pdata.jd_invert)
- present = ARIZONA_MICD_CLAMP_STS;
- else
- present = 0;
+ present = 0;
} else {
mask = ARIZONA_JD1_STS;
if (arizona->pdata.jd_invert)
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/6] extcon: arizona: Add device binding for jack detect polarity inversion
2015-09-10 11:41 [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax
[not found] ` <1441885307-24499-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
@ 2015-09-10 11:41 ` Charles Keepax
[not found] ` <1441885307-24499-4-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2015-09-10 11:41 ` [PATCH 5/6] extcon: arizona: Add device binding for second jack detect pin on GPIO5 Charles Keepax
` (2 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Charles Keepax @ 2015-09-10 11:41 UTC (permalink / raw)
To: cw00.choi, lee.jones
Cc: myungjoo.ham, sameo, devicetree, linux-kernel, patches
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 6d030a0..34b5a3b 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -1228,6 +1228,9 @@ static int arizona_extcon_device_get_pdata(struct arizona *arizona)
pdata->micd_software_compare = device_property_read_bool(arizona->dev,
"wlf,micd-software-compare");
+ pdata->jd_invert = device_property_read_bool(arizona->dev,
+ "wlf,jd-invert");
+
device_property_read_u32(arizona->dev, "wlf,gpsw", &pdata->gpsw);
return 0;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 5/6] extcon: arizona: Add device binding for second jack detect pin on GPIO5
2015-09-10 11:41 [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax
[not found] ` <1441885307-24499-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2015-09-10 11:41 ` [PATCH 4/6] extcon: arizona: Add device binding for jack detect polarity inversion Charles Keepax
@ 2015-09-10 11:41 ` Charles Keepax
2015-09-11 8:07 ` Chanwoo Choi
2015-09-10 11:41 ` [PATCH 6/6] mfd: arizona: Update DT binding documentation for jack detection Charles Keepax
2015-09-11 8:12 ` [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Chanwoo Choi
4 siblings, 1 reply; 14+ messages in thread
From: Charles Keepax @ 2015-09-10 11:41 UTC (permalink / raw)
To: cw00.choi, lee.jones
Cc: myungjoo.ham, sameo, devicetree, linux-kernel, patches
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 34b5a3b..5fbe893 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -1233,6 +1233,11 @@ static int arizona_extcon_device_get_pdata(struct arizona *arizona)
device_property_read_u32(arizona->dev, "wlf,gpsw", &pdata->gpsw);
+ pdata->jd_gpio5 = device_property_read_bool(arizona->dev,
+ "wlf,use-jd-gpio");
+ pdata->jd_gpio5_nopull = device_property_read_bool(arizona->dev,
+ "wlf,use-jd-gpio-nopull");
+
return 0;
}
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 5/6] extcon: arizona: Add device binding for second jack detect pin on GPIO5
2015-09-10 11:41 ` [PATCH 5/6] extcon: arizona: Add device binding for second jack detect pin on GPIO5 Charles Keepax
@ 2015-09-11 8:07 ` Chanwoo Choi
0 siblings, 0 replies; 14+ messages in thread
From: Chanwoo Choi @ 2015-09-11 8:07 UTC (permalink / raw)
To: Charles Keepax, lee.jones
Cc: myungjoo.ham, sameo, devicetree, linux-kernel, patches
On 2015년 09월 10일 20:41, Charles Keepax wrote:
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/extcon/extcon-arizona.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
> index 34b5a3b..5fbe893 100644
> --- a/drivers/extcon/extcon-arizona.c
> +++ b/drivers/extcon/extcon-arizona.c
> @@ -1233,6 +1233,11 @@ static int arizona_extcon_device_get_pdata(struct arizona *arizona)
>
> device_property_read_u32(arizona->dev, "wlf,gpsw", &pdata->gpsw);
>
> + pdata->jd_gpio5 = device_property_read_bool(arizona->dev,
> + "wlf,use-jd-gpio");
> + pdata->jd_gpio5_nopull = device_property_read_bool(arizona->dev,
> + "wlf,use-jd-gpio-nopull");
> +
> return 0;
> }
>
>
I'd like you to add the patch description.
If you add the description, you can add the my ack messageL
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Thanks,
Chanwoo Choi
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 6/6] mfd: arizona: Update DT binding documentation for jack detection
2015-09-10 11:41 [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax
` (2 preceding siblings ...)
2015-09-10 11:41 ` [PATCH 5/6] extcon: arizona: Add device binding for second jack detect pin on GPIO5 Charles Keepax
@ 2015-09-10 11:41 ` Charles Keepax
2015-09-11 8:09 ` Chanwoo Choi
2015-09-11 8:12 ` [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Chanwoo Choi
4 siblings, 1 reply; 14+ messages in thread
From: Charles Keepax @ 2015-09-10 11:41 UTC (permalink / raw)
To: cw00.choi, lee.jones
Cc: myungjoo.ham, sameo, devicetree, linux-kernel, patches
Add additional bindings for both inverting the polarity of the jack
detection pins and allowing the use of a second jack detection pin. Note
that the second jack detection pin is hard wired in the chip so can only
be enabled through the binding, rather than a pin being specified.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index b98a11b..48bca6a 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -73,6 +73,12 @@ Optional properties:
If this node is not mentioned or if the value is unknown, then
headphone detection mode is set to HPDETL.
+ - wlf,use-jd-gpio : Use GPIO input alongwith JD1 for dual pin jack
+ detection.
+ - wlf,use-jd-gpio-nopull : Internal pull on GPIO is disabled when used for
+ jack detection.
+ - wlf,jd-invert : Invert the polarity of the jack detection switch
+
- wlf,micd-software-compare : Use a software comparison to determine mic
presence
- wlf,micd-detect-debounce : Additional software microphone detection
--
1.7.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 6/6] mfd: arizona: Update DT binding documentation for jack detection
2015-09-10 11:41 ` [PATCH 6/6] mfd: arizona: Update DT binding documentation for jack detection Charles Keepax
@ 2015-09-11 8:09 ` Chanwoo Choi
0 siblings, 0 replies; 14+ messages in thread
From: Chanwoo Choi @ 2015-09-11 8:09 UTC (permalink / raw)
To: Charles Keepax, lee.jones
Cc: myungjoo.ham, sameo, devicetree, linux-kernel, patches
On 2015년 09월 10일 20:41, Charles Keepax wrote:
> Add additional bindings for both inverting the polarity of the jack
> detection pins and allowing the use of a second jack detection pin. Note
> that the second jack detection pin is hard wired in the chip so can only
> be enabled through the binding, rather than a pin being specified.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
> index b98a11b..48bca6a 100644
> --- a/Documentation/devicetree/bindings/mfd/arizona.txt
> +++ b/Documentation/devicetree/bindings/mfd/arizona.txt
> @@ -73,6 +73,12 @@ Optional properties:
> If this node is not mentioned or if the value is unknown, then
> headphone detection mode is set to HPDETL.
>
> + - wlf,use-jd-gpio : Use GPIO input alongwith JD1 for dual pin jack
s/alongwith/along with
> + detection.
> + - wlf,use-jd-gpio-nopull : Internal pull on GPIO is disabled when used for
> + jack detection.
> + - wlf,jd-invert : Invert the polarity of the jack detection switch
> +
> - wlf,micd-software-compare : Use a software comparison to determine mic
> presence
> - wlf,micd-detect-debounce : Additional software microphone detection
>
If you fixes the minor typo, looks good to me.
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Thanks,
Chanwoo Choi
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection
2015-09-10 11:41 [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax
` (3 preceding siblings ...)
2015-09-10 11:41 ` [PATCH 6/6] mfd: arizona: Update DT binding documentation for jack detection Charles Keepax
@ 2015-09-11 8:12 ` Chanwoo Choi
4 siblings, 0 replies; 14+ messages in thread
From: Chanwoo Choi @ 2015-09-11 8:12 UTC (permalink / raw)
To: Charles Keepax, lee.jones
Cc: myungjoo.ham, sameo, devicetree, linux-kernel, patches
Hi Charles,
I recommend that you make the cover-letter patches on later.
If you better to explain the patch description on cover-letter patch,
we will understand what is this patch-set more easily.
Thanks,
Chanwoo Choi
On 2015년 09월 10일 20:41, Charles Keepax wrote:
> On Florida some additional settings are required to get accurate
> measurements at the top end of the headphone detection range. This patch
> adds the bits required for this.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm5110-tables.c | 2 ++
> include/linux/mfd/arizona/registers.h | 8 ++++++++
> 2 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
> index acb3bb2..78032e8 100644
> --- a/drivers/mfd/wm5110-tables.c
> +++ b/drivers/mfd/wm5110-tables.c
> @@ -1908,6 +1908,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
> case ARIZONA_HP1_SHORT_CIRCUIT_CTRL:
> case ARIZONA_HP2_SHORT_CIRCUIT_CTRL:
> case ARIZONA_HP3_SHORT_CIRCUIT_CTRL:
> + case ARIZONA_HP_TEST_CTRL_1:
> case ARIZONA_AIF1_BCLK_CTRL:
> case ARIZONA_AIF1_TX_PIN_CTRL:
> case ARIZONA_AIF1_RX_PIN_CTRL:
> @@ -2853,6 +2854,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)
> case ARIZONA_INPUT_ENABLES_STATUS:
> case ARIZONA_OUTPUT_STATUS_1:
> case ARIZONA_RAW_OUTPUT_STATUS_1:
> + case ARIZONA_HP_TEST_CTRL_1:
> case ARIZONA_SLIMBUS_RX_PORT_STATUS:
> case ARIZONA_SLIMBUS_TX_PORT_STATUS:
> case ARIZONA_INTERRUPT_STATUS_1:
> diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
> index e96644c..fe1b5d0 100644
> --- a/include/linux/mfd/arizona/registers.h
> +++ b/include/linux/mfd/arizona/registers.h
> @@ -237,6 +237,7 @@
> #define ARIZONA_HP1_SHORT_CIRCUIT_CTRL 0x4A0
> #define ARIZONA_HP2_SHORT_CIRCUIT_CTRL 0x4A1
> #define ARIZONA_HP3_SHORT_CIRCUIT_CTRL 0x4A2
> +#define ARIZONA_HP_TEST_CTRL_1 0x4A4
> #define ARIZONA_SPK_CTRL_2 0x4B5
> #define ARIZONA_SPK_CTRL_3 0x4B6
> #define ARIZONA_DAC_COMP_1 0x4DC
> @@ -3548,6 +3549,13 @@
> #define ARIZONA_HP3_SC_ENA_WIDTH 1 /* HP3_SC_ENA */
>
> /*
> + * R1188 (0x4A4) HP Test Ctrl 1
> + */
> +#define ARIZONA_HP1_TST_CAP_SEL_MASK 0x0003 /* HP1_TST_CAP_SEL - [1:0] */
> +#define ARIZONA_HP1_TST_CAP_SEL_SHIFT 0 /* HP1_TST_CAP_SEL - [1:0] */
> +#define ARIZONA_HP1_TST_CAP_SEL_WIDTH 2 /* HP1_TST_CAP_SEL - [1:0] */
> +
> +/*
> * R1244 (0x4DC) - DAC comp 1
> */
> #define ARIZONA_OUT_COMP_COEFF_MASK 0xFFFF /* OUT_COMP_COEFF - [15:0] */
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/6] Arizona Extcon Update Device Bindings
@ 2015-09-16 9:56 Charles Keepax
[not found] ` <1442397404-7579-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
0 siblings, 1 reply; 14+ messages in thread
From: Charles Keepax @ 2015-09-16 9:56 UTC (permalink / raw)
To: cw00.choi, lee.jones
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
myungjoo.ham, sameo, devicetree, linux-kernel
Hi,
This patch chain adds device bindings for the jack and
microphone detection system specific settings.
Some of the bindings in this chain depend on features that
are being added in the following chain of patches:
https://lkml.org/lkml/2015/9/16/244
Thanks,
Charles
Charles Keepax (6):
extcon: arizona: Add device binding to enable ADC mode micdet
extcon: arizona: Add device binding for the general purpose switch
extcon: arizona: Add device binding for jack detect polarity
inversion
extcon: arizona: Add device binding for second jack detect pin on
GPIO5
mfd: arizona: Update DT binding documentation for mic detection
mfd: arizona: Update DT binding documentation for jack detection
Documentation/devicetree/bindings/mfd/arizona.txt | 27 +++++++++++++++++++++
drivers/extcon/extcon-arizona.c | 13 ++++++++++
include/dt-bindings/mfd/arizona.h | 5 ++++
3 files changed, 45 insertions(+), 0 deletions(-)
--
1.7.2.5
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2015-09-20 4:17 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-10 11:41 [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax
[not found] ` <1441885307-24499-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2015-09-10 11:41 ` [PATCH 2/6] extcon: arizona: Additional settings to improve accuracy of HP detect Charles Keepax
2015-09-11 8:16 ` Chanwoo Choi
2015-09-10 11:41 ` [PATCH 3/6] extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS Charles Keepax
[not found] ` <1441885307-24499-3-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2015-09-11 8:05 ` Chanwoo Choi
2015-09-10 11:41 ` [PATCH 4/6] extcon: arizona: Add device binding for jack detect polarity inversion Charles Keepax
[not found] ` <1441885307-24499-4-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2015-09-11 8:07 ` Chanwoo Choi
2015-09-10 11:41 ` [PATCH 5/6] extcon: arizona: Add device binding for second jack detect pin on GPIO5 Charles Keepax
2015-09-11 8:07 ` Chanwoo Choi
2015-09-10 11:41 ` [PATCH 6/6] mfd: arizona: Update DT binding documentation for jack detection Charles Keepax
2015-09-11 8:09 ` Chanwoo Choi
2015-09-11 8:12 ` [PATCH 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Chanwoo Choi
-- strict thread matches above, loose matches on Subject: below --
2015-09-16 9:56 [PATCH 0/6] Arizona Extcon Update Device Bindings Charles Keepax
[not found] ` <1442397404-7579-1-git-send-email-ckeepax-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2015-09-16 9:56 ` [PATCH 6/6] mfd: arizona: Update DT binding documentation for jack detection Charles Keepax
2015-09-20 4:17 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).