ASoC: rt711: remap buttons
Subsystems (3)
PATCH 1/2 ASoC: rt711: remap buttons
From: Shuming Fan <[email protected]>
This patch uses the same mapping as the machine driver:BTN_0 : KEY_PLAYPAUSEBTN_1 : KEY_VOICECOMMANDBTN_2 : KEY_VOLUMEUPBTN_3 : KEY_VOLUMEDOWN
--- sound/soc/codecs/rt711.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/rt711.c +5 -5
@@ -154,26 +154,26 @@ static unsigned int rt711_button_detect(struct rt711_priv *rt711)case 0x0200 :case 0x0100 :case 0x0080 : - btn_type |=SND_JACK_BTN_0 ; + btn_type |=SND_JACK_BTN_2 ;break ;case 0x0001 : - btn_type |=SND_JACK_BTN_3 ; + btn_type |=SND_JACK_BTN_1 ;break ; }switch (val81) {case 0x8000 :case 0x4000 :case 0x2000 : - btn_type |=SND_JACK_BTN_1 ; + btn_type |=SND_JACK_BTN_0 ;break ;case 0x1000 :case 0x0800 :case 0x0400 : - btn_type |=SND_JACK_BTN_2 ; + btn_type |=SND_JACK_BTN_3 ;break ;case 0x0200 :case 0x0100 : - btn_type |=SND_JACK_BTN_3 ; + btn_type |=SND_JACK_BTN_1 ;break ; } read_error:
Signature · 1 line
2.31.1
Mark Brown
maintainerQuoted 7 lines · On Thu, Jun 17, 2021 at 05:08:09PM +0800, [email protected] wrote:
From: Shuming Fan <[email protected]>
This patch uses the same mapping as the machine driver:
BTN_0:KEY_PLAYPAUSEBTN_1:KEY_VOICECOMMANDBTN_2:KEY_VOLUMEUPBTN_3:KEY_VOLUMEDOWN
Which machine driver? Can't there be multiple machine drivers, and if they're already overriding things why do this?
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mark Brown
maintainerQuoted 10 lines · Shuming [范書銘]
Quoted 8 lines
Quoted 5 lines
This patch uses the same mapping as the machine driver:
BTN_0:KEY_PLAYPAUSEBTN_1:KEY_VOICECOMMANDBTN_2:KEY_VOLUMEUPBTN_3:KEY_VOLUMEDOWNWhich machine driver? Can't there be multiple machine drivers, and if they're already overriding things why do this?
The rt711 codec is designed in the Intel platform only for now.
I'm sure your sales team would be happy to change that!
Quoted 4 lines
The machine driver is '
sof_sdw.c' that resides undersound/soc/intel/boards. It seems Intel uses the same mapping in all other Intel machine drivers. Please check the commit as below.
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?id=1f64a08bd5a9a218deb37c03c1e98e9567379698
Sure, but if the machine drivers for these platforms already do the right thing why change the CODEC driver?
Quoted 2 lines
Hi Sathya,
Do you know why the m/c driver uses this mapping?
I'd guess it's just because that's the standard set of headphone buttons that Intel uses for their platforms.
Quoted 20 lines · Mark Brown
Quoted 10 lines · Shuming [范書銘]
Quoted 8 lines
Quoted 5 lines
This patch uses the same mapping as the machine driver:
BTN_0:KEY_PLAYPAUSEBTN_1:KEY_VOICECOMMANDBTN_2:KEY_VOLUMEUPBTN_3:KEY_VOLUMEDOWNWhich machine driver? Can't there be multiple machine drivers, and if they're already overriding things why do this?
The rt711 codec is designed in the Intel platform only for now.
I'm sure your sales team would be happy to change that!
Quoted 4 lines
The machine driver is '
sof_sdw.c' that resides undersound/soc/intel/boards. It seems Intel uses the same mapping in all other Intel machine drivers. Please check the commit as below.
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?id=1f64a08bd5a9a218deb37c03c1e98e9567379698
Quoted 8 lines
Sure, but if the machine drivers for these platforms already do the right thing why change the CODEC driver?
Quoted 2 lines
Hi Sathya,
Do you know why the m/c driver uses this mapping?I'd guess it's just because that's the standard set of headphone buttons that Intel uses for their platforms.
Intel has no specific requirement, we just follow what the Google 4-button description says [1]
That said, I can't recall why half of the machine drivers follow one pattern and the other half a different one.
Same as spec:
sof_da7219_max98373.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
sof_cs42l42.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
swap wrt. spec:
sof_sdw_rt711.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
kbl_rt5663_max98927.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
Brent, Curtis, Jimmy, can you comment on the order?
[1] https://source.android.com/devices/accessories/headset/plug-headset-spec#control-function_mapping
Quoted 54 lines · Pierre-Louis Bossart
Quoted 20 lines · Mark Brown
Quoted 10 lines · Shuming [范書銘]
Quoted 8 lines
Quoted 5 lines
This patch uses the same mapping as the machine driver:
BTN_0:KEY_PLAYPAUSEBTN_1:KEY_VOICECOMMANDBTN_2:KEY_VOLUMEUPBTN_3:KEY_VOLUMEDOWNWhich machine driver? Can't there be multiple machine drivers, and if they're already overriding things why do this?
The rt711 codec is designed in the Intel platform only for now.
I'm sure your sales team would be happy to change that!
Quoted 4 lines
The machine driver is '
sof_sdw.c' that resides undersound/soc/intel/boards. It seems Intel uses the same mapping in all other Intel machine drivers. Please check the commit as below.
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?id=1f64a08bd5a9a218deb37c03c1e98e9567379698Quoted 8 lines
Sure, but if the machine drivers for these platforms already do the right thing why change the CODEC driver?
Quoted 2 lines
Hi Sathya,
Do you know why the m/c driver uses this mapping?I'd guess it's just because that's the standard set of headphone buttons that Intel uses for their platforms.
Intel has no specific requirement, we just follow what the Google 4-button description says [1]
That said, I can't recall why half of the machine drivers follow one pattern and the other half a different one.
Same as spec:
sof_da7219_max98373.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);sof_cs42l42.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);swap wrt. spec:
sof_sdw_rt711.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
Quoted 6 lines
kbl_rt5663_max98927.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);Brent, Curtis, Jimmy, can you comment on the order?
Sorry for the late reply, I couldn't figure out why this slipped by my email filter, I guess I should look closer next time. Soraka has been checked (kbl_rt5663_max98927) and yes the mapping does appear to be incorrect, volume up key returns voice command in evtest. Sathya will have to check the headset button mapping, on rt711 but my guess is it is also incorrect.
Quoted 26 lines
Quoted 26 lines
Intel has no specific requirement, we just follow what the Google 4-button description says [1]
That said, I can't recall why half of the machine drivers follow one pattern and the other half a different one.
Same as spec:
sof_da7219_max98373.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); sof_da7219_max98373.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);sof_cs42l42.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); sof_cs42l42.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);swap wrt. spec:
sof_sdw_rt711.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); sof_sdw_rt711.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);kbl_rt5663_max98927.c: snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); kbl_rt5663_max98927.c- snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
Quoted 8 lines
Quoted 1 line
Brent, Curtis, Jimmy, can you comment on the order?
Sorry for the late reply, I couldn't figure out why this slipped by my email filter, I guess I should look closer next time. Soraka has been checked (
kbl_rt5663_max98927) and yes the mapping does appear to be incorrect, volume up key returns voice command in evtest. Sathya will have to check the headset button mapping, on rt711 but my guess is it is also incorrect.
I stand corrected, misread the datasheet. So rt711 and rt5663 are correct based on datasheet specs but when grabbing an off the shelf headphone they did not work with the volume up. Hmm, I wonder if this split is "what usually works" and "what is correct."
Quoted 29 lines
Quoted 3 lines
Quoted 3 lines
swap wrt. spec:
sof_sdw_rt711.c: snd_jack_set_key(jack->jack,SND_JACK_BTN_0,
KEY_PLAYPAUSE);Quoted 1 line
Quoted 1 line
sof_sdw_rt711.c- snd_jack_set_key(jack->jack,
SND_JACK_BTN_1,
KEY_VOICECOMMAND);Quoted 1 line
Quoted 1 line
sof_sdw_rt711.c- snd_jack_set_key(jack->jack,
SND_JACK_BTN_2,
KEY_VOLUMEUP);Quoted 1 line
Quoted 1 line
sof_sdw_rt711.c- snd_jack_set_key(jack->jack,
SND_JACK_BTN_3,
KEY_VOLUMEDOWN);Quoted 10 lines
Quoted 10 lines
kbl_rt5663_max98927.c:snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
kbl_rt5663_max98927.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
kbl_rt5663_max98927.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
kbl_rt5663_max98927.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);Quoted 8 lines
Quoted 1 line
Brent, Curtis, Jimmy, can you comment on the order?
Sorry for the late reply, I couldn't figure out why this slipped by my email filter, I guess I should look closer next time. Soraka has been checked (
kbl_rt5663_max98927) and yes the mapping does appear to be incorrect, volume up key returns voice command in evtest. Sathya will have to check the headset button mapping, on rt711 but my guess is it is also incorrect.
Quoted 4 lines
I stand corrected, misread the datasheet. So rt711 and rt5663 are correct based on datasheet specs but when grabbing an off the shelf headphone they did not work with the volume up. Hmm, I wonder if this split is "what usually works" and "what is correct."
Thanks for your reply, Curtis.
This patch just changes the mapping to let the button function work properly.
Hi Mark,
Do I need to resend the patch? Or any comments?
Quoted 1 line
------Please consider the environment before printing this e-mail.
Mark Brown
maintainerQuoted 1 line · Shuming [范書銘]
Do I need to resend the patch? Or any comments?
None of this has answered my original question - to repeat why would we change the defaults in the CODEC driver given that the machines can already set what they want anyway and apparently are already doing so?
Quoted 45 lines
Intel has no specific requirement, we just follow what the Google 4-button description says [1]
That said, I can't recall why half of the machine drivers follow one pattern and the other half a different one.
Same as spec:
sof_da7219_max98373.c:snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
sof_da7219_max98373.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);
sof_da7219_max98373.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
sof_da7219_max98373.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
sof_cs42l42.c:snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
sof_cs42l42.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);
sof_cs42l42.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
sof_cs42l42.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);swap wrt. spec:
sof_sdw_rt711.c: snd_jack_set_key(jack->jack,SND_JACK_BTN_0,KEY_PLAYPAUSE);
sof_sdw_rt711.c- snd_jack_set_key(jack->jack,SND_JACK_BTN_1,KEY_VOICECOMMAND);
sof_sdw_rt711.c- snd_jack_set_key(jack->jack,SND_JACK_BTN_2,KEY_VOLUMEUP);
sof_sdw_rt711.c- snd_jack_set_key(jack->jack,SND_JACK_BTN_3,KEY_VOLUMEDOWN);
kbl_rt5663_max98927.c:snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
kbl_rt5663_max98927.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
kbl_rt5663_max98927.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
kbl_rt5663_max98927.c-snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
Quoted 6 lines
Brent, Curtis, Jimmy, can you comment on the order?
[1] https://source.android.com/devices/accessories/headset/plug-headset-
spec#control-function_mapping
Hi Pierre,
I just shared the link [1] with ODM and codec vendor to double check the mapping is following the requirement.
Regards,
Brent