diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-31 12:47:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-31 12:49:46 +0100 |
| commit | 05997302b7aa56a7f4a7b9d49d0661865c17874d (patch) | |
| tree | dd2759be2ab01d835fc76f7af41712964fc34c7c /sound | |
| parent | 1b4a56cd7f5c2f835ffae2a8204fb95597269b10 (diff) | |
| parent | 804e73adf5cf4b3aea3b6ce058f4dc0191143821 (diff) | |
| download | linux-stable-05997302b7aa56a7f4a7b9d49d0661865c17874d.tar.gz linux-stable-05997302b7aa56a7f4a7b9d49d0661865c17874d.tar.bz2 linux-stable-05997302b7aa56a7f4a7b9d49d0661865c17874d.zip | |
Merge remote-tracking branch 'asoc/fix/rt5670' into asoc-fixes
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5670.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/boards/cht_bsw_rt5672.c | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index 0ec7985ed306..054b613cb0d0 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c @@ -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; diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index bc2a52de06a3..f597d5582223 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -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) { |