Unverified Commit 1bc40efd authored by Edson Juliano Drosdeck's avatar Edson Juliano Drosdeck Committed by Mark Brown
Browse files

ASoC: nau8821: Add DMI quirk mechanism for active-high jack-detect 



Add a quirk mechanism to allow specifying that active-high jack-detection
should be used on platforms where this info is not available in devicetree.

And add an entry for the Positivo CW14Q01P-V2 to the DMI table, so that
jack-detection will work properly on this laptop.

Signed-off-by: default avatarEdson Juliano Drosdeck <edson.drosdeck@gmail.com>
Link: https://lore.kernel.org/r/20230719200241.4865-1-edson.drosdeck@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1477c794

sound/soc/codecs/nau8821.c

+41 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/acpi.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/dmi.h>

#include <linux/init.h>

#include <linux/i2c.h>

#include <linux/module.h>
@@ -25,6 +26,13 @@ 
#include <sound/tlv.h>

#include "nau8821.h"



#define NAU8821_JD_ACTIVE_HIGH			BIT(0)



static int nau8821_quirk;

static int quirk_override = -1;

module_param_named(quirk, quirk_override, uint, 0444);

MODULE_PARM_DESC(quirk, "Board-specific quirk override");



#define NAU_FREF_MAX 13500000

#define NAU_FVCO_MAX 100000000

#define NAU_FVCO_MIN 90000000
@@ -1792,6 +1800,33 @@ static int nau8821_setup_irq(struct nau8821 *nau8821) 
	return 0;

}



/* Please keep this list alphabetically sorted */

static const struct dmi_system_id nau8821_quirk_table[] = {

	{

		/* Positivo CW14Q01P-V2 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Positivo Tecnologia SA"),

			DMI_MATCH(DMI_BOARD_NAME, "CW14Q01P-V2"),

		},

		.driver_data = (void *)(NAU8821_JD_ACTIVE_HIGH),

	},

	{}

};



static void nau8821_check_quirks(void)

{

	const struct dmi_system_id *dmi_id;



	if (quirk_override != -1) {

		nau8821_quirk = quirk_override;

		return;

	}



	dmi_id = dmi_first_match(nau8821_quirk_table);

	if (dmi_id)

		nau8821_quirk = (unsigned long)dmi_id->driver_data;

}



static int nau8821_i2c_probe(struct i2c_client *i2c)

{

	struct device *dev = &i2c->dev;
@@ -1812,6 +1847,12 @@ static int nau8821_i2c_probe(struct i2c_client *i2c) 


	nau8821->dev = dev;

	nau8821->irq = i2c->irq;



	nau8821_check_quirks();



	if (nau8821_quirk & NAU8821_JD_ACTIVE_HIGH)

		nau8821->jkdet_polarity = 0;



	nau8821_print_device_properties(nau8821);



	nau8821_reset_chip(nau8821->regmap);