mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 04:34:11 +08:00
Merge remote-tracking branch 'asoc/fix/rt5670' into asoc-fixes
This commit is contained in:
commit
05997302b7
@ -567,7 +567,7 @@ int rt5670_set_jack_detect(struct snd_soc_codec *codec,
|
||||
|
||||
rt5670->jack = jack;
|
||||
rt5670->hp_gpio.gpiod_dev = codec->dev;
|
||||
rt5670->hp_gpio.name = "headphone detect";
|
||||
rt5670->hp_gpio.name = "headset";
|
||||
rt5670->hp_gpio.report = SND_JACK_HEADSET |
|
||||
SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2;
|
||||
rt5670->hp_gpio.debounce_time = 150;
|
||||
|
@ -184,6 +184,13 @@ static int cht_aif1_hw_params(struct snd_pcm_substream *substream,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct acpi_gpio_params headset_gpios = { 0, 0, false };
|
||||
|
||||
static const struct acpi_gpio_mapping cht_rt5672_gpios[] = {
|
||||
{ "headset-gpios", &headset_gpios, 1 },
|
||||
{},
|
||||
};
|
||||
|
||||
static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
|
||||
{
|
||||
int ret;
|
||||
@ -191,6 +198,9 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card);
|
||||
|
||||
if (devm_acpi_dev_add_driver_gpios(codec->dev, cht_rt5672_gpios))
|
||||
dev_warn(runtime->dev, "Unable to add GPIO mapping table\n");
|
||||
|
||||
/* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */
|
||||
ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xF, 0xF, 4, 24);
|
||||
if (ret < 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user