diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-12 12:28:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-12 12:28:52 +0000 |
| commit | 84d306237bbe1af02ee782a54347752c75b97ca6 (patch) | |
| tree | faa5db0797ebdf9db4acfbc8ad5d55931b3d5739 /sound/soc/rockchip | |
| parent | c5a216c3e22ae5d12357fa6ba88cd8cc3b9744ba (diff) | |
| parent | 2ca69d73bc05a55edb95689d436ce87974a3162e (diff) | |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'sound/soc/rockchip')
| -rw-r--r-- | sound/soc/rockchip/rk3399_gru_sound.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index d64fbbd50544..fa6cd1de828b 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -206,7 +206,8 @@ static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) return ret; } - snd_jack_set_key(rockchip_sound_jack.jack, SND_JACK_BTN_0, KEY_MEDIA); + snd_jack_set_key( + rockchip_sound_jack.jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); snd_jack_set_key( rockchip_sound_jack.jack, SND_JACK_BTN_1, KEY_VOLUMEUP); snd_jack_set_key( |