From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Edson Juliano Drosdeck <edson.drosdeck@gmail.com>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com,
wtli@nuvoton.com, u.kleine-koenig@pengutronix.de,
alsa-devel@alsa-project.org
Subject: [PATCH AUTOSEL 6.1 15/47] ASoC: nau8821: Add DMI quirk mechanism for active-high jack-detect
Date: Sun, 13 Aug 2023 11:59:10 -0400 [thread overview]
Message-ID: <20230813160006.1073695-15-sashal@kernel.org> (raw)
In-Reply-To: <20230813160006.1073695-1-sashal@kernel.org>
From: Edson Juliano Drosdeck <edson.drosdeck@gmail.com>
[ Upstream commit 1bc40efdaf4a0ccfdb10a1c8e4b458f4764e8e5f ]
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: Edson Juliano Drosdeck <edson.drosdeck@gmail.com>
Link: https://lore.kernel.org/r/20230719200241.4865-1-edson.drosdeck@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/codecs/nau8821.c | 41 ++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/sound/soc/codecs/nau8821.c b/sound/soc/codecs/nau8821.c
index 4a72b94e84104..efd92656a060d 100644
--- a/sound/soc/codecs/nau8821.c
+++ b/sound/soc/codecs/nau8821.c
@@ -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
@@ -1696,6 +1704,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;
@@ -1716,6 +1751,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);
--
2.40.1
next prev parent reply other threads:[~2023-08-13 16:03 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-13 15:58 [PATCH AUTOSEL 6.1 01/47] phy: qcom-snps-femto-v2: keep cfg_ahb_clk enabled during runtime suspend Sasha Levin
2023-08-13 15:58 ` [PATCH AUTOSEL 6.1 02/47] phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code Sasha Levin
2023-08-13 15:58 ` [PATCH AUTOSEL 6.1 03/47] media: amphion: use dev_err_probe Sasha Levin
2023-08-13 15:58 ` [PATCH AUTOSEL 6.1 04/47] media: pulse8-cec: handle possible ping error Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 05/47] media: pci: cx23885: fix error handling for cx23885 ATSC boards Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 06/47] platform/x86: serial-multi-instantiate: Auto detect IRQ resource for CSC3551 Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 07/47] 9p: virtio: fix unlikely null pointer deref in handle_rerror Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 08/47] 9p: virtio: make sure 'offs' is initialized in zc_request Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 09/47] ksmbd: fix out of bounds in smb3_decrypt_req() Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 10/47] ksmbd: validate session id and tree id in compound request Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 11/47] ksmbd: no response from compound read Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 12/47] ksmbd: fix out of bounds in init_smb2_rsp_hdr() Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 13/47] ASoC: da7219: Flush pending AAD IRQ when suspending Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 14/47] ASoC: da7219: Check for failure reading AAD IRQ events Sasha Levin
2023-08-13 15:59 ` Sasha Levin [this message]
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 16/47] thermal: core: constify params in thermal_zone_device_register Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 17/47] ethernet: atheros: fix return value check in atl1c_tso_csum() Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 18/47] vxlan: generalize vxlan_parse_gpe_hdr and remove unused args Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 19/47] m68k: Fix invalid .section syntax Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 20/47] btrfs: remove BUG_ON()'s in add_new_free_space() Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 21/47] s390/dasd: use correct number of retries for ERP requests Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 22/47] s390/dasd: fix hanging device after request requeue Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 23/47] fs/nls: make load_nls() take a const parameter Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 24/47] ASoC: rt5682-sdw: fix for JD event handling in ClockStop Mode0 Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 25/47] ASoc: codecs: ES8316: Fix DMIC config Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 26/47] ASoC: rt711: fix for JD event handling in ClockStop Mode0 Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 27/47] ASoC: rt711-sdca: " Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 28/47] ASoC: atmel: Fix the 8K sample parameter in I2SC master Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 29/47] ALSA: usb-audio: Add quirk for Microsoft Modern Wireless Headset Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 30/47] platform/x86/amd/pmf: reduce verbosity of apmf_get_system_params Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 31/47] platform/x86/amd/pmf: Notify OS power slider update Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 32/47] platform/x86: intel: hid: Always call BTNL ACPI method Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 33/47] platform/x86/intel/hid: Add HP Dragonfly G2 to VGBS DMI quirks Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 34/47] platform/x86: think-lmi: Use kfree_sensitive instead of kfree Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 35/47] platform/x86: asus-wmi: Fix setting RGB mode on some TUF laptops Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 36/47] platform/x86: huawei-wmi: Silence ambient light sensor Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 37/47] drm/amd/smu: use AverageGfxclkFrequency* to replace previous GFX Curr Clock Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 38/47] drm/amd/display: Guard DCN31 PHYD32CLK logic against chip family Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 39/47] drm/amd/display: Exit idle optimizations before attempt to access PHY Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 40/47] ovl: Always reevaluate the file signature for IMA Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 41/47] ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer() Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 42/47] rbd: make get_lock_owner_info() return a single locker or NULL Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 43/47] rbd: harden get_lock_owner_info() a bit Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 44/47] ALSA: usb-audio: Update for native DSD support quirks Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 45/47] staging: fbtft: ili9341: use macro FBTFT_REGISTER_SPI_DRIVER Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 46/47] security: keys: perform capable check only on privileged operations Sasha Levin
2023-08-13 15:59 ` [PATCH AUTOSEL 6.1 47/47] kprobes: Prohibit probing on CFI preamble symbol Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230813160006.1073695-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=edson.drosdeck@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=stable@vger.kernel.org \
--cc=tiwai@suse.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=wtli@nuvoton.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®