未验证 提交 efee0fca 编写于 作者: H Hans de Goede 提交者: Mark Brown

ASoC: nau8824: Add a nau8824_components() helper

Some devices using the NAU8824 have only one speaker. To still have things
working properly this requires the left + right channels to both be mixed
to the left speaker output.

This mixer setup is done by userspace based on UCM profiles. But this
requires userspace to know that there is a mono-speaker. Add a helper
function (for the machine driver) to get a components string providing
this info.

This is done inside the codec driver because the codec driver already
has a DMI quirk table.
Signed-off-by: NHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211002211459.110124-3-hdegoede@redhat.comSigned-off-by: NMark Brown <broonie@kernel.org>
上级 92d33601
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "nau8824.h" #include "nau8824.h"
#define NAU8824_JD_ACTIVE_HIGH BIT(0) #define NAU8824_JD_ACTIVE_HIGH BIT(0)
#define NAU8824_MONO_SPEAKER BIT(1)
static int nau8824_quirk; static int nau8824_quirk;
static int quirk_override = -1; static int quirk_override = -1;
...@@ -1861,7 +1862,25 @@ static const struct dmi_system_id nau8824_quirk_table[] = { ...@@ -1861,7 +1862,25 @@ static const struct dmi_system_id nau8824_quirk_table[] = {
DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "20170531"), DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "20170531"),
}, },
.driver_data = (void *)(NAU8824_JD_ACTIVE_HIGH), .driver_data = (void *)(NAU8824_JD_ACTIVE_HIGH |
NAU8824_MONO_SPEAKER),
},
{
/* CUBE iwork8 Air */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "cube"),
DMI_MATCH(DMI_PRODUCT_NAME, "i1-TF"),
DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
},
.driver_data = (void *)(NAU8824_MONO_SPEAKER),
},
{
/* Pipo W2S */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "PIPO"),
DMI_MATCH(DMI_PRODUCT_NAME, "W2S"),
},
.driver_data = (void *)(NAU8824_MONO_SPEAKER),
}, },
{} {}
}; };
...@@ -1880,6 +1899,17 @@ static void nau8824_check_quirks(void) ...@@ -1880,6 +1899,17 @@ static void nau8824_check_quirks(void)
nau8824_quirk = (unsigned long)dmi_id->driver_data; nau8824_quirk = (unsigned long)dmi_id->driver_data;
} }
const char *nau8824_components(void)
{
nau8824_check_quirks();
if (nau8824_quirk & NAU8824_MONO_SPEAKER)
return "cfg-spk:1";
else
return "cfg-spk:2";
}
EXPORT_SYMBOL_GPL(nau8824_components);
static int nau8824_i2c_probe(struct i2c_client *i2c, static int nau8824_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
......
...@@ -470,6 +470,7 @@ struct nau8824_osr_attr { ...@@ -470,6 +470,7 @@ struct nau8824_osr_attr {
int nau8824_enable_jack_detect(struct snd_soc_component *component, int nau8824_enable_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *jack); struct snd_soc_jack *jack);
const char *nau8824_components(void);
#endif /* _NAU8824_H */ #endif /* _NAU8824_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册