From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754030AbcENV3H (ORCPT ); Sat, 14 May 2016 17:29:07 -0400 Received: from mail-am1on0109.outbound.protection.outlook.com ([157.56.112.109]:8752 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753866AbcENV3F (ORCPT ); Sat, 14 May 2016 17:29:05 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=axentia.se; From: Peter Rosin To: CC: Peter Rosin , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Misbah Ullah Khan , , Subject: [PATCH v4 3/4] ASoC: dapm: support mixer controls with mute at non-zero value Date: Sat, 14 May 2016 23:09:40 +0200 Message-ID: <1463260181-21344-4-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1463260181-21344-1-git-send-email-peda@axentia.se> References: <1463260181-21344-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [217.210.101.82] X-ClientProxiedBy: DB3PR08CA0017.eurprd08.prod.outlook.com (10.161.51.155) To VI1PR02MB1311.eurprd02.prod.outlook.com (10.165.231.153) X-MS-Office365-Filtering-Correlation-Id: a67762d9-693f-4296-8b93-08d37c3cc7ae X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1311;2:PQ0OW118rPfl7fipdWMQlM6+tlXX3axC2J+McPjg8fflMVvvnGMTKZGO10gXB9PhtiNUFO5DloNnaQd+ptoZcpwfYJywOLptvdP9MagAapmaOuYiBxo+yA+IzEffMDyoOXnPnZZZJTP2SWREJzvZ/Rv5hngBSMamRzbeyUllwWiz4lEQROLviWf8PR+sB6l4;3:3U8vP1ZfSxOwXfLirl8NrnT3CsZZKWvZW0++ZHJG7DR5BP5FILFrf0iRItQ59G8QVTW9z9HWZnDnv4cr8O9p4j3Rq7zETnpK+dI1TR0Aqk+VA7A82o6qcVtaiWfzbELC X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR02MB1311; X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1311;25:YqQbn8J2Nuhl/sYiaVRavZiiDew+1QUVAyoL8X5OAf9a6FUAzoEKcP49809SO2uXkw+2pjDK9NWl+T5QK1AEnOnW7QfM2fHqPBUdSqYRK9rxWOVMPjQDUE6wUhgKiODuV0Cd4+iwpMnZCYtDq+3SoWTXF1T23XpWIHjqqyh0+YfEhqwYYjyH9vLWLsftoY7kEWHs3T+cbpmrOH3Yc1nKPHg5x1NBBsXlpZZneXNitJU0+2FGpx+jJhFOMf2PVKvr1NPUx91zC8SkyPLwT8TakofmQZojlvOQ1+Txhgf+C9/1gRUc7g3UDkQKKtcFb1R2qsKuQiyT6h3AjkFfr2vkCMdC38/PYgVpxneK639BaXdmtttzdOLUiQP/mcEGa2zNSq8LdZsiAs08YKS9p8E0kLb7QVi43b+Q43uNnXm5e9KqpIXdh66wiit27xCedIv+Iwrirul3ejLdaDHdUcUCPFE7VZV3wXMouUBQhx6lTmYsIxRdL/6pLPSOqx1p0X54L4AWVFjnndywPGgI2lNZdbm5C8oPZZOd7kUs0Ra/eOPudoo/y6AoUZeuc0/Ha+cjenGKhT0Nsg8TMNqesHC/RAV5GTP3HvxnFRahqfYyij+tvVlxwU/ROYOjsLkeWKd5mKMOsVPWmfcYmXMfZL/3IClYci7jRpkgl5A8BUQxbbPlX3OJimdL94wD95gZaToYfUG4FbZJPm3G3sY3RknqxEtUzRokWtIDOgabGu86/VY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041072)(6043046);SRVR:VI1PR02MB1311;BCL:0;PCL:0;RULEID:;SRVR:VI1PR02MB1311; X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1311;4:7sDVoBAMigyijyYhhS1vtbWdtCmU/mzy9QvuhuwSD6CN2wHDF8fMknCgM4okI9rnWAZu58XXciyk+0MTVJApe5vHT8pms6j43VGfrx/Lc5GqeXIyIbPRaEyCQU2kBNiNsPDoG5BdG3peURojqsHz/tfjTPKnPH2big16dnOq3oQjsjI3Ap7f1JG/qaoE0jpFu+mY/akYy+0ncC+t0oJgV8ZfUzfuJj+8F6wqlIMI9vdI74rIBOhiM6eghRi5i2dJeJeGFCUMF5RnwuZpD+uoWeNWY1qpr6LIfaFKUQzqoIIclbeYOoJlDzCuVkYpt2fbP56XZTt2qcM2BgUQI+v0AJweH3wfpzUvzFDeHw2GI+7xFurlTjMyZP1AKFRKUcQa/H8TNCal1ADU0x1CnilmLn62bkmV1b7fFYh3szbGlBs= X-Forefront-PRVS: 094213BFEA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(19580405001)(189998001)(48376002)(586003)(6116002)(3846002)(5003940100001)(50986999)(76176999)(2950100001)(5004730100002)(77096005)(110136002)(42186005)(4326007)(33646002)(5008740100001)(50466002)(66066001)(74482002)(36756003)(47776003)(2906002)(92566002)(19580395003)(8676002)(229853001)(2351001)(81166006)(50226002)(86362001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR02MB1311;H:localhost.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1311;23:WQQbIdQcTqzbkGh5xnK6h+/cRxwNmFDouIouzYX12aHxN/Nmpa8ToPkbs99mp7rEC4cJ6KIUcb2prDdqjcKNn8LIHQfqugtjmpu3Pn17CYRWJCKJeMvSeZn1KkKt3370tkJiF+pBYC65nJdkzyzepGFELO1DP/7EEU3jqPB6Dm3DTX+Aar7/bMyTi3Y+Kg8p/wzOsgkjtIEbFfzBUSZ7wH3kPAHiCxacYkLGBIuNjBpsVn0ntOfd48alTWmgsUmlNoF1w+jMb3Jiq6oPJq2zuWqvq6uZkbSlpngfXY3aD5XbceFS5b4F218kWYaZ09y3ae/XFDCPJips2efabzNQcqVHc6GwlRL5Es2kn23IUDU4pytYqZiJzMnMYsizJpLd6l/RbUovKMZ8atwcntJbHgmPj/KPNZrGJSB9jhUPBj/lZ7p/0CxE7Qv691efc8swrxNBRykHb0kLVU9VVRjGuk33r87UnwF9b0aeytP3PlPMhIHtQ51jOsYdRAPz/IxHvwh7QYpDM906qh8mcQfUWdqRZXYXFrssnPYLv6dgbEWkICcscMtSesbu/MTwDU4HdnVDU1NV/Pgqw5PZfrzLj5Bdnv3typlvOtYibaCw6TiVWGyFn8OV4KTLKV0bVWqMRcHeEU76xfe6OzN/AsmCDaga1WtgeD7WLT3gd59dWs4qEp/Jaj8jNhHkYxm8RL8zl9Mi3RtprsRMrhFk2S+lKryjNVb+dv2dZG0h6pT6BMWoNXPof3IqKSscGpESmw2c7pUcZN0St+SvY7myLic7/T/xkp0YdFy5JYoeIShxKOig7QJ7Q9aKFn7j9iRdFwBSqeDK5jJIjZkmQzoYCgE+eavO3vJcaHMjsTg2JIzffSEv9SIOoz7lul+mjEug9tk3O1bl+gv8xpTHE8bj1QUiwlnMT3Jzj3Bl4kot9uDwY/pgzKos3908kNQWhJDR3iXr X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1311;5:nBqM7Dqn2s7XJq8pElrZOvvfmzHdO9UYgeK+/TPMlbAPR1gIhSjmV4sIm3EpqnTfCPfrJJJisKsuhOQze6zlB/tKIKXHfI1LVvAKmgc8K+p2mnPW2hfC7dQ1+9YPkJm1awAPAF3+WDTSYnZJ0vj3KA==;24:r9mh/T0XcUA/Bf052xX3TAjWq+XnWEKS3nr1YZtkAAa07uQ36n6rcdrvXIjL8mxA6HE8k6CgPu34EZDbl29NIRSGRWWQ3+7X7TlNq6z7PI0=;7:6/ZJVLwj49avdacVeMSdkz0KPDxz3s9ulrAm0HyFmbb3jp4D5/GOdKhKsktdVaSb8nVGgBfEgMYUUbAc36Aea/RCWKx0VhxZpjwlsIzFk12sx31xQ/El6EOc/1T3ej/vX9qyvBzG/N8fcMFI5LZbt9jJS92v45oopP/Er3QueomRD+Ai791mJeKBxWBZOrhd SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2016 21:14:44.7636 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR02MB1311 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The max9860 codec has a mixer control field that has its mute/disable at the wrong end of the scale. I.e. you turn the volume up and up, and then as the final step the volume is off. This does not sit well with DAPM, which assumes the mute/off is at the minimum value. Add support for such backwards controls with code that searches TLV ranges for the mute value and use that as trigger for DAPM off. Signed-off-by: Peter Rosin --- sound/soc/soc-dapm.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c4464858bf01..8a1131781339 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -42,6 +42,7 @@ #include #include #include +#include #include @@ -722,16 +723,46 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm, return -ENODEV; } +static int dapm_find_tlv_mute(const unsigned int *tlv) +{ + int cnt; + const unsigned int *range; + + if (!tlv || tlv[0] != SNDRV_CTL_TLVT_DB_RANGE) + return 0; + + cnt = tlv[1] / sizeof(unsigned int); + + /* + * Each group of six values should be + * { start end type len min step/mute } + */ + for (range = &tlv[2]; cnt >= 6; cnt -= 6, range += 6) { + if (range[2] != SNDRV_CTL_TLVT_DB_SCALE) + return 0; /* wrong type, terminate */ + if (range[3] != 2 * sizeof(unsigned int)) + return 0; /* wrong len, terminate */ + if (!(range[5] & TLV_DB_SCALE_MUTE)) + continue; /* no mute in this range */ + return range[0]; /* start of this range is the mute value */ + } + + return 0; +} + /* set up initial codec paths */ static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i) { + const struct snd_kcontrol_new *kcontrol_new + = &p->sink->kcontrol_news[i]; struct soc_mixer_control *mc = (struct soc_mixer_control *) - p->sink->kcontrol_news[i].private_value; + kcontrol_new->private_value; unsigned int reg = mc->reg; unsigned int shift = mc->shift; unsigned int max = mc->max; unsigned int mask = (1 << fls(max)) - 1; unsigned int invert = mc->invert; + int mute_value = dapm_find_tlv_mute(kcontrol_new->tlv.p); unsigned int val; if (reg != SND_SOC_NOPM) { @@ -739,7 +770,7 @@ static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i) val = (val >> shift) & mask; if (invert) val = max - val; - p->connect = !!val; + p->connect = val != mute_value; } else { p->connect = 0; } @@ -3045,6 +3076,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, int max = mc->max; unsigned int mask = (1 << fls(max)) - 1; unsigned int invert = mc->invert; + int mute_value = dapm_find_tlv_mute(kcontrol->tlv.p); unsigned int val; int connect, change, reg_change = 0; struct snd_soc_dapm_update update; @@ -3056,7 +3088,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, kcontrol->id.name); val = (ucontrol->value.integer.value[0] & mask); - connect = !!val; + connect = val != mute_value; if (invert) val = max - val; -- 2.1.4