Add the selection of DA7219 Jack insertion detection polarity
- Default polarity (Low)
- Inverted polarity (High)

Signed-off-by: David Rau <David.Rau.opensource@dm.renesas.com>
---
 sound/soc/codecs/Kconfig      | 24 +++++++++++++++++++++++-
 sound/soc/codecs/da7219-aad.c | 16 ++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 79d2362ad055..96f934ad52e7 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -967,9 +967,31 @@ config SND_SOC_DA7218
 	depends on I2C
 
 config SND_SOC_DA7219
-	tristate
+	tristate "Dialog DA7219 CODEC"
 	depends on I2C
 
+if SND_SOC_DA7219
+
+choice
+	bool "DA7219 Jack insertion detection polarity selection"
+	default DA7219_DEFAULT_JACK_INSERTION_POLARITY if (SND_SOC_DA7219)
+
+config DA7219_DEFAULT_JACK_INSERTION_POLARITY
+    bool "Default polarity"
+	depends on SND_SOC_DA7219
+    help
+	  Select this option if your DA7219 codec with default Jack insertion detection polarity (Low).
+
+config DA7219_INVERTED_JACK_INSERTION_POLARITY
+    bool "Inverted polarity"
+	depends on SND_SOC_DA7219
+    help
+	  Select this option if your DA7219 codec with inverted Jack insertion detection polarity (High).
+
+endchoice
+
+endif # SND_SOC_DA7219
+
 config SND_SOC_DA732X
 	tristate
 	depends on I2C
diff --git a/sound/soc/codecs/da7219-aad.c b/sound/soc/codecs/da7219-aad.c
index 993a0d00bc48..9d16112cff6b 100644
--- a/sound/soc/codecs/da7219-aad.c
+++ b/sound/soc/codecs/da7219-aad.c
@@ -879,6 +879,18 @@ static void da7219_aad_handle_gnd_switch_time(struct snd_soc_component *componen
 	}
 }
 
+static void da7219_aad_handle_polarity(struct snd_soc_component *component)
+{
+	snd_soc_component_write(component, 0xF0, 0x8B);
+
+	if (IS_ENABLED(CONFIG_DA7219_DEFAULT_JACK_INSERTION_POLARITY))
+		snd_soc_component_write(component, 0x75, 0x80);
+	else if (IS_ENABLED(CONFIG_DA7219_INVERTED_JACK_INSERTION_POLARITY))
+		snd_soc_component_write(component, 0x75, 0x00);
+
+	snd_soc_component_write(component, 0xF0, 0x00);
+}
+
 /*
  * Suspend/Resume
  */
@@ -955,8 +967,12 @@ int da7219_aad_init(struct snd_soc_component *component)
 	snd_soc_component_update_bits(component, DA7219_ACCDET_CONFIG_1,
 			    DA7219_BUTTON_CONFIG_MASK, 0);
 
+	/* Handle the default ground switch delay time */
 	da7219_aad_handle_gnd_switch_time(component);
 
+	/* Handle the Jack insertion detection polarity */
+	da7219_aad_handle_polarity(component);
+
 	da7219_aad->aad_wq = create_singlethread_workqueue("da7219-aad");
 	if (!da7219_aad->aad_wq) {
 		dev_err(component->dev, "Failed to create aad workqueue\n");
-- 
2.17.1

On Thu, May 04, 2023 at 08:22:18AM +0000, David Rau wrote:

> +choice
> +	bool "DA7219 Jack insertion detection polarity selection"
> +	default DA7219_DEFAULT_JACK_INSERTION_POLARITY if (SND_SOC_DA7219)
> +
> +config DA7219_DEFAULT_JACK_INSERTION_POLARITY
> +    bool "Default polarity"
> +	depends on SND_SOC_DA7219
> +    help
> +	  Select this option if your DA7219 codec with default Jack insertion detection polarity (Low).
> +
> +config DA7219_INVERTED_JACK_INSERTION_POLARITY
> +    bool "Inverted polarity"
> +	depends on SND_SOC_DA7219
> +    help
> +	  Select this option if your DA7219 codec with inverted Jack insertion detection polarity (High).

I would expect these things to be fixed for a given board and therefore
configured with a DT property rather than a kernel config.  It should be
possible to use the same kernel on multiple boards.

> +
> +endchoice
> +
> +endif # SND_SOC_DA7219
> +
>  config SND_SOC_DA732X
>  	tristate
>  	depends on I2C
> diff --git a/sound/soc/codecs/da7219-aad.c b/sound/soc/codecs/da7219-aad.c
> index 993a0d00bc48..9d16112cff6b 100644
> --- a/sound/soc/codecs/da7219-aad.c
> +++ b/sound/soc/codecs/da7219-aad.c
> @@ -879,6 +879,18 @@ static void da7219_aad_handle_gnd_switch_time(struct snd_soc_component *componen
>  	}
>  }
>  
> +static void da7219_aad_handle_polarity(struct snd_soc_component *component)
> +{
> +	snd_soc_component_write(component, 0xF0, 0x8B);
> +
> +	if (IS_ENABLED(CONFIG_DA7219_DEFAULT_JACK_INSERTION_POLARITY))
> +		snd_soc_component_write(component, 0x75, 0x80);
> +	else if (IS_ENABLED(CONFIG_DA7219_INVERTED_JACK_INSERTION_POLARITY))
> +		snd_soc_component_write(component, 0x75, 0x00);
> +
> +	snd_soc_component_write(component, 0xF0, 0x00);
> +}
> +
>  /*
>   * Suspend/Resume
>   */
> @@ -955,8 +967,12 @@ int da7219_aad_init(struct snd_soc_component *component)
>  	snd_soc_component_update_bits(component, DA7219_ACCDET_CONFIG_1,
>  			    DA7219_BUTTON_CONFIG_MASK, 0);
>  
> +	/* Handle the default ground switch delay time */
>  	da7219_aad_handle_gnd_switch_time(component);
>  
> +	/* Handle the Jack insertion detection polarity */
> +	da7219_aad_handle_polarity(component);
> +
>  	da7219_aad->aad_wq = create_singlethread_workqueue("da7219-aad");
>  	if (!da7219_aad->aad_wq) {
>  		dev_err(component->dev, "Failed to create aad workqueue\n");
> -- 
> 2.17.1
>