Unverified Commit 7e9a8a87 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

parents d33f1020 d5cc0a1f

include/uapi/sound/snd_sst_tokens.h

+16 −1
Original line number Diff line number Diff line
@@ -222,6 +222,17 @@ 
 * %SKL_TKN_MM_U32_NUM_IN_FMT:  Number of input formats

 * %SKL_TKN_MM_U32_NUM_OUT_FMT: Number of output formats

 *

 * %SKL_TKN_U32_ASTATE_IDX:     Table Index for the A-State entry to be filled

 *                              with kcps and clock source

 *

 * %SKL_TKN_U32_ASTATE_COUNT:   Number of valid entries in A-State table

 *

 * %SKL_TKN_U32_ASTATE_KCPS:    Specifies the core load threshold (in kilo

 *                              cycles per second) below which DSP is clocked

 *                              from source specified by clock source.

 *

 * %SKL_TKN_U32_ASTATE_CLK_SRC: Clock source for A-State entry

 *

 * module_id and loadable flags dont have tokens as these values will be

 * read from the DSP FW manifest

 *
@@ -309,7 +320,11 @@ enum SKL_TKNS { 
	SKL_TKN_MM_U32_NUM_IN_FMT,

	SKL_TKN_MM_U32_NUM_OUT_FMT,



	SKL_TKN_MAX = SKL_TKN_MM_U32_NUM_OUT_FMT,

	SKL_TKN_U32_ASTATE_IDX,

	SKL_TKN_U32_ASTATE_COUNT,

	SKL_TKN_U32_ASTATE_KCPS,

	SKL_TKN_U32_ASTATE_CLK_SRC,

	SKL_TKN_MAX = SKL_TKN_U32_ASTATE_CLK_SRC,

};



#endif

sound/soc/intel/atom/sst/sst_acpi.c

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) 
	/* Find the IRQ */

	ctx->irq_num = platform_get_irq(pdev,

				ctx->pdata->res_info->acpi_ipc_irq_index);

	if (ctx->irq_num <= 0)

		return ctx->irq_num < 0 ? ctx->irq_num : -EIO;



	return 0;

}

sound/soc/intel/boards/bytcr_rt5651.c

+13 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ enum { 
	BYT_RT5651_DMIC_MAP,

	BYT_RT5651_IN1_MAP,

	BYT_RT5651_IN2_MAP,

	BYT_RT5651_IN1_IN2_MAP,

};



#define BYT_RT5651_MAP(quirk)	((quirk) & GENMASK(7, 0))
@@ -171,6 +172,13 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_in2_map[] = { 
	{"IN2P", NULL, "Internal Mic"},

};



static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_in2_map[] = {

	{"Internal Mic", NULL, "micbias1"},

	{"IN1P", NULL, "Internal Mic"},

	{"IN2P", NULL, "Internal Mic"},

	{"IN3P", NULL, "Headset Mic"},

};



static const struct snd_kcontrol_new byt_rt5651_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),
@@ -256,7 +264,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "KIANO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "KIANO SlimNote 14.2"),

		},

		.driver_data = (void *)(BYT_RT5651_IN2_MAP),

		.driver_data = (void *)(BYT_RT5651_IN1_IN2_MAP),

	},

	{}

};
@@ -281,6 +289,10 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) 
		custom_map = byt_rt5651_intmic_in2_map;

		num_routes = ARRAY_SIZE(byt_rt5651_intmic_in2_map);

		break;

	case BYT_RT5651_IN1_IN2_MAP:

		custom_map = byt_rt5651_intmic_in1_in2_map;

		num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_in2_map);

		break;

	default:

		custom_map = byt_rt5651_intmic_dmic_map;

		num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map);

sound/soc/intel/boards/haswell.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int haswell_rt5640_hw_params(struct snd_pcm_substream *substream, 
	}



	/* set correct codec filter for DAI format and clock config */

	snd_soc_update_bits(rtd->codec, 0x83, 0xffff, 0x8000);

	snd_soc_component_update_bits(codec_dai->component, 0x83, 0xffff, 0x8000);



	return ret;

}

sound/soc/intel/boards/kbl_rt5663_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) 
	}



	jack = &ctx->kabylake_headset;

	snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);