Commit fc7c460f authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown

ASoC: Intel: bytcr_rt5651: Add BYT_RT5651_DEFAULT_QUIRKS define

Almost all boards use the mclk and use the same jack-detect settings, add
a BYT_RT5651_DEFAULT_QUIRKS define for this.

This shaves of some lines and makes it easier to see which settings are
unique to a certain model.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f339155a
...@@ -77,6 +77,11 @@ enum { ...@@ -77,6 +77,11 @@ enum {
#define BYT_RT5651_SSP0_AIF1 BIT(20) #define BYT_RT5651_SSP0_AIF1 BIT(20)
#define BYT_RT5651_SSP0_AIF2 BIT(21) #define BYT_RT5651_SSP0_AIF2 BIT(21)
#define BYT_RT5651_DEFAULT_QUIRKS (BYT_RT5651_MCLK_EN | \
BYT_RT5651_JD1_1 | \
BYT_RT5651_OVCD_TH_2000UA | \
BYT_RT5651_OVCD_SF_0P75)
/* jack-detect-source + dmic-en + ovcd-th + -sf + terminating empty entry */ /* jack-detect-source + dmic-en + ovcd-th + -sf + terminating empty entry */
#define MAX_NO_PROPS 5 #define MAX_NO_PROPS 5
...@@ -86,10 +91,7 @@ struct byt_rt5651_private { ...@@ -86,10 +91,7 @@ struct byt_rt5651_private {
}; };
/* Default: jack-detect on JD1_1, internal mic on in2, headsetmic on in3 */ /* Default: jack-detect on JD1_1, internal mic on in2, headsetmic on in3 */
static unsigned long byt_rt5651_quirk = BYT_RT5651_MCLK_EN | static unsigned long byt_rt5651_quirk = BYT_RT5651_DEFAULT_QUIRKS |
BYT_RT5651_JD1_1 |
BYT_RT5651_OVCD_TH_2000UA |
BYT_RT5651_OVCD_SF_0P75 |
BYT_RT5651_IN2_HS_IN3_MAP; BYT_RT5651_IN2_HS_IN3_MAP;
static void log_quirks(struct device *dev) static void log_quirks(struct device *dev)
...@@ -379,10 +381,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { ...@@ -379,10 +381,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "KIANO"), DMI_MATCH(DMI_SYS_VENDOR, "KIANO"),
DMI_MATCH(DMI_PRODUCT_NAME, "KIANO SlimNote 14.2"), DMI_MATCH(DMI_PRODUCT_NAME, "KIANO SlimNote 14.2"),
}, },
.driver_data = (void *)(BYT_RT5651_MCLK_EN | .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
BYT_RT5651_JD1_1 |
BYT_RT5651_OVCD_TH_2000UA |
BYT_RT5651_OVCD_SF_0P75 |
BYT_RT5651_IN1_IN2_MAP), BYT_RT5651_IN1_IN2_MAP),
}, },
{ {
...@@ -392,10 +391,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { ...@@ -392,10 +391,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"), DMI_MATCH(DMI_SYS_VENDOR, "Hampoo"),
DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"), DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"),
}, },
.driver_data = (void *)(BYT_RT5651_MCLK_EN | .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
BYT_RT5651_JD1_1 |
BYT_RT5651_OVCD_TH_2000UA |
BYT_RT5651_OVCD_SF_0P75 |
BYT_RT5651_IN2_HS_IN3_MAP), BYT_RT5651_IN2_HS_IN3_MAP),
}, },
{ {
...@@ -405,10 +401,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { ...@@ -405,10 +401,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "VIOS"), DMI_MATCH(DMI_SYS_VENDOR, "VIOS"),
DMI_MATCH(DMI_PRODUCT_NAME, "LTH17"), DMI_MATCH(DMI_PRODUCT_NAME, "LTH17"),
}, },
.driver_data = (void *)(BYT_RT5651_MCLK_EN | .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
BYT_RT5651_JD1_1 |
BYT_RT5651_OVCD_TH_2000UA |
BYT_RT5651_OVCD_SF_1P0 |
BYT_RT5651_IN1_IN2_MAP), BYT_RT5651_IN1_IN2_MAP),
}, },
{} {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment