LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [alsa-devel] [PATCH v3 0/2] Add support for select accessory detect mode to HPDETL or HPDETR
@ 2015-04-22 11:23 Inha Song
  2015-04-22 11:23 ` [alsa-devel] [PATCH v3 1/2] extcon: arizona: Add support for select accessory detect mode when headphone detection Inha Song
  2015-04-22 11:23 ` [alsa-devel] [PATCH v3 2/2] mfd: arizona: Update DT binding to support hpdet channel Inha Song
  0 siblings, 2 replies; 6+ messages in thread
From: Inha Song @ 2015-04-22 11:23 UTC (permalink / raw)
  To: lee.jones
  Cc: devicetree, alsa-devel, linux-kernel, patches, cw00.choi,
	broonie, ckeepax, rf, robh+dt, pawel.moll, mark.rutland,
	ijc+devicetree, Inha Song

This set of patches adds support for select accessory detect mode to HPDETL or HPDETR.

Changes in v3:
  - Set the hpdet_channel default value to HPDETL If the value is unknown or invalid.

Changes in v2:
  - Use the value in pdata instead of hpdet_channel in extcon_info.
  - Wrap arizona_extcon_of_get in IS_ENABLED(CONFIG_OF).
  - Change hpdet_channel type to unsigned from signed in pdata.
  - Move ARIZONA_ACCDET_MODE_* define to dt-binding header and directly set it to pdata.

Inha Song (2):
  extcon: arizona: Add support for select accessory detect mode when
    headphone detection
  mfd: arizona: Update DT binding to support hpdet channel

 Documentation/devicetree/bindings/mfd/arizona.txt |  6 ++++
 drivers/extcon/extcon-arizona.c                   | 38 ++++++++++++++++++-----
 include/dt-bindings/mfd/arizona.h                 |  8 +++++
 include/linux/mfd/arizona/pdata.h                 |  3 ++
 4 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 include/dt-bindings/mfd/arizona.h

-- 
2.0.0.390.gcb682f8


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [alsa-devel] [PATCH v3 1/2] extcon: arizona: Add support for select accessory detect mode when headphone detection
  2015-04-22 11:23 [alsa-devel] [PATCH v3 0/2] Add support for select accessory detect mode to HPDETL or HPDETR Inha Song
