From: Bard Liao <yung-chuan.liao@linux.intel.com>
To: broonie@kernel.org, tiwai@suse.de, vkoul@kernel.org
Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org,
linux-sound@vger.kernel.org, pierre-louis.bossart@linux.dev,
bard.liao@intel.com
Subject: [PATCH 05/11] ASoC: SDCA: add quirk function for RT712_VB match
Date: Wed, 16 Oct 2024 18:23:27 +0800 [thread overview]
Message-ID: <20241016102333.294448-6-yung-chuan.liao@linux.intel.com> (raw)
In-Reply-To: <20241016102333.294448-1-yung-chuan.liao@linux.intel.com>
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Add a generic match function for quirks, chances are we are going to
have lots of those...
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
include/sound/sdca.h | 10 ++++++++-
sound/soc/sdca/sdca_device.c | 43 ++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/include/sound/sdca.h b/include/sound/sdca.h
index 34473ca4c789..7e138229e8f3 100644
--- a/include/sound/sdca.h
+++ b/include/sound/sdca.h
@@ -39,16 +39,24 @@ struct sdca_device_data {
struct sdca_function_desc sdca_func[SDCA_MAX_FUNCTION_COUNT];
};
+enum sdca_quirk {
+ SDCA_QUIRKS_RT712_VB,
+};
+
#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_SOC_SDCA)
void sdca_lookup_functions(struct sdw_slave *slave);
void sdca_lookup_interface_revision(struct sdw_slave *slave);
+bool sdca_device_quirk_match(struct sdw_slave *slave, enum sdca_quirk quirk);
#else
static inline void sdca_lookup_functions(struct sdw_slave *slave) {}
static inline void sdca_lookup_interface_revision(struct sdw_slave *slave) {}
-
+static inline bool sdca_device_quirk_match(struct sdw_slave *slave, enum sdca_quirk quirk)
+{
+ return false;
+}
#endif
#endif
diff --git a/sound/soc/sdca/sdca_device.c b/sound/soc/sdca/sdca_device.c
index 58f5f6f0f723..c44dc21cb634 100644
--- a/sound/soc/sdca/sdca_device.c
+++ b/sound/soc/sdca/sdca_device.c
@@ -9,6 +9,7 @@
#include <linux/acpi.h>
#include <linux/soundwire/sdw.h>
#include <sound/sdca.h>
+#include <sound/sdca_function.h>
void sdca_lookup_interface_revision(struct sdw_slave *slave)
{
@@ -22,3 +23,45 @@ void sdca_lookup_interface_revision(struct sdw_slave *slave)
&slave->sdca_data.interface_revision);
}
EXPORT_SYMBOL_NS(sdca_lookup_interface_revision, SND_SOC_SDCA);
+
+static bool sdca_device_quirk_rt712_vb(struct sdw_slave *slave)
+{
+ struct sdw_slave_id *id = &slave->id;
+ int i;
+
+ /*
+ * The RT712_VA relies on the v06r04 draft, and the
+ * RT712_VB on a more recent v08r01 draft.
+ */
+ if (slave->sdca_data.interface_revision < 0x0801)
+ return false;
+
+ if (id->mfg_id != 0x025d)
+ return false;
+
+ if (id->part_id != 0x712 &&
+ id->part_id != 0x713 &&
+ id->part_id != 0x716 &&
+ id->part_id != 0x717)
+ return false;
+
+ for (i = 0; i < slave->sdca_data.num_functions; i++) {
+ if (slave->sdca_data.sdca_func[i].type ==
+ SDCA_FUNCTION_TYPE_SMART_MIC)
+ return true;
+ }
+
+ return false;
+}
+
+bool sdca_device_quirk_match(struct sdw_slave *slave, enum sdca_quirk quirk)
+{
+ switch (quirk) {
+ case SDCA_QUIRKS_RT712_VB:
+ return sdca_device_quirk_rt712_vb(slave);
+ default:
+ break;
+ }
+ return false;
+}
+EXPORT_SYMBOL_NS(sdca_device_quirk_match, SND_SOC_SDCA);
--
2.43.0
next prev parent reply other threads:[~2024-10-16 10:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-16 10:23 [PATCH 00/11] ASoC/soundwire: add initial support for SDCA Bard Liao
2024-10-16 10:23 ` [PATCH 01/11] soundwire: sdw_intel: include linux/acpi.h Bard Liao
2024-10-17 12:23 ` Vinod Koul
2024-10-16 10:23 ` [PATCH 02/11] ASoC/soundwire: remove sdw_slave_extended_id Bard Liao
2024-10-16 10:23 ` [PATCH 03/11] ASoC: SDCA: add initial module Bard Liao
2024-10-16 10:23 ` [PATCH 04/11] soundwire: slave: lookup SDCA version and functions Bard Liao
2024-10-17 12:24 ` Vinod Koul
2024-10-16 10:23 ` Bard Liao [this message]
2024-10-16 10:23 ` [PATCH 06/11] ASoC: rt712-sdca: detect the SMART_MIC function during the probe stage Bard Liao
2024-10-16 10:23 ` [PATCH 07/11] ASoC: soc-acpi: introduce new 'machine check' callback Bard Liao
2024-10-16 10:23 ` [PATCH 08/11] ASoC: sdw_utils: add SmartMic DAI for RT712 VB Bard Liao
2024-10-16 10:23 ` [PATCH 09/11] ASoC: sdw_utils: add SmartMic DAI for RT713 VB Bard Liao
2024-10-16 10:23 ` [PATCH 10/11] ASoC: Intel: soc-acpi: add is_device_rt712_vb() helper Bard Liao
2024-10-16 10:23 ` [PATCH 11/11] ASoC: SOF: Intel: hda: use machine_check() for SoundWire Bard Liao
2024-10-18 21:30 ` [PATCH 00/11] ASoC/soundwire: add initial support for SDCA Mark Brown
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=20241016102333.294448-6-yung-chuan.liao@linux.intel.com \
--to=yung-chuan.liao@linux.intel.com \
--cc=bard.liao@intel.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=pierre-louis.bossart@linux.dev \
--cc=tiwai@suse.de \
--cc=vinod.koul@linaro.org \
--cc=vkoul@kernel.org \
/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®