From patchwork Fri Mar 3 14:52:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Lee X-Patchwork-Id: 9603039 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 224B2604E2 for ; Fri, 3 Mar 2017 15:05:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 113D528630 for ; Fri, 3 Mar 2017 15:05:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 054B828601; Fri, 3 Mar 2017 15:05:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B184828630 for ; Fri, 3 Mar 2017 15:05:42 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A57CF266B75; Fri, 3 Mar 2017 15:54:52 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3C0AB266FEB; Fri, 3 Mar 2017 15:54:51 +0100 (CET) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0129.outbound.protection.outlook.com [104.47.34.129]) by alsa0.perex.cz (Postfix) with ESMTP id 81FFC266B61 for ; Fri, 3 Mar 2017 15:54:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maximintegrated.onmicrosoft.com; s=selector1-maximintegrated-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=qThh0GO9AlL728O88V+G86kJotdwTM6psULcepPjIq0=; b=NjGR1SXJbT7mpuqY6a4ZvVmm/EbUCOS1I4OmrA/UzmMzygxJSOjHi1VudA9RnAH0o+xmQ8+Q9LwmH2fOoNeeAfsg0QfcJVP0vaxU+wXha79K/sCmuLTthVgv7AXelrFA0lelnqIq23+SC9f/3uM/BDVbV7gvh266GeJ7HGYkvQw= Authentication-Results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=maximintegrated.com; Received: from ryan-Lenovo-IdeaPad-Z510.maxim-ic.com (222.234.201.146) by CY4PR11MB1367.namprd11.prod.outlook.com (10.173.16.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Fri, 3 Mar 2017 14:54:22 +0000 From: Ryan Lee To: , , , , , , , , , , , , , , , , , , , , Date: Fri, 3 Mar 2017 23:52:46 +0900 Message-ID: <1488552768-14901-9-git-send-email-ryans.lee@maximintegrated.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488552768-14901-1-git-send-email-ryans.lee@maximintegrated.com> References: <1488552768-14901-1-git-send-email-ryans.lee@maximintegrated.com> MIME-Version: 1.0 X-Originating-IP: [222.234.201.146] X-ClientProxiedBy: KL1PR02CA0031.apcprd02.prod.outlook.com (10.165.15.41) To CY4PR11MB1367.namprd11.prod.outlook.com (10.173.16.149) X-MS-Office365-Filtering-Correlation-Id: 451af49d-0ef4-4de8-7a60-08d4624531c9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:CY4PR11MB1367; X-Microsoft-Exchange-Diagnostics: 1; CY4PR11MB1367; 3:xSOW8okRbwJSHYh7PtiWguJiNnzEMWQPj92TKNw06JW225vRvLd6s6V5oA9hcnKvxsnxZVsr5xGsfVSDtQMHQxCBkQsicuO5Xhu/+RpRprzF8JqGM7sCyH091kwNGPQ7Qv6InmIv/F+vS4eo5yvMAVzMkKSuF5gEapf9V9coU1zsix0B++1dihYtDf6Q12WTLNYeAs9DGLJLahvjW2QsevipxxseIZV1XLT70ahBVCqoyqFfUss2ZcqP2d9pBwC2OFtMAnWOAMcaccltgEpHxbTG6seodCC57sWi9on5/HM=; 25:Rap+TkPj6un34oOpfDILh0xvSCgwy/i3l9uJ+wVhoIaCHV/0HrEvWz6gYLjPQLCNlySCezI2YvKftekstBiifEqhAfxhQyC3l0H5UoZRcyUecQSlnz63GKLDi/56uXmYZO8ZwHgs3S4q++f24OcpaLTptqBtIsyf2eonTLQ7RWvVK4NDq9QnigyX2UsZVz/gDIB7x811B00eOyMiCbPTL6TbxYtEaMbFdOMq063PbaOdMBf8rzlTQjoixWG7XhcLPVAJc7lvpbO1RgpdnO14303zrn0AQNrClWfLVIlMLHVMnQYyfH+3Yjels2KBSSSlP/iK/dUtP7QF7wbjj40ipDOIA4HxXJO+7MMSxfY5KZxwwGUARHO1TP2UJSzTt48s9e6ubXcr531fBPy3waKrTFLx21PzNLUw1XXGi0npjrV0iePX90qYjGT56NbWrogB X-Microsoft-Exchange-Diagnostics: 1; CY4PR11MB1367; 31:2DBuYek2clKFoNsHvSIF7SZ2Sudl4P1B04jWRjsET0JIGF4NevspeeTLsz6QSbztYGPiCo+/3mv5XMXV7orv6+t30fUsb5eLI3M+da30iy7TogyOU4mzqg5xmfYF1IqDE/wqUx2I7ZOI4BDSECcmnKmvLzKxDckJgQyFKNnU7ylvwZIOW3N0hmW0BufGkW2StnFN0oQNBzq6IKhaVQ441kJE7Lc6foCKySgh3j0/kgmSyQIKHB/5h3R4FxVkD9hD1uX///RQXtztOaUGLC8zBg==; 20:aKDK/5IJ+36Vs7SV8upT7bCd5stfikBDuCUBemVmdLERIc5YLX/mdkuVUX/KZON0KWNNym091oPA2uC789hrhkb9HL5YYyBRMcqbdCX2Mym4fvdQukXF6XAuCB8L5K7pn+1U0WOfAGpawdWAYws9phaJ9hv/9qf+Jro7qZtPzqQdaPGTvn3nsv+26kpO3kSUFcfsOKUDf3JLch9FU+eJRXquGpAWtr1Tn3dnRYamln2OQYeIiYOWMQv2/Z+DZk1+DE3KAeHMcpBsbMB9FE3kspTXhc0zbJMK5RbYk1CGvekxkLW3ug7ImwCeXb/mwqWlI1tzVm50Wi3tiDrH69yk0wNPaG7KoKmVn3qXtzc2FK+c/bDyitF3TEG0pBiBz2VN9bE9iQDBmQ8SakOhjXxfNgYUaFepPn9tIP+PWSDMQqwGUUStC5IAhUhJdJI229IcTcqLVTdqjLXvSK7QgQfKPaTLNpyef+5qxhJ5OY0/WtAQatMtTmh56whfnT1GPz0L X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(108721460000369); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(6072148); SRVR:CY4PR11MB1367; BCL:0; PCL:0; RULEID:; SRVR:CY4PR11MB1367; X-Microsoft-Exchange-Diagnostics: 1; CY4PR11MB1367; 4:AiJQy60G6UCCpiY+8dsnu8L0PFCh1WCWeBM8QES+HlVUcmifFsMOBuSnDvOfn+OS9lssdJt4PwrapjkEhGYuzd33pa8nrkcnwftFKXVDZwOXaIGe69eYwKztFIfIpewUjhi4zr7YozBT2a0/AO3KDIJ16yDSDktgTXTBqnsS8aTl6B+J5JKpJBIzYjwm65nt0FCIlwCmO25k1vMzjwe/BNhy6+l3oivXUJtyCaYZ6IDTm6Fed7OtVUqoK9idzz3dCXwn1cGBCp/6Sdi3GDS6ArGTA14PoquT42gW82NesjxaNwtkJJyJQP5KOBpYblKdRYFXELrBeMkE+5a6hQNKqFRZyCNaQ98eA6DR+fY1OSCzVjb3viY0470Hew4x7TOsK25ZlMUiRsVAvhi/s7XjW/oUymr4TSVGdFxWKWbBDzD5WgC2ElW2gw4EILrsdHjJG+qQi8tIu0gJsz7Um+3h8MFDUyqFbVzW7hTa+9uNO95vo10tT6pYiyjqXra6NQVdJTCiUFL+neqkxJnzQuRO1yE00SJV8oT7LC5PgtYcePP5nY/XIHP0tRO5I2XsbpCswdR0hFbfVyCnUFOycQAvTK/hEzV+qOL/jnNI8Vj9eXkXs9I6ZnQjeLp54AE6H9wPpQpcTn5A6l563sN1F4ZF4KWS6X0ckfypeceqdB24M2g= X-Forefront-PRVS: 0235CBE7D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(39850400002)(39410400002)(39840400002)(39450400003)(39860400002)(33646002)(86362001)(50986999)(5003940100001)(7416002)(25786008)(76176999)(2201001)(50226002)(189998001)(6512007)(2906002)(6486002)(6506006)(6666003)(53936002)(42186005)(53416004)(3846002)(305945005)(66066001)(6116002)(48376002)(50466002)(92566002)(8676002)(7736002)(47776003)(36756003)(2950100002)(5660300001)(4326008)(38730400002)(81166006)(921003)(1121003)(19627235001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR11MB1367; H:ryan-Lenovo-IdeaPad-Z510.maxim-ic.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR11MB1367; 23:oCRRnYCLUdKZJz1mL6PxTk1W6vkURUM9IBPs2CN4n?= =?us-ascii?Q?N2xJarGcLdOQ8mAVVITYaAF/lXxrfVjcHS73a4ZYAG1YyEOIgh4YtipphcH9?= =?us-ascii?Q?OIEEPLjs0T3AmAcekwOW5wNnnLvkZN3ncpLRSjCT2CGX9rG6N8c5602X1sO4?= =?us-ascii?Q?a7aYXkGrAZTvdO5rULfI5eSUbgDdKJlCA/Klk4BVSOTK/PjRh3beLVs8lS9e?= =?us-ascii?Q?HRb9ZraFaAjXhzfgDwa2gPCkLlefyvVuBlos/lU3io3jI866QyQlIg2d8/HC?= =?us-ascii?Q?4Xnd0fYWXJ7cC8jzJi5lHyoiHyIjWFEvfK6W0mpoPVQJOEfSKMA7MYOKP6OL?= =?us-ascii?Q?n4O4GmY5XyZq3n/xFGhQsw5N6kAWWG8/svpH1+IalfE1gVy8HfXaTsDBJ4Ik?= =?us-ascii?Q?KAZr3CXh/NWPqovQMbxQI0KJ7VaOSJpxvlD2y9Wqf1isKGW2paqPYxqteKFJ?= =?us-ascii?Q?/v46CbKilaMVGhgHkt9NPLlil9arR4s+k3X0e5i8QlJneis9bhLAvXneQXdF?= =?us-ascii?Q?IbvZp/pI/bYDxxgEhaSdSli8PlwmT+316rCZZ8rtKjK0ToD3B8Hd2sl0Zj7L?= =?us-ascii?Q?mc1e0yAJnFnlcyxwVfGc6n4dkjVNQ9zWBDmTmgnIRwzyarEGpPOGfoGy+cur?= =?us-ascii?Q?9zNZ8HgVvNZ+fgaaJPS2l8ZK+51qS06NAYhrHvoBToxmw5J4J0RO4BhqEodH?= =?us-ascii?Q?Id6fRKJHJBaT4B3jZkmeV7rws+JyETPQBY/f2glGK3fNvefEciumh54fgGaX?= =?us-ascii?Q?O4qaJwCcgKEeawknxn8Zn3He7qmA/R2cjqRDKY7ly2NqVxNnYJIcLRYvOYTX?= =?us-ascii?Q?LM4y1rms5+eCLFnMrFMxAdEmtP6FptofDL/NWxvbbkSPL6gLrd1O9zVkkBY6?= =?us-ascii?Q?cAXgm15TbM8pGkjjleaMRPy/1UrV4BJaYRH0H4zApstcR/PTX5wo77L4Xm+2?= =?us-ascii?Q?P2iaZ5giVsC3kpuTPoBs3/cAEycqwSpjSeiWMZPolLR4/0aOu88sbC5DsgT0?= =?us-ascii?Q?SF84iQxAsZPBvRq55HGWFoatawRJ4vav+yGiu/Jbuyq+R8om1N02MpzxQA8s?= =?us-ascii?Q?OExxVWa/B7kuY5YWxfhFetdxviQvoBh96rN6SljlvGXPm2xW8vhbiT2OMJUY?= =?us-ascii?Q?jXuSARVm/g=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR11MB1367; 6:pk/KW5T9M/nAiVOHlsBMnVvKnTIMWx5BCjOPMZCZvevp4C5PPkSNr7pUAlPFZcDYOmqsWTbm7KCbbnELwl17ZTHlJ9doUtF3kQZzHgN5AQ6hLZ1HWskBiRO35Ar8Ba4QQFWKP/Tqq/7hFhffscB35WyE9YTVUAJVmlsGeUoqTsT18mMBErMp0Cbn8/YmKEbNbsmA58r61QwX92NY5Zxxo4vHeclaphfUOyA3q/07dFAUft2bMBFXfMh0kqS69h00a7zEoZ34nVAfrYboJMKcwLZTg9XQnHs4SLlwTtg+Y2oTSWCA5LOwSUWwfTwXsPxrtpSkSswkiZBmya7qBGkekr5B7yLcezLDMf4ncp8bVb0PkR6Kthor24xvtTSgyUMYUW297VezLw8jEpMcLGsqqzyLjsrUlYuSii4JsSXvrWs=; 5:i43cRiayKLmuZTJf+TmuHVJT4XlvMwTRNulKii9JUjQlu18hsDbpQtIzipZkeTa27/wsmCjc4dcLe0ryd2N8r0CY5QxQgSlpDkAZiK68fyyavdTkts/O6wiC2omp5tfuEZP+VZaT9JBszlik89F0rIKydop0rfwpdrJr0wua+ds=; 24:ECZFOv8JKOMcRTdHiVNtHmDGgKdlCaiW2x6dUFG3yphWV+Bqeo2u5ZH57Ch27vQzQgYZhzWizjxegFVRGZqNrp6z4YaRxU8pBvO2tovfQ1U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR11MB1367; 7:pUiW9JeGtS9cmHNwKCgLujr/cv58wi8t5Ixv1Gm4EXBxbUKZHn+JXn/AhD4PNQVmXGrYTZWUbdPr75UeTYjtj0ynIdx5IDKoONyUPQX334P793B5HXaYRPu6KppCUByz26sikhbuoQf1NM9BJSgEcXgHUmCEhY5qaMXWRuu0xFC8dzi+wRstmZzCfbRg8W460R+16Frb/9usT3i5G8Dh4NeZKiznEM/sGbPsQzyUDjxvnfCF3FzIQ64e7XVmh0hm7wh6OKRMLabnn8BOFLGJmcp4rCe62gS5iUm3evr76Ko4sF4xSsyI8hwBYZx5zzVFRmjQhBp3vXgBWZQV1GHGfQ== X-OriginatorOrg: maximintegrated.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2017 14:54:22.9462 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1367 Cc: kernel-janitors@vger.kernel.org Subject: [alsa-devel] [PATCH 08/10] Added DAI Sel Mux and minor updates X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ryan Lee --- 'DAI Sel Mux' was added. 'max98927_volatile_reg' was added to identify volatile register. sound/soc/codecs/max98927.c | 60 +++++++++++++++++++++++++++++++++------------ sound/soc/codecs/max98927.h | 2 -- 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c index df2f4ff..6eb745bd 100755 --- a/sound/soc/codecs/max98927.c +++ b/sound/soc/codecs/max98927.c @@ -446,11 +446,24 @@ static int max98927_dac_event(struct snd_soc_dapm_widget *w, return 0; } +static const char * const max98927_switch_text[] = { + "Left", "Right", "LeftRight"}; + +static const struct soc_enum dai_sel_enum = + SOC_ENUM_SINGLE(MAX98927_R0025_PCM_TO_SPK_MONOMIX_A, + MAX98927_PCM_TO_SPK_MONOMIX_CFG_SHIFT, + 3, max98927_switch_text); + +static const struct snd_kcontrol_new max98927_dai_controls = + SOC_DAPM_ENUM("DAI Sel", dai_sel_enum); + static const struct snd_soc_dapm_widget max98927_dapm_widgets[] = { SND_SOC_DAPM_AIF_IN("DAI_OUT", "HiFi Playback", 0, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_DAC_E("Amp Enable", "HiFi Playback", MAX98927_R003A_AMP_EN, 0, 0, max98927_dac_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + SND_SOC_DAPM_MUX("DAI Sel Mux", SND_SOC_NOPM, 0, 0, + &max98927_dai_controls), SND_SOC_DAPM_OUTPUT("BE_OUT"), }; @@ -476,12 +489,14 @@ static int max98927_spk_gain_put(struct snd_kcontrol *kcontrol, struct max98927_priv *max98927 = snd_soc_codec_get_drvdata(codec); unsigned int sel = ucontrol->value.integer.value[0]; - if (sel < ((1 << MAX98927_Speaker_Gain_Width) - 1)) { - regmap_update_bits(max98927->regmap, - MAX98927_R003C_SPK_GAIN, - MAX98927_SPK_PCM_GAIN_MASK, sel); - max98927->spk_gain = sel; - } + /* 0x7 is reserved */ + if (sel > 6) + return -EINVAL; + + regmap_update_bits(max98927->regmap, + MAX98927_R003C_SPK_GAIN, + MAX98927_SPK_PCM_GAIN_MASK, sel); + max98927->spk_gain = sel; return 0; } @@ -538,6 +553,15 @@ static int max98927_amp_vol_get(struct snd_kcontrol *kcontrol, MAX98927_AMP_VOL_SHIFT); } +static int max98927_amp_vol_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + return max98927_reg_put(kcontrol, ucontrol, + MAX98927_R0036_AMP_VOL_CTRL, + MAX98927_AMP_VOL_SEL, + MAX98927_AMP_VOL_SHIFT); +} + static int max98927_amp_dsp_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -587,14 +611,6 @@ static int max98927_dre_en_get(struct snd_kcontrol *kcontrol, MAX98927_R0039_DRE_CTRL, MAX98927_DRE_CTRL_DRE_EN, 0); } -static int max98927_amp_vol_put(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - return max98927_reg_put(kcontrol, ucontrol, - MAX98927_R0036_AMP_VOL_CTRL, - MAX98927_AMP_VOL_SEL, - 7); -} static int max98927_spk_src_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -646,6 +662,15 @@ static bool max98927_readable_register(struct device *dev, unsigned int reg) case MAX98927_R0100_SOFT_RESET: case MAX98927_R01FF_REV_ID: return true; + } + return false; +}; + +static bool max98927_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX98927_R0001_INT_RAW1 ... MAX98927_R0009_INT_FLAG3: + return true; default: return false; } @@ -711,7 +736,11 @@ static const struct snd_kcontrol_new max98927_snd_controls[] = { }; static const struct snd_soc_dapm_route max98927_audio_map[] = { - {"BE_OUT", NULL, "Amp Enable"}, + {"Amp Enable", NULL, "DAI_OUT"}, + {"DAI Sel Mux", "Left", "Amp Enable"}, + {"DAI Sel Mux", "Right", "Amp Enable"}, + {"DAI Sel Mux", "LeftRight", "Amp Enable"}, + {"BE_OUT", NULL, "DAI Sel Mux"}, }; static struct snd_soc_dai_driver max98927_dai[] = { @@ -888,6 +917,7 @@ static const struct regmap_config max98927_regmap = { .reg_defaults = max98927_reg, .num_reg_defaults = ARRAY_SIZE(max98927_reg), .readable_reg = max98927_readable_register, + .volatile_reg = max98927_volatile_reg, .cache_type = REGCACHE_RBTREE, }; diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h index 2de8504..e13e18a 100755 --- a/sound/soc/codecs/max98927.h +++ b/sound/soc/codecs/max98927.h @@ -264,6 +264,4 @@ struct max98927_priv { unsigned int master; unsigned int digital_gain; }; -#define MAX98927_Speaker_Gain_Width 3 -#define MAX98927_AMP_VOL_LOCATION_SHIFT 7 #endif