Improve quirks detection for es8336

sound/soc/codecs/Kconfig

@@ -1076,13 +1076,18 @@ config SND_SOC_ES7134
 config SND_SOC_ES7241
 	tristate "Everest Semi ES7241 CODEC"
 
+config SND_SOC_ES83XX_DSM_COMMON
+	tristate
+
 config SND_SOC_ES8316
 	tristate "Everest Semi ES8316 CODEC"
 	depends on I2C
+	select SND_SOC_ES83XX_DSM_COMMON if ACPI
 
 config SND_SOC_ES8326
 	tristate "Everest Semi ES8326 CODEC"
 	depends on I2C
+	select SND_SOC_ES83XX_DSM_COMMON if ACPI
 
 config SND_SOC_ES8328
 	tristate

sound/soc/codecs/Makefile

@@ -116,6 +116,7 @@ snd-soc-da9055-objs := da9055.o
 snd-soc-dmic-objs := dmic.o
 snd-soc-es7134-objs := es7134.o
 snd-soc-es7241-objs := es7241.o
+snd-soc-es83xx-dsm-common-objs := es83xx-dsm-common.o
 snd-soc-es8316-objs := es8316.o
 snd-soc-es8326-objs := es8326.o
 snd-soc-es8328-objs := es8328.o
@@ -505,6 +506,7 @@ obj-$(CONFIG_SND_SOC_DA9055)	+= snd-soc-da9055.o
 obj-$(CONFIG_SND_SOC_DMIC)	+= snd-soc-dmic.o
 obj-$(CONFIG_SND_SOC_ES7134)	+= snd-soc-es7134.o
 obj-$(CONFIG_SND_SOC_ES7241)	+= snd-soc-es7241.o
+obj-$(CONFIG_SND_SOC_ES83XX_DSM_COMMON)    += snd-soc-es83xx-dsm-common.o
 obj-$(CONFIG_SND_SOC_ES8316)    += snd-soc-es8316.o
 obj-$(CONFIG_SND_SOC_ES8326)    += snd-soc-es8326.o
 obj-$(CONFIG_SND_SOC_ES8328)	+= snd-soc-es8328.o

sound/soc/codecs/es8316.c

@@ -22,6 +22,7 @@
 #include <sound/tlv.h>
 #include <sound/jack.h>
 #include "es8316.h"
+#include "es83xx-dsm-common.h"
 
 /* In slave mode at single speed, the codec is documented as accepting 5
  * MCLK/LRCK ratios, but we also add ratio 400, which is commonly used on
@@ -689,8 +690,13 @@ static void es8316_enable_jack_detect(struct snd_soc_component *component,
 	 * guarantee that the bytchr-es8316 driver, which might set this
 	 * property, will probe before us.
 	 */
-	es8316->jd_inverted = device_property_read_bool(component->dev,
-							"everest,jack-detect-inverted");
+
+	if (device_property_read_bool(component->dev,
+				      "everest,jack-detect-inverted"))
+		es8316->jd_inverted = true;
+	if (device_property_read_bool(component->dev,
+				      "everest,jack-detect-not-inverted"))
+		es8316->jd_inverted = false;
 
 	mutex_lock(&es8316->lock);
 
@@ -862,6 +868,16 @@ static int es8316_i2c_probe(struct i2c_client *i2c_client)
 	if (es8316 == NULL)
 		return -ENOMEM;
 
+	es83xx_dsm_dump(dev);
+
+	/* read jack information from _DSM */
+	ret = es83xx_dsm_jack_inverted(dev);
+	if (ret < 0)
+		dev_warn(dev, "%s: Could not get jack detection information with ACPI _DSM method\n",
+			 __func__);
+	else
+		es8316->jd_inverted = ret;
+
 	i2c_set_clientdata(i2c_client, es8316);
 
 	es8316->regmap = devm_regmap_init_i2c(i2c_client, &es8316_regmap);

sound/soc/codecs/es8326.c

@@ -17,6 +17,7 @@
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include "es8326.h"
+#include "es83xx-dsm-common.h"
 
 struct es8326_priv {
 	struct clk *mclk;
@@ -907,8 +908,9 @@ static int es8326_probe(struct snd_soc_component *component)
 	int ret;
 
 	es8326->component = component;
-	es8326->jd_inverted = device_property_read_bool(component->dev,
-							"everest,jack-detect-inverted");
+	if (device_property_read_bool(component->dev,
+				      "everest,jack-detect-inverted"))
+		es8326->jd_inverted = true;
 
 	ret = device_property_read_u8(component->dev, "everest,mic1-src", &es8326->mic1_src);
 	if (ret != 0) {
@@ -1020,13 +1022,24 @@ static const struct snd_soc_component_driver soc_component_dev_es8326 = {
 
 static int es8326_i2c_probe(struct i2c_client *i2c)
 {
+	struct device *dev = &i2c->dev;
 	struct es8326_priv *es8326;
 	int ret;
 
 	es8326 = devm_kzalloc(&i2c->dev, sizeof(struct es8326_priv), GFP_KERNEL);
 	if (!es8326)
 		return -ENOMEM;
 
+	es83xx_dsm_dump(dev);
+
+	/* read jack information from _DSM */
+	ret = es83xx_dsm_jack_inverted(dev);
+	if (ret < 0)
+		dev_warn(dev, "%s: Could not get jack detection information with ACPI _DSM method\n",
+			 __func__);
+	else
+		es8326->jd_inverted = ret;
+
 	i2c_set_clientdata(i2c, es8326);
 	es8326->i2c = i2c;
 	mutex_init(&es8326->lock);