@ 2015-04-22 11:23 ` Inha Song
  2015-04-25 12:50   ` Charles Keepax
  2015-04-22 11:23 ` [alsa-devel] [PATCH v3 2/2] mfd: arizona: Update DT binding to support hpdet channel Inha Song
  1 sibling, 1 reply; 6+ messages in thread
From: Inha Song @ 2015-04-22 11:23 UTC (permalink / raw)
  To: lee.jones
  Cc: devicetree, alsa-devel, linux-kernel, patches, cw00.choi,
	broonie, ckeepax, rf, robh+dt, pawel.moll, mark.rutland,
	ijc+devicetree, Inha Song

This patch add support for select accessory detect mode to HPDETL or HPDETR.
Arizona provides a headphone detection circuit on the HPDETL and HPDETR pins
to measure the impedance of an external load connected to the headphone.

Depending on board design, headphone detect pins can change to HPDETR or HPDETL.

Signed-off-by: Inha Song <ideal.song@samsung.com>
---
 drivers/extcon/extcon-arizona.c   | 38 ++++++++++++++++++++++++++++++--------
 include/dt-bindings/mfd/arizona.h |  8 ++++++++
 include/linux/mfd/arizona/pdata.h |  3 +++
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 include/dt-bindings/mfd/arizona.h

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 63f01c4..d9284af 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -32,13 +32,10 @@
 #include <linux/mfd/arizona/core.h>
 #include <linux/mfd/arizona/pdata.h>
 #include <linux/mfd/arizona/registers.h>
+#include <dt-bindings/mfd/arizona.h>
 
 #define ARIZONA_MAX_MICD_RANGE 8
 
-#define ARIZONA_ACCDET_MODE_MIC 0
-#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
@@ -653,9 +650,9 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info)
 	ret = regmap_update_bits(arizona->regmap,
 				 ARIZONA_ACCESSORY_DETECT_MODE_1,
 				 ARIZONA_ACCDET_MODE_MASK,
-				 ARIZONA_ACCDET_MODE_HPL);
+				 arizona->pdata.hpdet_channel);
 	if (ret != 0) {
-		dev_err(arizona->dev, "Failed to set HPDETL mode: %d\n", ret);
+		dev_err(arizona->dev, "Failed to set HPDET mode: %d\n", ret);
 		goto err;
 	}
 
@@ -705,9 +702,9 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info)
 				 ARIZONA_ACCESSORY_DETECT_MODE_1,
 				 ARIZONA_ACCDET_SRC | ARIZONA_ACCDET_MODE_MASK,
 				 info->micd_modes[0].src |
-				 ARIZONA_ACCDET_MODE_HPL);
+				 arizona->pdata.hpdet_channel);
 	if (ret != 0) {
-		dev_err(arizona->dev, "Failed to set HPDETL mode: %d\n", ret);
+		dev_err(arizona->dev, "Failed to set HPDET mode: %d\n", ret);
 		goto err;
 	}
 
@@ -1103,6 +1100,26 @@ static void arizona_micd_set_level(struct arizona *arizona, int index,
 	regmap_update_bits(arizona->regmap, reg, mask, level);
 }
 
+static int arizona_extcon_of_get_pdata(struct arizona *arizona)
+{
+	struct arizona_pdata *pdata = &arizona->pdata;
+	unsigned int val;
+
+	of_property_read_u32(arizona->dev->of_node, "wlf,hpdet-channel", &val);
+	switch (val) {
+	case ARIZONA_ACCDET_MODE_HPL:
+	case ARIZONA_ACCDET_MODE_HPR:
+		pdata->hpdet_channel = val;
+		break;
+	default:
+		dev_err(arizona->dev,
+			"Wrong wlf,hpdet-channel DT value %d\n", val);
+		pdata->hpdet_channel = ARIZONA_ACCDET_MODE_HPL;
+	}
+
+	return 0;
+}
+
 static int arizona_extcon_probe(struct platform_device *pdev)
 {
 	struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
@@ -1120,6 +1137,11 @@ static int arizona_extcon_probe(struct platform_device *pdev)
 	if (!info)
 		return -ENOMEM;
 
+	if (IS_ENABLED(CONFIG_OF)) {
+		if (!dev_get_platdata(arizona->dev))
+			arizona_extcon_of_get_pdata(arizona);
+	}
+
 	info->micvdd = devm_regulator_get(&pdev->dev, "MICVDD");
 	if (IS_ERR(info->micvdd)) {
 		ret = PTR_ERR(info->micvdd);
diff --git a/include/dt-bindings/mfd/arizona.h b/include/dt-bindings/mfd/arizona.h
new file mode 100644
index 0000000..9ecff78
--- /dev/null
+++ b/include/dt-bindings/mfd/arizona.h
@@ -0,0 +1,8 @@
+#ifndef __DT_BINDINGS_ARIZONA_H__
+#define __DT_BINDINGS_ARIZONA_H__
+
+#define ARIZONA_ACCDET_MODE_MIC 0
+#define ARIZONA_ACCDET_MODE_HPL 1
+#define ARIZONA_ACCDET_MODE_HPR 2
+
+#endif /* __DT_BINDINGS_ARIZONA_H__ */
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 4578c72..2473a67 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -139,6 +139,9 @@ struct arizona_pdata {
 	/** GPIO used for mic isolation with HPDET */
 	int hpdet_id_gpio;
 
+	/** Channel to use for headphone detection */
+	unsigned int hpdet_channel;
+
 	/** Extra debounce timeout used during initial mic detection (ms) */
 	int micd_detect_debounce;
 
-- 
2.0.0.390.gcb682f8


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [alsa-devel] [PATCH v3 2/2] mfd: arizona: Update DT binding to support hpdet channel
  2015-04-22 11:23 [alsa-devel] [PATCH v3 0/2] Add support for select accessory detect mode to HPDETL or HPDETR Inha Song
  2015-04-22 11:23 ` [alsa-devel] [PATCH v3 1/2] extcon: arizona: Add support for select accessory detect mode when headphone detection Inha Song
@ 2015-04-22 11:23 ` Inha Song
  2015-04-25 12:51   ` Charles Keepax
  1 sibling, 1 reply; 6+ messages in thread
From: Inha Song @ 2015-04-22 11:23 UTC (permalink / raw)
  To: lee.jones
  Cc: devicetree, alsa-devel, linux-kernel, patches, cw00.choi,
	broonie, ckeepax, rf, robh+dt, pawel.moll, mark.rutland,
	ijc+devicetree, Inha Song

