From patchwork Sun Feb 26 12:47:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13152394 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C439AC7EE2F for ; Sun, 26 Feb 2023 12:50:28 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id B06B1868; Sun, 26 Feb 2023 13:49:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B06B1868 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1677415826; bh=yAKKZS93DzBbBINmZ67z5s72Cs2zUCyYJViPEg1/Iyc=; h=From:Date:Subject:References:In-Reply-To:To:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=jGI46gosXcs0PAF1KpL02Zx7DpufY1AQQkUSpBY1vMejwop1VZDavhrMUy5wt25L+ aq5ttS4i9pVKkW6wKmUfdS/e04KxVFF4S0bR6JxmUqnJEEFlvXOx/gdvvqlZxxRU8e JItCcsYZfhVH1x/jKyhS6fFq0RO+F3lEQSFmy2Hk= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 070F2F8053B; Sun, 26 Feb 2023 13:49:11 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7427EF8052D; Sun, 26 Feb 2023 13:49:07 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 7CC6EF800DF for ; Sun, 26 Feb 2023 13:48:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7CC6EF800DF Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=qp2pI8J/ Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E74FC60C1F; Sun, 26 Feb 2023 12:48:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1FC8C4339C; Sun, 26 Feb 2023 12:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677415687; bh=yAKKZS93DzBbBINmZ67z5s72Cs2zUCyYJViPEg1/Iyc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qp2pI8J//AKX4bbskvSW7LqB8nwGHcFwA4+KF2iS4ECxC9l3ZH6MUY+3NAKfv/Ae5 p+6HXpL3Y0qX33Z2V+gR71ns+YZB02tOVKVi5GyWwMTUuhbJxNyjVDGIfkNXP0By/b +OBOaEnqNmpVMm2rZ10Iy7+y5Ikk9GaW00r4r+2yues/l3+XFTkCdhlbP7kLHoPqcK 0vrNFWo+R4dwP9lCBQuSyKFHaaIqJZTp0GH51d8vNJvGR5WCqaf9hbtNB8D+0Ju8kn 2R9GoecYsIfBiYAJi0xG8UIBQVXd59MOg8RcbIi71etKohPEyUkm23Tm5kt2PyjMed grOpHdqWM9RuQ== From: Mark Brown Date: Sun, 26 Feb 2023 12:47:56 +0000 Subject: [PATCH 1/3] ASoC: mt6358: Fix event generation for wake on voice stage 2 switch MIME-Version: 1.0 Message-Id: <20230224-asoc-mt6358-quick-fixes-v1-1-747d9186be4b@kernel.org> References: <20230224-asoc-mt6358-quick-fixes-v1-0-747d9186be4b@kernel.org> In-Reply-To: <20230224-asoc-mt6358-quick-fixes-v1-0-747d9186be4b@kernel.org> To: Liam Girdwood , Matthias Brugger , AngeloGioacchino Del Regno X-Mailer: b4 0.13-dev-ada30 X-Developer-Signature: v=1; a=openpgp-sha256; l=710; i=broonie@kernel.org; h=from:subject:message-id; bh=yAKKZS93DzBbBINmZ67z5s72Cs2zUCyYJViPEg1/Iyc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBj+1UA+dtvLWAoGO6f76qudLS6vUAWHu8gYMrdKViY zbBwra2JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCY/tVAAAKCRAk1otyXVSH0HPfB/ 9AMgPSX7Cs9sm1+9clPmQLcJowiC/LkJjILn2UY0FykRyCcV5LygYf2P2FvKWbYxlpAGUUqYcic+zX NFKw+jYmb3Fo4at8hkoQJHP+0SXEpg0TFD3GbvWB4irPoyQBkiU8moJSVugdyv+9h4f6QNCHFnqV7W onn0TRjbm/usiX17wVkSceuej7eFjwyMpIQraiUCflU5p2VUnNPiyfXAhCShePQ85xc8Bz+Ols0W3u 05H9hEE6clJgrHE1YWmd8ou2zkmdvaDDo4NDVcr9G/0BeTM7oKjUg33lqIlrvMXtG2Wn5BLc/qkZQf m8BOAYUfOKb0AoNJNWPPbuhgaMJzZz X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Message-ID-Hash: ICSO7EJYTPXOAFI3CFO3YZ34NFL5XKQO X-Message-ID-Hash: ICSO7EJYTPXOAFI3CFO3YZ34NFL5XKQO X-MailFrom: broonie@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Mark Brown X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ALSA control put() operations should return 0 if the value changed so that events can be generated appropriately for userspace but the custom control for wake on voice stage 2 doesn't do this, fix it. Signed-off-by: Mark Brown Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/codecs/mt6358.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/mt6358.c b/sound/soc/codecs/mt6358.c index 93f35e8d26fc..9004377461f7 100644 --- a/sound/soc/codecs/mt6358.c +++ b/sound/soc/codecs/mt6358.c @@ -567,6 +567,8 @@ static int mt6358_put_wov(struct snd_kcontrol *kcontrol, mt6358_disable_wov_phase2(priv); priv->wov_enabled = enabled; + + return 1; } return 0; From patchwork Sun Feb 26 12:47:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13152392 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E7F0CC64ED6 for ; Sun, 26 Feb 2023 12:50:06 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2FB83844; Sun, 26 Feb 2023 13:49:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2FB83844 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1677415804; bh=myDYJsmBOb8gHjAvQqUQgdCx6N4vYiHnypwvnwHY+4s=; h=From:Date:Subject:References:In-Reply-To:To:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=dAJqn7bXwJS0LeWFHSnS2jzz9sAU5wLvej2gpVeN+CuA9RUPDKFS1Uuub5gitTATU 2uEiVHtB+YJiIyfspCuq15ZZ3BVA1J90uIwf/ePYPSPIKNuGJKmUqWijUTUB9Ho6nA mtKg7FaSZB6/DgPXseuEp7yZNiya4dBNGdZGBRxw= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 3C0FDF8051B; Sun, 26 Feb 2023 13:48:23 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D44A6F804FE; Sun, 26 Feb 2023 13:48:17 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 4DEDDF802BE for ; Sun, 26 Feb 2023 13:48:11 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4DEDDF802BE Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=lXmQqneI Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3FA5060B5B; Sun, 26 Feb 2023 12:48:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFFB8C433EF; Sun, 26 Feb 2023 12:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677415689; bh=myDYJsmBOb8gHjAvQqUQgdCx6N4vYiHnypwvnwHY+4s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lXmQqneI92pqzTJvMvB92/dlWf95v1nIBdHn/LaUO094h0a8mRdisPqgqEqm98WFM KLjfKh9sOc9uhjeU8Y4qDwqjY3VO5PYjcRyr5w7+cKicnOtLY6T+/iZWD6nNF8CFV5 GsoyfKM/TAmBltf1epICe1zB284JIJemwndJbTSzN77X/Hn2bCSSoHN/Tiqy41U2zt 82lnheACCp7HNXM+Qnp7lmbB7h3AOvdQrIfT1W+XTGPDCH15rFbIfr0Ie7fUDZiL4P 1vV5YXxPtW0KEsAyEdJC6J+njbroNlnqNIJuIlRGGrLTvbp/ytqffC4GryXLYhyQX+ V1LVYVBc+Lh2w== From: Mark Brown Date: Sun, 26 Feb 2023 12:47:57 +0000 Subject: [PATCH 2/3] ASoC: mt6358: Validate Wake on Voice 2 writes MIME-Version: 1.0 Message-Id: <20230224-asoc-mt6358-quick-fixes-v1-2-747d9186be4b@kernel.org> References: <20230224-asoc-mt6358-quick-fixes-v1-0-747d9186be4b@kernel.org> In-Reply-To: <20230224-asoc-mt6358-quick-fixes-v1-0-747d9186be4b@kernel.org> To: Liam Girdwood , Matthias Brugger , AngeloGioacchino Del Regno X-Mailer: b4 0.13-dev-ada30 X-Developer-Signature: v=1; a=openpgp-sha256; l=846; i=broonie@kernel.org; h=from:subject:message-id; bh=myDYJsmBOb8gHjAvQqUQgdCx6N4vYiHnypwvnwHY+4s=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBj+1UBQXRJd3he2b0fKcFSDBDJVxJc19sEfIgpXRZ8 wWf3w4GJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCY/tVAQAKCRAk1otyXVSH0Oo3B/ 910h+pTiRCco9oKRj3PMiCimp3XauEGVJdrJyivL73hfrDgnNCcp4VtngLqPCxfodWykqLQbjrq6V7 ISlOAsJzjrZiWw6pTrWqTwEtXde+o1g0dZoSM/TYOC0eTgPqev1TpFK2d9HhHfGbAryLLpiMQAYTBB LkSGqJsPR7rv2hXT8BSDJKkBG+PEgQDnBbN8rAul89S2+j16NX3W7AHZF7ulY0zGFRteJ+n3Cxp1LW lYeUXRp7WkeK8FStLNF0LV9OFy9PkD4cctzPEm+rRoz0X3DcyEee+okX4ziVA+xX3N1mTCDO1Ybtc6 GpZnr11PmWZ9CRpaA6O/qYqLlU7TpT X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Message-ID-Hash: UABI75XCRM3HFIXO3QLHDJU6IPD7EXGZ X-Message-ID-Hash: UABI75XCRM3HFIXO3QLHDJU6IPD7EXGZ X-MailFrom: broonie@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Mark Brown X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Currently the Wake on Voice 2 control accepts and stores any value written but it reports that only 0 and 1 are valid values. Reject any out of range values written by userspace. Signed-off-by: Mark Brown Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/codecs/mt6358.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/mt6358.c b/sound/soc/codecs/mt6358.c index 9004377461f7..89d0dcb2635b 100644 --- a/sound/soc/codecs/mt6358.c +++ b/sound/soc/codecs/mt6358.c @@ -560,6 +560,9 @@ static int mt6358_put_wov(struct snd_kcontrol *kcontrol, struct mt6358_priv *priv = snd_soc_component_get_drvdata(c); int enabled = ucontrol->value.integer.value[0]; + if (enabled < 0 || enabled > 1) + return -EINVAL; + if (priv->wov_enabled != enabled) { if (enabled) mt6358_enable_wov_phase2(priv); From patchwork Sun Feb 26 12:47:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13152393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6EDDBC6FA8E for ; Sun, 26 Feb 2023 12:50:14 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8597F847; Sun, 26 Feb 2023 13:49:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8597F847 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1677415811; bh=emNCSAQUMhHTUG3lVSOQb0USv0AarsCt9Z41ZbfcyGE=; h=From:Date:Subject:References:In-Reply-To:To:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=seAZUKGSbuB5AnrF787VHnygylutOgfaiXQwVVU+yoi3Il7R03zhhLdTj8Txda7Jy /hsnshf+3kaHx9cQZZ2ZGlIpqe5v/jlmBsi7tfSagyyr2zsBHH/+4oy+lw0H7SqFS2 T8s/l8ACoL3QPg1szDuQlsYk4hzFsjm436byA0hw= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id A3C41F80533; Sun, 26 Feb 2023 13:48:35 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 009EAF804B1; Sun, 26 Feb 2023 13:48:21 +0100 (CET) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 19A75F8049C for ; Sun, 26 Feb 2023 13:48:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 19A75F8049C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=eWex+5QW Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 03598B80B46; Sun, 26 Feb 2023 12:48:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 399FFC4339B; Sun, 26 Feb 2023 12:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677415692; bh=emNCSAQUMhHTUG3lVSOQb0USv0AarsCt9Z41ZbfcyGE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eWex+5QWuA6TZ8OOVdB12xYiI1kQADxNAwu5NhBut5ClnmQAbMMYw8CFHq4g+xOj1 jrK+VC1MLG28KEYsp7jQ5TiB2zMQZ2QT3R9Oz5Fgv2V19iZgVndui5Sg8IV+Ds/Xn+ Q3gqaW82BfVvJ5IaOcD7cL9UhWCRpHsERZjBjQODzFxlZSzovNRoYKL9hddBXPy5DW h8UVQj+7rSsRSjCE8S4XzPLvVPtt2HLELc36tGR3+CH567Wpln+GSf2DI1ssiYQgNy DiMueKkAcJPTEDbv4VAL24Fl07op9FueCfcihpML+kQjKsKKdXCGGUodH2nVDxV6bD iSBocuDVAavjQ== From: Mark Brown Date: Sun, 26 Feb 2023 12:47:58 +0000 Subject: [PATCH 3/3] ASoC: mt6358: Remove undefined HPx Mux enumeration values MIME-Version: 1.0 Message-Id: <20230224-asoc-mt6358-quick-fixes-v1-3-747d9186be4b@kernel.org> References: <20230224-asoc-mt6358-quick-fixes-v1-0-747d9186be4b@kernel.org> In-Reply-To: <20230224-asoc-mt6358-quick-fixes-v1-0-747d9186be4b@kernel.org> To: Liam Girdwood , Matthias Brugger , AngeloGioacchino Del Regno X-Mailer: b4 0.13-dev-ada30 X-Developer-Signature: v=1; a=openpgp-sha256; l=1325; i=broonie@kernel.org; h=from:subject:message-id; bh=emNCSAQUMhHTUG3lVSOQb0USv0AarsCt9Z41ZbfcyGE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBj+1UCvnHtC8Y2FK2g3UW6t8hM+fV6KPpUPjMtvnTx 6rGLlNGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCY/tVAgAKCRAk1otyXVSH0KsZB/ 0S4IR6aezaldfEMIQi+pLvwztcvY+0JlipzO8KvE+KJaAcGy7xMknnanzY+SUc8fT/kODECUFt9eQQ YRpQhGHoTxzbJ7nLHXkU1L8qtW0KPKQTmii6TOcyCXdvfMPKIMpYMcyqjv2TUlowRMAfl3Ea/kBkYl OJ4PHrpQjOoamOiHuDs84/KrG/cCXhcXcXwl9pPBQLimzQjOUu4LBw+FRN7AJFDZnTqF3hjv2+UJVl xa1u5E5GNuIjoX6BftzBZlqtBr08S/BWkTiwrja04VIW0qldf1bHVg5AXXQ8VgbBYvpCjwr2QL8ypT W0EpsI82xGERoJQcHv8w3iMJI8jJqC X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Message-ID-Hash: JLROZOIYWCCJH5WJ6IZXNCU5D5CY6QD3 X-Message-ID-Hash: JLROZOIYWCCJH5WJ6IZXNCU5D5CY6QD3 X-MailFrom: broonie@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Mark Brown X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The HPx Mux enumerations define values 5, 6 and 7 but describe them as "undefined" and map them to the value 0 on writing. Given the descriptions and behaviour it seems that these values are invalid and should not be present in the register, the current behaviour is detected as problematic by mixer-test: # # HPL Mux.0 expected 5 but read 0, is_volatile 0 # # HPL Mux.0 expected 6 but read 0, is_volatile 0 # # HPL Mux.0 expected 7 but read 0, is_volatile 0 Remove the values from the enumeration, this will prevent userspace setting them. Signed-off-by: Mark Brown Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/codecs/mt6358.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/codecs/mt6358.c b/sound/soc/codecs/mt6358.c index 89d0dcb2635b..b54610b27906 100644 --- a/sound/soc/codecs/mt6358.c +++ b/sound/soc/codecs/mt6358.c @@ -637,9 +637,6 @@ static const char * const hp_in_mux_map[] = { "Audio Playback", "Test Mode", "HP Impedance", - "undefined1", - "undefined2", - "undefined3", }; static int hp_in_mux_map_value[] = { @@ -648,9 +645,6 @@ static int hp_in_mux_map_value[] = { HP_MUX_HP, HP_MUX_TEST_MODE, HP_MUX_HP_IMPEDANCE, - HP_MUX_OPEN, - HP_MUX_OPEN, - HP_MUX_OPEN, }; static SOC_VALUE_ENUM_SINGLE_DECL(hpl_in_mux_map_enum,