On 2/20/18 4:15 PM, Hans de Goede wrote:
Despite its name being prefixed with bytcr, before this commit the bytcr_rt5651 machine driver could not work with Bay Trail CR boards, as those only have SSP0 and it only supported SSP0-AIF1 setups.
This commit adds support for this, autodetecting AIF1 vs AIF2 based on BIOS tables.
While at it also add support for SSP2-AIF2 setups, as that requires only minimal extra code on top of the code adding SSP0-AIF1 / SSP0-AIF2 support.
Note this code is all copy-pasted from bytcr_rt5640.c. I've looked into merging the 2 machine drivers into 1 to avoid copy-pasting, but there are enough subtile differences to make this hard *and* with all the quirks the machine driver already is full with if (variant-foo) then ... else ... constructs adding more of these is going to make the code unreadable.
Signed-off-by: Hans de Goede hdegoede@redhat.com
sound/soc/intel/boards/bytcr_rt5651.c | 225 +++++++++++++++++++++++++++++++--- 1 file changed, 206 insertions(+), 19 deletions(-)
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 9a23ac9172b4..c14c5940ff87 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -25,6 +25,7 @@ #include <linux/device.h> #include <linux/dmi.h> #include <linux/slab.h> +#include <asm/cpu_device_id.h> #include <asm/platform_sst_audio.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -70,14 +71,16 @@ enum { #define BYT_RT5651_DMIC_EN BIT(16) #define BYT_RT5651_MCLK_EN BIT(17) #define BYT_RT5651_MCLK_25MHZ BIT(18) +#define BYT_RT5651_SSP2_AIF2 BIT(19) /* default is using AIF1 */ +#define BYT_RT5651_SSP0_AIF1 BIT(20) +#define BYT_RT5651_SSP0_AIF2 BIT(21)
struct byt_rt5651_private { struct clk *mclk; struct snd_soc_jack jack; };
-static unsigned long byt_rt5651_quirk = BYT_RT5651_DMIC_MAP |
BYT_RT5651_MCLK_EN;+static unsigned long byt_rt5651_quirk = BYT_RT5651_MCLK_EN;
static void log_quirks(struct device *dev) { @@ -105,9 +108,16 @@ static void log_quirks(struct device *dev) dev_info(dev, "quirk MCLK_EN enabled"); if (byt_rt5651_quirk & BYT_RT5651_MCLK_25MHZ) dev_info(dev, "quirk MCLK_25MHZ enabled");
if (byt_rt5651_quirk & BYT_RT5651_SSP2_AIF2)
dev_info(dev, "quirk SSP2_AIF2 enabled\n");if (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF1)
dev_info(dev, "quirk SSP0_AIF1 enabled\n");if (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2)
dev_info(dev, "quirk SSP0_AIF2 enabled\n");}
#define BYT_CODEC_DAI1 "rt5651-aif1"
+#define BYT_CODEC_DAI2 "rt5651-aif2"
static int byt_rt5651_prepare_and_enable_pll1(struct snd_soc_dai *codec_dai, int rate) @@ -116,10 +126,19 @@ static int byt_rt5651_prepare_and_enable_pll1(struct snd_soc_dai *codec_dai,
/* Configure the PLL before selecting it */ if (!(byt_rt5651_quirk & BYT_RT5651_MCLK_EN)) {
/* 2x25 bit slots on SSP2 */ret = snd_soc_dai_set_pll(codec_dai, 0,RT5651_PLL1_S_BCLK1,rate * 50, rate * 512);
/* use bitclock as PLL input */if ((byt_rt5651_quirk & BYT_RT5651_SSP0_AIF1) ||(byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2)) {/* 2x16 bit slots on SSP0 */ret = snd_soc_dai_set_pll(codec_dai, 0,RT5651_PLL1_S_BCLK1,rate * 32, rate * 512);} else {/* 2x25 bit slots on SSP2 */ret = snd_soc_dai_set_pll(codec_dai, 0,RT5651_PLL1_S_BCLK1,rate * 50, rate * 512);}
This part is conflicting a bit with what we are currently enabling for SOF - and that's probably because the quirks combine two separate pieces of information. 1. the SSP0-AIF1 routing 2. the limitation to 16-bit on SSP0 with the legacy closed-source firmware.
Could we instead use information coming from the actual hardware params, as done in the fixup() function below? If possible I'd like to limit this 16/24 configuration to the fixup, if we add it it the PLL settings it's not going to work so well.
Thanks!
} else { if (byt_rt5651_quirk & BYT_RT5651_MCLK_25MHZ) { ret = snd_soc_dai_set_pll(codec_dai, 0, @@ -157,6 +176,8 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, int ret;
codec_dai = snd_soc_card_get_codec_dai(card, BYT_CODEC_DAI1);
- if (!codec_dai)
codec_dai = snd_soc_card_get_codec_dai(card, BYT_CODEC_DAI2);@@ -214,13 +235,6 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = { {"Speaker", NULL, "Platform Clock"}, {"Line In", NULL, "Platform Clock"},
- {"AIF1 Playback", NULL, "ssp2 Tx"},
- {"ssp2 Tx", NULL, "codec_out0"},
- {"ssp2 Tx", NULL, "codec_out1"},
- {"codec_in0", NULL, "ssp2 Rx"},
- {"codec_in1", NULL, "ssp2 Rx"},
- {"ssp2 Rx", NULL, "AIF1 Capture"},
- {"Headset Mic", NULL, "micbias1"}, /* lowercase for rt5651 */ {"Headphone", NULL, "HPOL"}, {"Headphone", NULL, "HPOR"},
@@ -268,6 +282,42 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_in2_hs_in3_map[] = { {"IN3P", NULL, "Headset Mic"}, };
+static const struct snd_soc_dapm_route byt_rt5651_ssp0_aif1_map[] = {
- {"ssp0 Tx", NULL, "modem_out"},
- {"modem_in", NULL, "ssp0 Rx"},
- {"AIF1 Playback", NULL, "ssp0 Tx"},
- {"ssp0 Rx", NULL, "AIF1 Capture"},
+};
+static const struct snd_soc_dapm_route byt_rt5651_ssp0_aif2_map[] = {
- {"ssp0 Tx", NULL, "modem_out"},
- {"modem_in", NULL, "ssp0 Rx"},
- {"AIF2 Playback", NULL, "ssp0 Tx"},
- {"ssp0 Rx", NULL, "AIF2 Capture"},
+};
+static const struct snd_soc_dapm_route byt_rt5651_ssp2_aif1_map[] = {
- {"ssp2 Tx", NULL, "codec_out0"},
- {"ssp2 Tx", NULL, "codec_out1"},
- {"codec_in0", NULL, "ssp2 Rx"},
- {"codec_in1", NULL, "ssp2 Rx"},
- {"AIF1 Playback", NULL, "ssp2 Tx"},
- {"ssp2 Rx", NULL, "AIF1 Capture"},
+};
+static const struct snd_soc_dapm_route byt_rt5651_ssp2_aif2_map[] = {
- {"ssp2 Tx", NULL, "codec_out0"},
- {"ssp2 Tx", NULL, "codec_out1"},
- {"codec_in0", NULL, "ssp2 Rx"},
- {"codec_in1", NULL, "ssp2 Rx"},
- {"AIF2 Playback", NULL, "ssp2 Tx"},
- {"ssp2 Rx", NULL, "AIF2 Capture"},
+};
- static const struct snd_kcontrol_new byt_rt5651_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"),
@@ -392,6 +442,26 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) if (ret) return ret;
- if (byt_rt5651_quirk & BYT_RT5651_SSP2_AIF2) {
ret = snd_soc_dapm_add_routes(&card->dapm,byt_rt5651_ssp2_aif2_map,ARRAY_SIZE(byt_rt5651_ssp2_aif2_map));- } else if (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF1) {
ret = snd_soc_dapm_add_routes(&card->dapm,byt_rt5651_ssp0_aif1_map,ARRAY_SIZE(byt_rt5651_ssp0_aif1_map));- } else if (byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2) {
ret = snd_soc_dapm_add_routes(&card->dapm,byt_rt5651_ssp0_aif2_map,ARRAY_SIZE(byt_rt5651_ssp0_aif2_map));- } else {
ret = snd_soc_dapm_add_routes(&card->dapm,byt_rt5651_ssp2_aif1_map,ARRAY_SIZE(byt_rt5651_ssp2_aif1_map));- }
- if (ret)
return ret;- ret = snd_soc_add_card_controls(card, byt_rt5651_controls, ARRAY_SIZE(byt_rt5651_controls)); if (ret) {
@@ -464,18 +534,26 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd, SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
- int ret;
- int ret, bits;
- /* The DSP will covert the FE rate to 48k, stereo, 24bits */
- /* The DSP will covert the FE rate to 48k, stereo */ rate->min = rate->max = 48000; channels->min = channels->max = 2;
- /* set SSP2 to 24-bit */
- params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);
if ((byt_rt5651_quirk & BYT_RT5651_SSP0_AIF1) ||
(byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2)) {/* set SSP0 to 16-bit */params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);bits = 16;} else {
/* set SSP2 to 24-bit */params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);bits = 24;}
/*
- Default mode for SSP configuration is TDM 4 slot, override config
* with explicit setting to I2S 2ch 24-bit. The word length is set with
* with explicit setting to I2S 2ch. The word length is set with*/ ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
- dai_set_tdm_slot() since there is no other API exposed
@@ -489,7 +567,7 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; }
- ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, 24);
- ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, bits); if (ret < 0) { dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); return ret;
@@ -583,12 +661,32 @@ static struct snd_soc_card byt_rt5651_card = { };
static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN]; +static char byt_rt5651_codec_aif_name[12]; /* = "rt5651-aif[1|2]" */ +static char byt_rt5651_cpu_dai_name[10]; /* = "ssp[0|2]-port" */
+static bool is_valleyview(void) +{
- static const struct x86_cpu_id cpu_ids[] = {
{ X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */{}- };
- if (!x86_match_cpu(cpu_ids))
return false;- return true;
+}
+struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */
- u64 aif_value; /* 1: AIF1, 2: AIF2 */
- u64 mclock_value; /* usually 25MHz (0x17d7940), ignored */
+};
static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) { struct byt_rt5651_private *priv; struct snd_soc_acpi_mach *mach; const char *i2c_name = NULL;
- bool is_bytcr = false; int ret_val = 0; int dai_index = 0; int i;
@@ -620,10 +718,99 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) byt_rt5651_dais[dai_index].codec_name = byt_rt5651_codec_name; }
/*
* swap SSP0 if bytcr is detected* (will be overridden if DMI quirk is detected)*/if (is_valleyview()) {
struct sst_platform_info *p_info = mach->pdata;const struct sst_res_info *res_info = p_info->res_info;if (res_info->acpi_ipc_irq_index == 0)is_bytcr = true;}
if (is_bytcr) {
/** Baytrail CR platforms may have CHAN package in BIOS, try* to find relevant routing quirk based as done on Windows* platforms. We have to read the information directly from the* BIOS, at this stage the card is not created and the links* with the codec driver/pdata are non-existent*/struct acpi_chan_package chan_package;/* format specified: 2 64-bit integers */struct acpi_buffer format = {sizeof("NN"), "NN"};struct acpi_buffer state = {0, NULL};struct snd_soc_acpi_package_context pkg_ctx;bool pkg_found = false;state.length = sizeof(chan_package);state.pointer = &chan_package;pkg_ctx.name = "CHAN";pkg_ctx.length = 2;pkg_ctx.format = &format;pkg_ctx.state = &state;pkg_ctx.data_valid = false;pkg_found = snd_soc_acpi_find_package_from_hid(mach->id,&pkg_ctx);if (pkg_found) {if (chan_package.aif_value == 1) {dev_info(&pdev->dev, "BIOS Routing: AIF1 connected\n");byt_rt5651_quirk |= BYT_RT5651_SSP0_AIF1;} else if (chan_package.aif_value == 2) {dev_info(&pdev->dev, "BIOS Routing: AIF2 connected\n");byt_rt5651_quirk |= BYT_RT5651_SSP0_AIF2;} else {dev_info(&pdev->dev, "BIOS Routing isn't valid, ignored\n");pkg_found = false;}}if (!pkg_found) {/* no BIOS indications, assume SSP0-AIF2 connection */byt_rt5651_quirk |= BYT_RT5651_SSP0_AIF2;}/* change defaults for Baytrail-CR capture */byt_rt5651_quirk |= BYT_RT5651_JD1_1 |BYT_RT5651_OVTH_2000UA |BYT_RT5651_OVCD_SF_0P75 |BYT_RT5651_IN2_HS_IN3_MAP;} else {
byt_rt5651_quirk |= BYT_RT5651_DMIC_MAP;}
/* check quirks before creating card */ dmi_check_system(byt_rt5651_quirk_table); log_quirks(&pdev->dev);
if ((byt_rt5651_quirk & BYT_RT5651_SSP2_AIF2) ||
(byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2)) {/* fixup codec aif name */snprintf(byt_rt5651_codec_aif_name,sizeof(byt_rt5651_codec_aif_name),"%s", "rt5651-aif2");byt_rt5651_dais[dai_index].codec_dai_name =byt_rt5651_codec_aif_name;}
if ((byt_rt5651_quirk & BYT_RT5651_SSP0_AIF1) ||
(byt_rt5651_quirk & BYT_RT5651_SSP0_AIF2)) {/* fixup cpu dai name name */snprintf(byt_rt5651_cpu_dai_name,sizeof(byt_rt5651_cpu_dai_name),"%s", "ssp0-port");byt_rt5651_dais[dai_index].cpu_dai_name =byt_rt5651_cpu_dai_name;}
if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) { priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3"); if (IS_ERR(priv->mclk)) {