From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDEE8C04EB8 for ; Mon, 10 Dec 2018 16:43:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9690B2064D for ; Mon, 10 Dec 2018 16:43:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9690B2064D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727473AbeLJQn2 (ORCPT ); Mon, 10 Dec 2018 11:43:28 -0500 Received: from mga09.intel.com ([134.134.136.24]:62126 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726699AbeLJQn1 (ORCPT ); Mon, 10 Dec 2018 11:43:27 -0500 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Dec 2018 08:43:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,339,1539673200"; d="scan'208";a="300941656" Received: from nm-b85m-d3h.iind.intel.com (HELO intel.com) ([10.223.163.12]) by fmsmga006.fm.intel.com with ESMTP; 10 Dec 2018 08:43:21 -0800 Date: Mon, 10 Dec 2018 22:08:43 +0530 From: Naveen M To: Pierre-Louis Bossart Cc: Zhuohao Lee , alsa-devel@alsa-project.org, Liam Girdwood , Jie Yang , Mark Brown , Jaroslav Kysela , Takashi Iwai , Vinod Koul , Kuninori Morimoto , Dan Carpenter , Max Chang , Oder Chiou , linux-kernel@vger.kernel.org, yong.zhi@intel.com Subject: Re: [alsa-devel] [PATCH v1] ASoC: Intel: kbl_da7219_max98927: fix the audio jack button remapping Message-ID: <20181210163837.GA11058@intel.com> References: <20181207090552.105205-1-zhuohao@chromium.org> <90b46425-5dbd-2ba7-d57d-270d0ab68632@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 10, 2018 at 08:41:23AM -0600, Pierre-Louis Bossart wrote: > > On 12/9/18 10:29 PM, Zhuohao Lee wrote: > > Thanks Pierre-Louis. > > I saw a patch https://patchwork.kernel.org/patch/10493135/ which changed > > the KEY_MEDIA to KEY_PLAYPAUSE, will you merge that patch? > > Combined with this patch, the key remapping should be consistent. > > I don't have merge superpowers here, and I don't want to submit something I > cannot test. > > I was only flagging that the behavior is not aligned across patches, and > some of these patches were never merged (some since April). Yong Zhi and > Naveen M, can you help resubmit a patchset that aligns the handling of > buttons for DA7219-based devices? > > Thanks! > > Sure Pierre, we will soon post the change for all DA7219 based boards. Thanks > > > > I'll submit a patch to remove the Change-Id. > > > > On Sat, Dec 8, 2018 at 1:57 AM Pierre-Louis Bossart > > > > wrote: > > > > > > On 12/7/18 3:05 AM, Zhuohao Lee wrote: > > >  From the da7219 spec, the button A, B, C and D are remapped to > > > 0, 1, 2 and 3 respectively where button A is KEY_PLAYPAUSE, > > > B is KEY_VOLUMEUP, C is KEY_VOLUMEDOWN and D is KEY_VOICECOMMAND > > > > Ok, but could fix all da7219-based machine drivers then, the mappings > > are completely inconsistent: > > > > kbl_da7219_max98357a.c:    snd_jack_set_key(jack->jack, > > SND_JACK_BTN_0, > > KEY_MEDIA); > > kbl_da7219_max98357a.c:    snd_jack_set_key(jack->jack, > > SND_JACK_BTN_1, > > KEY_VOLUMEUP); > > kbl_da7219_max98357a.c:    snd_jack_set_key(jack->jack, > > SND_JACK_BTN_2, > > KEY_VOLUMEDOWN); > > kbl_da7219_max98357a.c:    snd_jack_set_key(jack->jack, > > SND_JACK_BTN_3, > > KEY_VOICECOMMAND); > > kbl_da7219_max98927.c:    snd_jack_set_key(jack->jack, > > SND_JACK_BTN_0, > > KEY_PLAYPAUSE); > > kbl_da7219_max98927.c:    snd_jack_set_key(jack->jack, > > SND_JACK_BTN_1, > > KEY_VOICECOMMAND); > > kbl_da7219_max98927.c:    snd_jack_set_key(jack->jack, > > SND_JACK_BTN_2, > > KEY_VOLUMEUP); > > kbl_da7219_max98927.c:    snd_jack_set_key(jack->jack, > > SND_JACK_BTN_3, > > KEY_VOLUMEDOWN); > > > > Thanks! > > > > > > > > Change-Id: I67f929f226883bd289cb7beb0a7b23f40e7121e2 > > You want to remove those Change-Ids for upstream. > > > Signed-off-by: Zhuohao Lee > > > > > Signed-off-by: Max Chang  > > > > > --- > > >   sound/soc/intel/boards/kbl_da7219_max98927.c | 6 +++--- > > >   1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c > > b/sound/soc/intel/boards/kbl_da7219_max98927.c > > > index 3fa1c3ca6d37..d3531f0eb357 100644 > > > --- a/sound/soc/intel/boards/kbl_da7219_max98927.c > > > +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c > > > @@ -262,9 +262,9 @@ static int kabylake_da7219_codec_init(struct > > snd_soc_pcm_runtime *rtd) > > > > > >       jack = &ctx->kabylake_headset; > > >       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); > > > +     snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); > > > +     snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); > > > +     snd_jack_set_key(jack->jack, SND_JACK_BTN_3, > > KEY_VOICECOMMAND); > > > > > >       da7219_aad_jack_det(component, &ctx->kabylake_headset); > > > > > --