From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Jie Yang <yang.jie@linux.intel.com>,
alsa-devel@alsa-project.org
Subject: [PATCH v3 8/9] ASoC: rt5645: Switch DMI table match to a test of variable
Date: Wed, 22 Jan 2020 13:23:05 +0200 [thread overview]
Message-ID: <20200122112306.64598-9-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200122112306.64598-1-andriy.shevchenko@linux.intel.com>
Since we have a common x86 quirk that provides an exported variable,
use it instead of local DMI table match.
Note, arch/x86/kernel/quirks.c::early_platform_detect_quirk() prints
the detected platform.
Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/rt5645.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 92d67010aeed..3ccecb81bc37 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -12,6 +12,7 @@
#include <linux/delay.h>
#include <linux/pm.h>
#include <linux/i2c.h>
+#include <linux/platform_data/x86/machine.h>
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/gpio.h>
@@ -3674,13 +3675,6 @@ static const struct dmi_system_id dmi_platform_data[] = {
},
.driver_data = (void *)&intel_braswell_platform_data,
},
- {
- .ident = "Microsoft Surface 3",
- .matches = {
- DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
- },
- .driver_data = (void *)&intel_braswell_platform_data,
- },
{
/*
* Match for the GPDwin which unfortunately uses somewhat
@@ -3789,7 +3783,7 @@ static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
static int rt5645_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
- struct rt5645_platform_data *pdata = dev_get_platdata(&i2c->dev);
+ const struct rt5645_platform_data *pdata = dev_get_platdata(&i2c->dev);
const struct dmi_system_id *dmi_data;
struct rt5645_priv *rt5645;
int ret, i;
@@ -3804,6 +3798,10 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
rt5645->i2c = i2c;
i2c_set_clientdata(i2c, rt5645);
+ /* Put it first to allow DMI to override, if needed */
+ if (x86_microsoft_surface_3_machine)
+ pdata = &intel_braswell_platform_data;
+
dmi_data = dmi_first_match(dmi_platform_data);
if (dmi_data) {
dev_info(&i2c->dev, "Detected %s platform\n", dmi_data->ident);
--
2.24.1
next prev parent reply other threads:[~2020-01-22 11:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 11:22 [PATCH v3 0/9] x86: Easy way of detecting MS Surface 3 Andy Shevchenko
2020-01-22 11:22 ` [PATCH v3 1/9] x86/platform: Rename x86/apple.h -> x86/machine.h Andy Shevchenko
2020-01-22 11:22 ` [PATCH v3 2/9] x86/quirks: Add missed include to satisfy static checker Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 3/9] x86/quirks: Introduce hpet_dev_print_force_hpet_address() helper Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 4/9] x86/quirks: Join string literals back Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 5/9] x86/quirks: Convert DMI matching to use a table Andy Shevchenko
2020-03-16 15:27 ` Alexander Shishkin
2020-03-16 15:54 ` Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 6/9] x86/quirks: Add a DMI quirk for Microsoft Surface 3 Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 7/9] platform/x86: surface3_wmi: Switch DMI table match to a test of variable Andy Shevchenko
2020-01-22 11:23 ` Andy Shevchenko [this message]
2020-01-22 11:23 ` [PATCH v3 9/9] ASoC: Intel: " Andy Shevchenko
2020-02-14 14:24 ` [PATCH v3 0/9] x86: Easy way of detecting MS Surface 3 Andy Shevchenko
2020-03-16 15:33 ` Alexander Shishkin
2020-03-16 15:52 ` Andy Shevchenko
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=20200122112306.64598-9-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=hpa@zytor.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yang.jie@linux.intel.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;
as well as URLs for NNTP newsgroup(s).