Arizona extcon improvements
Subsystems (4)
v2 cover Arizona extcon improvements
This patch series does two major things:
- Adds a fix that resolves an issue where the headphone detection accuracy is poor at high impedances (such as line loads)
- Adds device tree bindings for some additional jack detection features specifically allowing the use of the second jack detection pin on GPIO5 and support for inverted polarity jack sockets
Thanks,
Charles
Charles Keepax (5):
mfd: arizona: Add TST_CAP bits for headphone detection
extcon: arizona: Additional settings to improve accuracy of HP detect
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 jack detection
Nariman Poushin (1):
extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS
Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++ drivers/extcon/extcon-arizona.c | 32 +++++++++++++++++---- drivers/mfd/wm5110-tables.c | 2 + include/linux/mfd/arizona/registers.h | 8 +++++ 4 files changed, 42 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.2.5
PATCH v2 1/6 mfd: arizona: Add TST_CAP bits for headphone detection
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.
---
No change since v1.
drivers/mfd/wm5110-tables.c | 2 ++ include/linux/mfd/arizona/registers.h | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-)
drivers/mfd/wm5110-tables.c +2 -0
@@ -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 :
include/linux/mfd/arizona/registers.h +8 -0
@@ -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] */
Signature · 6 lines
1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 1/6] mfd: arizona: Add TST_CAP bits for headphone detection
Quoted 6 lines · Charles Keepax
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.
Acked-by Chanwoo Choi <[email protected]>
Apologies Chanwoo's ack should not have been added to this patch.
Thanks,
Charles
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 1/6 mfd: arizona: Add TST_CAP bits for headphone detection
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.
---
Changes since v2:
- Removed accidental addition of Chanwoo's ack.
Thanks,
Charles
drivers/mfd/wm5110-tables.c | 2 ++ include/linux/mfd/arizona/registers.h | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-)
drivers/mfd/wm5110-tables.c +2 -0
@@ -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 :
include/linux/mfd/arizona/registers.h +8 -0
@@ -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] */
Signature · 1 line
1.7.2.5
Chanwoo Choi
maintainerRe: [PATCH v3 1/6] mfd: arizona: Add TST_CAP bits for headphone detection
Hi Charles,
Your following patch-set[1][2] receive the ack message about almost patches. But, a few patches[3][4][5] must need the ack message from each maintainer.
[1] http://www.spinics.net/lists/devicetree/msg93383.html
[2] https://lkml.org/lkml/2015/8/11/145
[3] patch1 is included in patch-set[1]
: [PATCH v3 1/6] mfd: arizona: Add TST_CAP bits for headphone detection
[4] patch6 is included in patch-set[1]
: [PATCH v2 6/6] mfd: arizona: Update DT binding documentation for jack detection
[5] patch5 is included in patch-set[2]
[PATCH RESEND 5/5] mfd: arizona: Update DT doc for new mic detection bindings
So, if all patches receive the ack message, I'll create the immutable branch for both EXTCON and MFD. And then I'll send the pull request to the Lee Jones(MFD maintainer)
Thanks,
Chanwoo Choi
Quoted 64 lines · Charles Keepax
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 <[email protected]>---
Changes since v2:
- Removed accidental addition of Chanwoo's ack.Thanks,
Charlesdrivers/mfd/wm5110-tables.c | 2 ++ include/linux/mfd/arizona/registers.h | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-)drivers/mfd/wm5110-tables.c +2
-0@@ -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 :include/linux/mfd/arizona/registers.h +8
-0@@ -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] */
Re: [PATCH v3 1/6] mfd: arizona: Add TST_CAP bits for headphone detection
Quoted 12 lines · Chanwoo Choi
Hi Charles,
Your following patch-set[1][2] receive the ack message about almost patches. But, a few patches[3][4][5] must need the ack message from each maintainer.
[1] http://www.spinics.net/lists/devicetree/msg93383.html
[2] https://lkml.org/lkml/2015/8/11/145
[3] patch1 is included in patch-set[1]
: [PATCH v3 1/6] mfd: arizona: AddTST_CAPbits for headphone detection
[4] patch6 is included in patch-set[1]
: [PATCH v2 6/6] mfd: arizona: Update DT binding documentation for jack detection
[5] patch5 is included in patch-set[2]
[PATCH RESEND 5/5] mfd: arizona: Update DT doc for new mic detection bindings
:-) Getting a DT ack is not an easy thing, like gold dust those are.
If we are going to make merging anything dependent on an ack from the DT guys I will probably merge these two series of patches, then resplit (and resend) them into changes that affect DT and those that don't. That way at least we can get something in, as I am starting to carry a fair backlog of changes on this one and it reduces the amount of diff that the very busy DT guys will need to look at.
Thanks,
Charles
PATCH v2 2/6 extcon: arizona: Additional settings to improve accuracy of HP detect
In reply to Charles KeepaxIf 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.
---
No change since v1.
drivers/extcon/extcon-arizona.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-)
drivers/extcon/extcon-arizona.c +17 -2
@@ -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 ;
Signature · 6 lines
1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 3/6 extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS
In reply to Charles KeepaxFrom: Nariman Poushin <[email protected]>
The polarity of MICD_CLAMP_STS does not change when different clamp modes are used, this patch corrects this issue.
---
No change since v1.
drivers/extcon/extcon-arizona.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/extcon/extcon-arizona.c +1 -4
@@ -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)
Signature · 1 line
1.7.2.5
PATCH v2 4/6 extcon: arizona: Add device binding for jack detect polarity inversion
In reply to Charles KeepaxBy default the driver expects the jackdet pin to be pulled low when a jack is inserted. This patch adds a device binding that allows the user to specify that the jackdet pin will be pulled high when a jack is inserted.
---
Changes since v1:
- Added more description in the commit message
drivers/extcon/extcon-arizona.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/extcon/extcon-arizona.c +3 -0
@@ -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 ;
Signature · 6 lines
1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 5/6 extcon: arizona: Add device binding for second jack detect pin on GPIO5
In reply to Charles KeepaxSome Arizona devices have the option to use the GPIO5 pin as a second jack detection pin. This patch adds device bindings to specify to the driver that it should use this pin.
---
Changes since v1:
- Added more description in the commit message
drivers/extcon/extcon-arizona.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/extcon/extcon-arizona.c +5 -0
@@ -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 ; }
Signature · 1 line
1.7.2.5
PATCH v2 6/6 mfd: arizona: Update DT binding documentation for jack detection
In reply to Charles KeepaxAdd 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.
---
Changes since v1:
- Fixed minor typo
Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
Documentation/devicetree/bindings/mfd/arizona.txt +6 -0
@@ -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 along with 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
Signature · 6 lines
1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html