This patch add device tree bindings for the pdata needed to configure
the Accessory Detect Mode select when Headphone detection.

Signed-off-by: Inha Song <ideal.song@samsung.com>
---
 Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index 7bd1273..401b0b8 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -49,6 +49,12 @@ Optional properties:
     input singals. If values less than the number of input signals, elements
     that has not been specifed are set to 0 by default.
 
+  - wlf,hpdet-channel : Headphone detection channel.
+	1 or ARIZONA_ACCDET_MODE_HPL - Headphone detect mode is set to HPDETL
+	2 or ARIZONA_ACCDET_MODE_HPR - Headphone detect mode is set to HPDETR
+	If this node is not mentioned or if the value is unknown, then
+	headphone detection mode is set to HPDETL.
+
   - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
     they are being externally supplied. As covered in
     Documentation/devicetree/bindings/regulator/regulator.txt
-- 
2.0.0.390.gcb682f8


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [alsa-devel] [PATCH v3 1/2] extcon: arizona: Add support for select accessory detect mode when headphone detection
  2015-04-22 11:23 ` [alsa-devel] [PATCH v3 1/2] extcon: arizona: Add support for select accessory detect mode when headphone detection Inha Song
@ 2015-04-25 12:50   ` Charles Keepax
  2015-04-27  1:26     ` Inha Song
  0 siblings, 1 reply; 6+ messages in thread
From: Charles Keepax @ 2015-04-25 12:50 UTC (permalink / raw)
  To: Inha Song
  Cc: lee.jones, devicetree, alsa-devel, linux-kernel, patches,
	cw00.choi, broonie, rf, robh+dt, pawel.moll, mark.rutland,
	ijc+devicetree

On Wed, Apr 22, 2015 at 08:23:20PM +0900, Inha Song wrote:
> This patch add support for select accessory detect mode to HPDETL or HPDETR.
> Arizona provides a headphone detection circuit on the HPDETL and HPDETR pins
> to measure the impedance of an external load connected to the headphone.
> 
> Depending on board design, headphone detect pins can change to HPDETR or HPDETL.
> 
> Signed-off-by: Inha Song <ideal.song@samsung.com>
> ---
>  
> +static int arizona_extcon_of_get_pdata(struct arizona *arizona)
> +{
> +	struct arizona_pdata *pdata = &arizona->pdata;
> +	unsigned int val;

I would rather this is "unsigned int val =
ARIZONA_ACCDET_MODE_HPL;".

> +
> +	of_property_read_u32(arizona->dev->of_node, "wlf,hpdet-channel", &val);

Because this won't fill val if the DT entry isn't present.

> +	switch (val) {

Which means we hit this with val uninitialised.

> +	case ARIZONA_ACCDET_MODE_HPL:
> +	case ARIZONA_ACCDET_MODE_HPR:

So we may select either channel at random.

> +		pdata->hpdet_channel = val;
> +		break;
> +	default:
> +		dev_err(arizona->dev,
> +			"Wrong wlf,hpdet-channel DT value %d\n", val);

Or most likely just print an error but the DT being missing
shouldn't really be an error it is an optional entry.

> +		pdata->hpdet_channel = ARIZONA_ACCDET_MODE_HPL;
> +	}
> +
> +	return 0;
> +}

Thanks,
Charles

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [alsa-devel] [PATCH v3 2/2] mfd: arizona: Update DT binding to support hpdet channel
  2015-04-22 11:23 ` [alsa-devel] [PATCH v3 2/2] mfd: arizona: Update DT binding to support hpdet channel Inha Song
@ 2015-04-25 12:51   ` Charles Keepax
  0 siblings, 0 replies; 6+ messages in thread
From: Charles Keepax @ 2015-04-25 12:51 UTC (permalink / raw)
  To: Inha Song
  Cc: lee.jones, devicetree, alsa-devel, linux-kernel, patches,
	cw00.choi, broonie, rf, robh+dt, pawel.moll, mark.rutland,
	ijc+devicetree

On Wed, Apr 22, 2015 at 08:23:21PM +0900, Inha Song wrote:
> This patch add device tree bindings for the pdata needed to configure
> the Accessory Detect Mode select when Headphone detection.
> 
> Signed-off-by: Inha Song <ideal.song@samsung.com>
> ---
>  Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
> index 7bd1273..401b0b8 100644
> --- a/Documentation/devicetree/bindings/mfd/arizona.txt
> +++ b/Documentation/devicetree/bindings/mfd/arizona.txt
> @@ -49,6 +49,12 @@ Optional properties:
>      input singals. If values less than the number of input signals, elements
>      that has not been specifed are set to 0 by default.
>  
> +  - wlf,hpdet-channel : Headphone detection channel.
> +	1 or ARIZONA_ACCDET_MODE_HPL - Headphone detect mode is set to HPDETL
> +	2 or ARIZONA_ACCDET_MODE_HPR - Headphone detect mode is set to HPDETR
> +	If this node is not mentioned or if the value is unknown, then
> +	headphone detection mode is set to HPDETL.
> +

Could we make the indentation here match the rest of the file.

Thanks,
Charles

>    - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
>      they are being externally supplied. As covered in
>      Documentation/devicetree/bindings/regulator/regulator.txt
> -- 
> 2.0.0.390.gcb682f8
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [alsa-devel] [PATCH v3 1/2] extcon: arizona: Add support for select accessory detect mode when headphone detection
  2015-04-25 12:50   ` Charles Keepax
@ 2015-04-27  1:26     ` Inha Song
  0 siblings, 0 replies; 6+ messages in thread
From: Inha Song @ 2015-04-27  1:26 UTC (permalink / raw)
  To: Charles Keepax
  Cc: lee.jones, devicetree, alsa-devel, linux-kernel, patches,
	cw00.choi, broonie, rf, robh+dt, pawel.moll, mark.rutland,
	ijc+devicetree

Hi,

Thanks for your comments :)


On Sat, 25 Apr 2015 13:50:25 +0100
Charles Keepax <ckeepax@opensource.wolfsonmicro.com> wrote:

> On Wed, Apr 22, 2015 at 08:23:20PM +0900, Inha Song wrote:
> > This patch add support for select accessory detect mode to HPDETL or HPDETR.
> > Arizona provides a headphone detection circuit on the HPDETL and HPDETR pins
> > to measure the impedance of an external load connected to the headphone.
> > 
> > Depending on board design, headphone detect pins can change to HPDETR or HPDETL.
> > 
> > Signed-off-by: Inha Song <ideal.song@samsung.com>
> > ---
> >  
> > +static int arizona_extcon_of_get_pdata(struct arizona *arizona)
> > +{
> > +	struct arizona_pdata *pdata = &arizona->pdata;
> > +	unsigned int val;
> 
> I would rather this is "unsigned int val =
> ARIZONA_ACCDET_MODE_HPL;".
> 
> > +
> > +	of_property_read_u32(arizona->dev->of_node, "wlf,hpdet-channel", &val);
> 
> Because this won't fill val if the DT entry isn't present.
> 
> > +	switch (val) {
> 
> Which means we hit this with val uninitialised.
> 
> > +	case ARIZONA_ACCDET_MODE_HPL:
> > +	case ARIZONA_ACCDET_MODE_HPR:
> 
> So we may select either channel at random.

Opps, Ok, I will set the default value to ARIZONA_ACCDET_MODE_HPL.

> 
> > +		pdata->hpdet_channel = val;
> > +		break;
> > +	default:
> > +		dev_err(arizona->dev,
> > +			"Wrong wlf,hpdet-channel DT value %d\n", val);
> 
> Or most likely just print an error but the DT being missing
> shouldn't really be an error it is an optional entry.

If the default value is set to ARIZONA_ACCDET_MODE_HPL,
Only the print will be shown, when an invalid value is set by DT.
So, This is a resonable error message.

Best Regards,
Inha Song.

> 
> > +		pdata->hpdet_channel = ARIZONA_ACCDET_MODE_HPL;
> > +	}
> > +
> > +	return 0;
> > +}
> 
> Thanks,
> Charles

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-04-27  1:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-22 11:23 [alsa-devel] [PATCH v3 0/2] Add support for select accessory detect mode to HPDETL or HPDETR Inha Song
2015-04-22 11:23 ` [alsa-devel] [PATCH v3 1/2] extcon: arizona: Add support for select accessory detect mode when headphone detection Inha Song
2015-04-25 12:50   ` Charles Keepax
2015-04-27  1:26     ` Inha Song
2015-04-22 11:23 ` [alsa-devel] [PATCH v3 2/2] mfd: arizona: Update DT binding to support hpdet channel Inha Song
2015-04-25 12:51   ` Charles Keepax

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).