From patchwork Fri Jul 19 10:05:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11049959 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6FFB613B1 for ; Fri, 19 Jul 2019 10:08:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D9D228832 for ; Fri, 19 Jul 2019 10:08:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 518C428852; Fri, 19 Jul 2019 10:08:09 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A104828832 for ; Fri, 19 Jul 2019 10:08:08 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E4CE816AC; Fri, 19 Jul 2019 12:07:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E4CE816AC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563530887; bh=N0galShujgH4yAInwZscxRApVHPtwba2ZCXq2q0vBoE=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=qCbYhlGdizbi/oiLjjNgb57SCi7+qaX1kqAk8DYIJiZyZXuysPD3fYELxJb1ENt// fKXlMzFx1U7Lt0aj/Y3XGkhg8d7gDf5Vt/1j+oZ/IIIjI+YzBFdJY/E780E8Xa242y xzgOIjx0rSwP9MXFBZLUvBw1J1ThIWNh9/jmy6nY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 3DA83F803D5; Fri, 19 Jul 2019 12:05:40 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9F204F803CF; Fri, 19 Jul 2019 12:05:38 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40101.outbound.protection.outlook.com [40.107.4.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E4515F8015B for ; Fri, 19 Jul 2019 12:05:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E4515F8015B Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="O99xRJnL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kid0XsvvrbUFA0wEqSmqgkmB5/zZpfqH8qLSmBt2x9NdiruTEsumGaQh2N7V4O9EANARKNXeYjxyQXuTrGyEi9iyTRbm7LDDh//2uCgxN4X4hDQiMLyfy9c5xu/xUbJZNHcY7Z4QQFq/rFjTZ6WYWGTCIuLUqWy3VCDWMQ4/Je7R6YLlynMTcT4iAM8Uvuk3ChbdkjltfZ4eGZoDwLpv2o8hlxeUiUzyJGg7l3WQlhhTVpeJ0z3seq9NXo3rHj52xpDrUxTXczG3xEmyGlEOfk4k2QKUoekVsjAkMPT3+wwW2fzcy9LHzIsOKGAVMhZFbmEET66+/iDiLmhlk59QLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ieb5Ti26ow//xiXteGDsBj+wWxgrCMJrmTZW/OEQ5us=; b=iVREeaIbWQGKF27hM3Bl7Zvqim9mo2GFGw5QfKQ1PQhc/9s8epcB0eYntQ7xZVyUfibP6LJ3xXxTjPGMAR0cBNvGp6MB7HjVeOSul46UlVloLCj2l9ZzUAgoTxvrVtgxgHPX5t/YCSr9fJN6OwDY7KHMwVVeVmFYHqJ7jH/3FKqyZwfQfC0cm4vwWbwLmf6Ui01TJ3BBFbOWxeOZuE6AkWZiHUNlNIKCQ4ky0CXcBznjQwjSjJwjIsaKbXSuTy2KpELzPJTZ+OK70mbyT1CvUbOEFLBbUb6RW7jQgadL71E0k+wD9P1k1Gy8y464EgW87cFkI+oPHI83R3nCeZfOlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=toradex.com;dmarc=pass action=none header.from=toradex.com;dkim=pass header.d=toradex.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ieb5Ti26ow//xiXteGDsBj+wWxgrCMJrmTZW/OEQ5us=; b=O99xRJnLed/FC3fua5DQZyFM+sekzTVl65lI7prQJrF8XasxCN0mlaYY4b8YXtLaHr8rcoqz3LIoqZ2h5nPFgOqVufCtIi4Zc79ankuNWDtn4PLVEdYHnPAYYaNY9/pIfz4cVGOMcfWB9jG5U+p4186CcBOK7PyMkLZzTAfWjL8= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5925.eurprd05.prod.outlook.com (20.179.0.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.14; Fri, 19 Jul 2019 10:05:30 +0000 Received: from AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9]) by AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9%6]) with mapi id 15.20.2094.011; Fri, 19 Jul 2019 10:05:30 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v6 1/6] ASoC: Define a set of DAPM pre/post-up events Thread-Index: AQHVPhl+TquGY/9OqUqqRqkRBZjHKw== Date: Fri, 19 Jul 2019 10:05:30 +0000 Message-ID: <20190719100524.23300-2-oleksandr.suvorov@toradex.com> References: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM3PR04CA0149.eurprd04.prod.outlook.com (2603:10a6:207::33) To AM6PR05MB6535.eurprd05.prod.outlook.com (2603:10a6:20b:71::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=oleksandr.suvorov@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [194.105.145.90] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3ae0a2a7-da88-44cf-bd6c-08d70c30a15a x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5925; x-ms-traffictypediagnostic: AM6PR05MB5925: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 01039C93E4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39840400004)(396003)(136003)(376002)(366004)(346002)(199004)(189003)(14454004)(68736007)(8676002)(50226002)(6486002)(8936002)(54906003)(305945005)(7736002)(71190400001)(71200400001)(6436002)(81156014)(186003)(99286004)(66476007)(66446008)(66556008)(64756008)(1411001)(81166006)(2906002)(476003)(36756003)(66946007)(446003)(256004)(6512007)(86362001)(6916009)(26005)(478600001)(66066001)(11346002)(52116002)(53936002)(486006)(76176011)(2616005)(25786009)(1076003)(6506007)(4326008)(44832011)(3846002)(6116002)(316002)(5660300002)(102836004)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5925; H:AM6PR05MB6535.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 9kKUjNCnUHcCg3f+3fK/NNt1/GYnQ03PCdXzRHrTAxGt90mocttK2Av4yRPQAt9YMGosTWfmqD18ZHboEJALVjDo3liFzPX43fGi0ZeSAxBqK9VgZ//dUWYBPRqWx2beEhGqFdBWATEIc66AqY2/eKZ6q7iJCajw7D5yv0X1Zi7eB+5gKoeiEHc3/ycBiCE7zvh2ITdliG3DBB58aNqAKCgjnRf1VtRQIfHuH93WkTH5YjY5pUsZsSPN+CGQQ+LvAzk5qQEJ4rfo1V9TieIDLUB1qSS2RCzzVC8hneULtsud+SXRgsvtswW1V6xRdwL3EBrLDTYDUAcYNi6DkVCxPZBNcN394RItGSogGKZtRbggxlDWSJRycpALz1Lq9vuzSdOF4c0IP0ND44SCVfeZ32FbduvEZrW9gTlsUbFNyFw= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ae0a2a7-da88-44cf-bd6c-08d70c30a15a X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2019 10:05:30.3035 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oleksandr.suvorov@toradex.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5925 Cc: Sasha Levin , Igor Opaniuk , "alsa-devel@alsa-project.org" , Liam Girdwood , Marcel Ziswiler , Takashi Iwai , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" , Oleksandr Suvorov , Mark Brown Subject: [alsa-devel] [PATCH v6 1/6] ASoC: Define a set of DAPM pre/post-up events X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" X-Virus-Scanned: ClamAV using ClamSMTP Prepare to use SND_SOC_DAPM_PRE_POST_PMU definition to reduce coming code size and make it more readable. Cc: stable@vger.kernel.org Signed-off-by: Oleksandr Suvorov Reviewed-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk Reviewed-by: Fabio Estevam --- Changes in v6: None Changes in v5: - Add explicit stable tag Changes in v4: - CC the patch to kernel-stable Changes in v3: None Changes in v2: - Fix patch formatting include/sound/soc-dapm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index c00a0b8ade08..6c6694160130 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -353,6 +353,8 @@ struct device; #define SND_SOC_DAPM_WILL_PMD 0x80 /* called at start of sequence */ #define SND_SOC_DAPM_PRE_POST_PMD \ (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD) +#define SND_SOC_DAPM_PRE_POST_PMU \ + (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU) /* convenience event type detection */ #define SND_SOC_DAPM_EVENT_ON(e) \ From patchwork Fri Jul 19 10:05:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11049957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54D3F912 for ; Fri, 19 Jul 2019 10:07:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E070287D1 for ; Fri, 19 Jul 2019 10:07:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3250028852; Fri, 19 Jul 2019 10:07:25 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A21C287D1 for ; Fri, 19 Jul 2019 10:07:23 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 814091693; Fri, 19 Jul 2019 12:06:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 814091693 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563530841; bh=0IAYypPGEyhym9Ma9R+gn24vHip/nAiYHMhOrup+uEk=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=tvRHFz0SDiNzbpMgdCiT0FoYocWh3vu+eDF6InQb62v8Z5qwzCDs7UNDgyYtTT9nt 4NIOpYD+wjNnjS2ZJBJENXEEVmg6gD6ZejL3DU011xPi59Relm3kLJ269eXyrYQkP3 uTd+anATQoZF9kl9X54hbpVKo1CW6ycY0KrvPCVk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 066C3F8036B; Fri, 19 Jul 2019 12:05:39 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 61E5BF803A6; Fri, 19 Jul 2019 12:05:37 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40101.outbound.protection.outlook.com [40.107.4.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3B0C8F80228 for ; Fri, 19 Jul 2019 12:05:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3B0C8F80228 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="lEO3BxLZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JbsSONzIPWGeaGpttpzW7DdUouFhEQkcIX3um/Lbf7a6ZXHQmPYVWvxTKRB5WO9d5vkVcXeqtU+N2mcrG3EfaXYyIZivb+6Z20Mk6sRJLI7+z9M3zFnvN+EyZuXJ0TZlBf5MQWJecfpNrNHbr8LxMgTtx+nMJpl9mtxPp53BYquO11toRt/QisWZqR88iH0lzWR3yUISDySJ06RPJojZJlPgJwgiBMHJ9PBlVgv+f+lSJ8ntDAdRw1Jpdefex26LYNsnZlQel2j3gJplyBM39TZSHEhS106NajzvkOsuM3UrPzB6kynlCBa4jMx89NFfBY+sBDlM7eGlNT2qSV7cBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zbIOvsp8Zk+ep5d9PUq6nhq/0bTWpLtH/2cENOQAbq0=; b=ZZHBJAPCLPCdRAE2WuiybZXWpkizuvCdc8K46aYfxQ/iFOcNlY7QLMda4L1x35CLr53pw3A5X7qPkGqPWqYD7P63owcidTuee0BdTHmrmHfRLy3PDEMORlpvRPkmJqWHv/rNbhYxN85ngmyleDGCkMZcbDTQJhUj7aBBj7ydHSIYq9B70brnoBux/F/Yn0wPLwPPhSubEOGNGxNrS3IVQmqX3jjbM2RCSroTeqLKi9pBSm686Q0Qkk6TpmRW90/ul03JlkmjVMUNmzXjKex0OBTasvvdkprxan9Wr834i6iL3W1bSa1oVkrqpw4uXnVv6eTTKX/+Q86rtbSNrxHJYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=toradex.com;dmarc=pass action=none header.from=toradex.com;dkim=pass header.d=toradex.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zbIOvsp8Zk+ep5d9PUq6nhq/0bTWpLtH/2cENOQAbq0=; b=lEO3BxLZUonW+ubS1oRQG5+UDWfeTcgr0BCoEtNrEFVnaAa4OO1n5qmEUZ/iSToKEctKefahBpqDsHgEGzUyjA77pG0uAFl2UyeMxzqvDoC0Pqfl6GiKZ1oD6zJjRcrQhvgJrYNLFWbSt1FfAr2doqtpRFPkRdJQDMMndwn7yQk= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5925.eurprd05.prod.outlook.com (20.179.0.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.14; Fri, 19 Jul 2019 10:05:31 +0000 Received: from AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9]) by AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9%6]) with mapi id 15.20.2094.011; Fri, 19 Jul 2019 10:05:31 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v6 2/6] ASoC: sgtl5000: Improve VAG power and mute control Thread-Index: AQHVPhl/oqgMGO4IF0OPLDwK8MWjOg== Date: Fri, 19 Jul 2019 10:05:31 +0000 Message-ID: <20190719100524.23300-3-oleksandr.suvorov@toradex.com> References: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR05CA0086.eurprd05.prod.outlook.com (2603:10a6:208:136::26) To AM6PR05MB6535.eurprd05.prod.outlook.com (2603:10a6:20b:71::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=oleksandr.suvorov@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [194.105.145.90] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2ef90149-7b25-4d9d-043e-08d70c30a238 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5925; x-ms-traffictypediagnostic: AM6PR05MB5925: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:248; x-forefront-prvs: 01039C93E4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(4636009)(39840400004)(396003)(136003)(376002)(366004)(346002)(199004)(189003)(14454004)(68736007)(8676002)(50226002)(6486002)(8936002)(54906003)(305945005)(7736002)(71190400001)(71200400001)(6436002)(7416002)(81156014)(186003)(99286004)(66476007)(66446008)(66556008)(64756008)(1411001)(81166006)(2906002)(6306002)(476003)(36756003)(66946007)(446003)(14444005)(256004)(6512007)(86362001)(6916009)(26005)(966005)(478600001)(66066001)(11346002)(52116002)(53936002)(486006)(76176011)(2616005)(25786009)(1076003)(6506007)(4326008)(44832011)(3846002)(6116002)(316002)(30864003)(5660300002)(102836004)(386003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5925; H:AM6PR05MB6535.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Dw2GxZ4PcRj+SIIQzcQOzcFVce0rKMgYJhYDWwFGrPg9iHyi1WkthKeHZ/hKTCr48c88w/CD/8dUqa2OBfulC9ZU81Zvd61GRDr46lsoy3wQizx6zvmHFyPo4TwTUTEWbWshz5DCovmRxHwDX+QFZFPHnkms2/HEAS1DcNeFpf0dJooVnIB1FRrICNcUjFOKf5bnHwJRYer2ZytPM6pWXYAfWA8roLQUWwthASm9wDHH7zk+ImpM71jWC4YZMBBCUgF1z9IasQOZKjvfWUybLHoO+9kpyE3WAnR4NC+5Spgtop99BUZgzDOPztuxNw1F7Sbto18qnHIoJpuCSdCinZU+wA43Mov7R7pq5XqafysL3pe2Oc7PI+TukXNcEgYKwOQLh7SuQy529aBGH1ybnEmi4lFd9+wSNVh8Xq8P9cU= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ef90149-7b25-4d9d-043e-08d70c30a238 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2019 10:05:31.7407 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oleksandr.suvorov@toradex.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5925 Cc: Sasha Levin , Igor Opaniuk , "alsa-devel@alsa-project.org" , Liam Girdwood , Marcel Ziswiler , Cezary Rojewski , Takashi Iwai , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" , Oleksandr Suvorov , Mark Brown Subject: [alsa-devel] [PATCH v6 2/6] ASoC: sgtl5000: Improve VAG power and mute control X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" X-Virus-Scanned: ClamAV using ClamSMTP VAG power control is improved to fit the manual [1]. This patch fixes as minimum one bug: if customer muxes Headphone to Line-In right after boot, the VAG power remains off that leads to poor sound quality from line-in. I.e. after boot: - Connect sound source to Line-In jack; - Connect headphone to HP jack; - Run following commands: $ amixer set 'Headphone' 80% $ amixer set 'Headphone Mux' LINE_IN Change VAG power on/off control according to the following algorithm: - turn VAG power ON on the 1st incoming event. - keep it ON if there is any active VAG consumer (ADC/DAC/HP/Line-In). - turn VAG power OFF when there is the latest consumer's pre-down event come. - always delay after VAG power OFF to avoid pop. - delay after VAG power ON if the initiative consumer is Line-In, this prevents pop during line-in muxing. According to the data sheet [1], to avoid any pops/clicks, the outputs should be muted during input/output routing changes. [1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf Cc: stable@vger.kernel.org Fixes: 9b34e6cc3bc2 ("ASoC: Add Freescale SGTL5000 codec support") Signed-off-by: Oleksandr Suvorov Reviewed-by: Marcel Ziswiler Reviewed-by: Fabio Estevam Reviewed-by: Cezary Rojewski --- Changes in v6: - Code optimization Changes in v5: - Improve commit message - Add explicit stable tag Changes in v4: - Code optimization, simplify function signature (thanks to Cezary Rojewski for an idea) - CC the patch to kernel-stable - Add a Fixes tag Changes in v3: - Add the reference to NXP SGTL5000 data sheet to commit message Changes in v2: - Fix patch formatting sound/soc/codecs/sgtl5000.c | 226 +++++++++++++++++++++++++++++++----- 1 file changed, 195 insertions(+), 31 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index a6a4748c97f9..34cc85e49003 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -31,6 +31,13 @@ #define SGTL5000_DAP_REG_OFFSET 0x0100 #define SGTL5000_MAX_REG_OFFSET 0x013A +/* Delay for the VAG ramp up */ +#define SGTL5000_VAG_POWERUP_DELAY 500 /* ms */ +/* Delay for the VAG ramp down */ +#define SGTL5000_VAG_POWERDOWN_DELAY 500 /* ms */ + +#define SGTL5000_OUTPUTS_MUTE (SGTL5000_HP_MUTE | SGTL5000_LINE_OUT_MUTE) + /* default value of sgtl5000 registers */ static const struct reg_default sgtl5000_reg_defaults[] = { { SGTL5000_CHIP_DIG_POWER, 0x0000 }, @@ -123,6 +130,13 @@ enum { I2S_SCLK_STRENGTH_HIGH, }; +enum { + HP_POWER_EVENT, + DAC_POWER_EVENT, + ADC_POWER_EVENT, + LAST_POWER_EVENT = ADC_POWER_EVENT +}; + /* sgtl5000 private structure in codec */ struct sgtl5000_priv { int sysclk; /* sysclk rate */ @@ -137,8 +151,109 @@ struct sgtl5000_priv { u8 micbias_voltage; u8 lrclk_strength; u8 sclk_strength; + u16 mute_state[LAST_POWER_EVENT + 1]; }; +static inline int hp_sel_input(struct snd_soc_component *component) +{ + return (snd_soc_component_read32(component, SGTL5000_CHIP_ANA_CTRL) & + SGTL5000_HP_SEL_MASK) >> SGTL5000_HP_SEL_SHIFT; +} + +static inline u16 mute_output(struct snd_soc_component *component, + u16 mute_mask) +{ + u16 mute_reg = snd_soc_component_read32(component, + SGTL5000_CHIP_ANA_CTRL); + + snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_CTRL, + mute_mask, mute_mask); + return mute_reg; +} + +static inline void restore_output(struct snd_soc_component *component, + u16 mute_mask, u16 mute_reg) +{ + snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_CTRL, + mute_mask, mute_reg); +} + +static void vag_power_on(struct snd_soc_component *component, u32 source) +{ + if (snd_soc_component_read32(component, SGTL5000_CHIP_ANA_POWER) & + SGTL5000_VAG_POWERUP) + return; + + snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER, + SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP); + + /* When VAG powering on to get local loop from Line-In, the sleep + * is required to avoid loud pop. + */ + if (hp_sel_input(component) == SGTL5000_HP_SEL_LINE_IN && + source == HP_POWER_EVENT) + msleep(SGTL5000_VAG_POWERUP_DELAY); +} + +static int vag_power_consumers(struct snd_soc_component *component, + u16 ana_pwr_reg, u32 source) +{ + int consumers = 0; + + /* count dac/adc consumers unconditional */ + if (ana_pwr_reg & SGTL5000_DAC_POWERUP) + consumers++; + if (ana_pwr_reg & SGTL5000_ADC_POWERUP) + consumers++; + + /* + * If the event comes from HP and Line-In is selected, + * current action is 'DAC to be powered down'. + * As HP_POWERUP is not set when HP muxed to line-in, + * we need to keep VAG power ON. + */ + if (source == HP_POWER_EVENT) { + if (hp_sel_input(component) == SGTL5000_HP_SEL_LINE_IN) + consumers++; + } else { + if (ana_pwr_reg & SGTL5000_HP_POWERUP) + consumers++; + } + + return consumers; +} + +static void vag_power_off(struct snd_soc_component *component, u32 source) +{ + u16 ana_pwr = snd_soc_component_read32(component, + SGTL5000_CHIP_ANA_POWER); + + if (!(ana_pwr & SGTL5000_VAG_POWERUP)) + return; + + /* + * This function calls when any of VAG power consumers is disappearing. + * Thus, if there is more than one consumer at the moment, as minimum + * one consumer will definitely stay after the end of the current + * event. + * Don't clear VAG_POWERUP if 2 or more consumers of VAG present: + * - LINE_IN (for HP events) / HP (for DAC/ADC events) + * - DAC + * - ADC + * (the current consumer is disappearing right now) + */ + if (vag_power_consumers(component, ana_pwr, source) >= 2) + return; + + snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER, + SGTL5000_VAG_POWERUP, 0); + /* In power down case, we need wait 400-1000 ms + * when VAG fully ramped down. + * As longer we wait, as smaller pop we've got. + */ + msleep(SGTL5000_VAG_POWERDOWN_DELAY); +} + /* * mic_bias power on/off share the same register bits with * output impedance of mic bias, when power on mic bias, we @@ -170,36 +285,46 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w, return 0; } -/* - * As manual described, ADC/DAC only works when VAG powerup, - * So enabled VAG before ADC/DAC up. - * In power down case, we need wait 400ms when vag fully ramped down. - */ -static int power_vag_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) +static int vag_and_mute_control(struct snd_soc_component *component, + int event, int event_source) { - struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); - const u32 mask = SGTL5000_DAC_POWERUP | SGTL5000_ADC_POWERUP; + static const u16 mute_mask[] = { + /* + * Mask for HP_POWER_EVENT. + * Muxing Headphones have to be wrapped with mute/unmute + * headphones only. + */ + SGTL5000_HP_MUTE, + /* + * Masks for DAC_POWER_EVENT/ADC_POWER_EVENT. + * Muxing DAC or ADC block have to wrapped with mute/unmute + * both headphones and line-out. + */ + SGTL5000_OUTPUTS_MUTE, + SGTL5000_OUTPUTS_MUTE + }; + + struct sgtl5000_priv *sgtl5000 = + snd_soc_component_get_drvdata(component); switch (event) { - case SND_SOC_DAPM_POST_PMU: - snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER, - SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP); - msleep(400); + case SND_SOC_DAPM_PRE_PMU: + sgtl5000->mute_state[event_source] = + mute_output(component, mute_mask[event_source]); + break; + case SND_SOC_DAPM_POST_PMU: + vag_power_on(component, event_source); + restore_output(component, mute_mask[event_source], + sgtl5000->mute_state[event_source]); break; - case SND_SOC_DAPM_PRE_PMD: - /* - * Don't clear VAG_POWERUP, when both DAC and ADC are - * operational to prevent inadvertently starving the - * other one of them. - */ - if ((snd_soc_component_read32(component, SGTL5000_CHIP_ANA_POWER) & - mask) != mask) { - snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER, - SGTL5000_VAG_POWERUP, 0); - msleep(400); - } + sgtl5000->mute_state[event_source] = + mute_output(component, mute_mask[event_source]); + vag_power_off(component, event_source); + break; + case SND_SOC_DAPM_POST_PMD: + restore_output(component, mute_mask[event_source], + sgtl5000->mute_state[event_source]); break; default: break; @@ -208,6 +333,41 @@ static int power_vag_event(struct snd_soc_dapm_widget *w, return 0; } +/* + * Mute Headphone when power it up/down. + * Control VAG power on HP power path. + */ +static int headphone_pga_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + + return vag_and_mute_control(component, event, HP_POWER_EVENT); +} + +/* As manual describes, ADC/DAC powering up/down requires + * to mute outputs to avoid pops. + * Control VAG power on ADC/DAC power path. + */ +static int adc_updown_depop(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + + return vag_and_mute_control(component, event, ADC_POWER_EVENT); +} + +static int dac_updown_depop(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + + return vag_and_mute_control(component, event, DAC_POWER_EVENT); +} + /* input sources for ADC */ static const char *adc_mux_text[] = { "MIC_IN", "LINE_IN" @@ -280,7 +440,10 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { mic_bias_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), - SND_SOC_DAPM_PGA("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0), + SND_SOC_DAPM_PGA_E("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0, + headphone_pga_event, + SND_SOC_DAPM_PRE_POST_PMU | + SND_SOC_DAPM_PRE_POST_PMD), SND_SOC_DAPM_PGA("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0), SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux), @@ -301,11 +464,12 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { 0, SGTL5000_CHIP_DIG_POWER, 1, 0), - SND_SOC_DAPM_ADC("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0), - SND_SOC_DAPM_DAC("DAC", "Playback", SGTL5000_CHIP_ANA_POWER, 3, 0), - - SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), - SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), + SND_SOC_DAPM_ADC_E("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0, + adc_updown_depop, SND_SOC_DAPM_PRE_POST_PMU | + SND_SOC_DAPM_PRE_POST_PMD), + SND_SOC_DAPM_DAC_E("DAC", "Playback", SGTL5000_CHIP_ANA_POWER, 3, 0, + dac_updown_depop, SND_SOC_DAPM_PRE_POST_PMU | + SND_SOC_DAPM_PRE_POST_PMD), }; /* routes for sgtl5000 */ From patchwork Fri Jul 19 10:05:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11049961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C0FF4912 for ; Fri, 19 Jul 2019 10:08:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF53228832 for ; Fri, 19 Jul 2019 10:08:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A2F2528852; Fri, 19 Jul 2019 10:08:55 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E6C8628832 for ; Fri, 19 Jul 2019 10:08:54 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2640516A0; Fri, 19 Jul 2019 12:08:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2640516A0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563530933; bh=0oufZGrI/Ud1wv4UYhmxA4F0tmGj463p7oA0sJbc7Ig=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=FagUQZw2O2/LpEwROB+9FAWt7K3ib+B/06mJrQ2e81vzQUAqSsvHa2pFuVm5838md Rz+EWq/GeFn/KbHtTobXeJZphD9RsVWgRk4JKFVox3itGBzUDoEua9OY9gkNv3ZU0e nO4ZKG2s7Bf6N263zBWQhj2nM9qGkxPw5Sd3xWuA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EDEEBF803F4; Fri, 19 Jul 2019 12:05:41 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id AD99DF80228; Fri, 19 Jul 2019 12:05:38 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40101.outbound.protection.outlook.com [40.107.4.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 7EDACF8036B for ; Fri, 19 Jul 2019 12:05:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7EDACF8036B Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="e8WP6alf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CZTkTnj5nNx1EsfZ/uQOq3+oBaCulmKXNxpHqg+WeWtDWKO6NOa3p3PIFtEs3J+ScUvAqfMMQAf6h3UK4F4z4z22z7sobBQoNy3ejv3kAFm6hr7xC3pUOako2VYzLMbrR2hy4fbbKanJyuXfkGst/VqHt856+0cHXV9Qtq696OFZ96QgMD/LViT6xPK0+uCQoiTLJ5YXdGJJXQl5KM/NEAWZVH5+4fyYrfoqeUcpPtEM3gR0hgYvvDXH4WIvUjnpxBsaJGP47yqZbk8HS9+XB4A+kR/wOMVUukGUBozDqW7ztMfJiFn3+KWKH4M91A5bA8MSNKBb8X5FX7ZmNHRGTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oJr6doRZWrVJKhh0YOf32RxCPdpRYy1yhrs/Mfctc1E=; b=Xns1zNmtgGivqkJEHrt3caD0T1kx81ZFxTHzIFH1t0kdcmK6O4Cbdoij86vgio7P2yG6W4xTLC1x/iH0oRlovgkO0mKe5ZTBTutNf3Mz3Kzdf/FV0P4BT1g6KF69RMCUCHL5aw1+0vt6hhCeDEi5Y2UXRYl48AwWVkV/O4/37KWY7uDMIrbGEO/W4pgyVI4r9h3CuX80SF//HO2ZJaa7Jq4kJtLBv9NzWCt560nc+CR5Zc+/o81QzIS+c6zAl7FNhsHsvsHIRZxHP4Bw2PYd/RdyyCpB989/7NcZLDQhO2/UQdO8OuyW7dds+QuSa5Ngzcovnb/2Y/aAmW4pjOBtfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=toradex.com;dmarc=pass action=none header.from=toradex.com;dkim=pass header.d=toradex.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oJr6doRZWrVJKhh0YOf32RxCPdpRYy1yhrs/Mfctc1E=; b=e8WP6alfiA3KRR0b+eFuHHJ+ND5VrFpN8EdE3JWMl5kikUc3FLVnrrna2HdXCpFTD8iHgEOWJzQnR6Lh40h+rUEm4Sf/Nwnl98xdCdO41YG/gqcEfjLpdO2h6iYEShpCbg277QeWismqy7Arc2aExTVOUiIECeUdfmu/4aKmoKM= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5925.eurprd05.prod.outlook.com (20.179.0.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.14; Fri, 19 Jul 2019 10:05:33 +0000 Received: from AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9]) by AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9%6]) with mapi id 15.20.2094.011; Fri, 19 Jul 2019 10:05:33 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v6 3/6] ASoC: sgtl5000: Fix definition of VAG Ramp Control Thread-Index: AQHVPhmAZZGJS53Ju0OkpFrsxpcqKQ== Date: Fri, 19 Jul 2019 10:05:33 +0000 Message-ID: <20190719100524.23300-4-oleksandr.suvorov@toradex.com> References: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM4PR07CA0013.eurprd07.prod.outlook.com (2603:10a6:205:1::26) To AM6PR05MB6535.eurprd05.prod.outlook.com (2603:10a6:20b:71::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=oleksandr.suvorov@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [194.105.145.90] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7c4f3208-1d31-4a98-0c45-08d70c30a331 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5925; x-ms-traffictypediagnostic: AM6PR05MB5925: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2657; x-forefront-prvs: 01039C93E4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39840400004)(396003)(136003)(376002)(366004)(346002)(199004)(189003)(14454004)(68736007)(8676002)(50226002)(6486002)(8936002)(54906003)(305945005)(7736002)(71190400001)(71200400001)(6436002)(81156014)(186003)(99286004)(66476007)(66446008)(66556008)(64756008)(1411001)(81166006)(2906002)(476003)(36756003)(66946007)(446003)(14444005)(256004)(6512007)(86362001)(6916009)(26005)(478600001)(66066001)(11346002)(52116002)(53936002)(486006)(76176011)(2616005)(25786009)(1076003)(6506007)(4326008)(44832011)(3846002)(6116002)(316002)(5660300002)(102836004)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5925; H:AM6PR05MB6535.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: tvOaZXROgaj7xu10qufxXL7rmh4O/jmmMAa06oVHw6mLMjUiKdsM4LEQCSRrHw261JMTnBjrtZRCiKVoE9w5hnv1pMG57I4DDuFEfDCQFs2zfdgDbIZz3xNhdSf/IGS2xl464s8slGJDozxZFanr0kh5Cx9d5W+z50SEvJ1VYmgl+sMiduu+hgG7xziJH+M0Kng0AavVo8h4Do9vQLMhGAIG4PFiZldUX9TSZKf4YeWtrXAKrix+ZcMhURhIslibgZRGBATPJcqOgkkbb0BcJrmImJl/ZkVzR2WwllXjZmu4LkbZIyBHX4ZzHUXD77vuOEJgRuV20NSq5HqUYNl0Q1O4A1oSqT7wz4q+/LPmqlQxRVASJJHTfki7dDLYaI0wVAAC0gTOL4mCoQH8hq7UiWfCoa4myqHPcGk+KNVOzcM= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c4f3208-1d31-4a98-0c45-08d70c30a331 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2019 10:05:33.3557 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oleksandr.suvorov@toradex.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5925 Cc: Igor Opaniuk , "alsa-devel@alsa-project.org" , Liam Girdwood , Marcel Ziswiler , Takashi Iwai , "linux-kernel@vger.kernel.org" , Oleksandr Suvorov , Mark Brown Subject: [alsa-devel] [PATCH v6 3/6] ASoC: sgtl5000: Fix definition of VAG Ramp Control X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" X-Virus-Scanned: ClamAV using ClamSMTP SGTL5000_SMALL_POP is a bit mask, not a value. Usage of correct definition makes device probing code more clear. Signed-off-by: Oleksandr Suvorov Reviewed-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk Reviewed-by: Fabio Estevam --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: - Fix patch formatting sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sgtl5000.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 34cc85e49003..3f28e7862b5b 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1460,7 +1460,7 @@ static int sgtl5000_probe(struct snd_soc_component *component) /* enable small pop, introduce 400ms delay in turning off */ snd_soc_component_update_bits(component, SGTL5000_CHIP_REF_CTRL, - SGTL5000_SMALL_POP, 1); + SGTL5000_SMALL_POP, SGTL5000_SMALL_POP); /* disable short cut detector */ snd_soc_component_write(component, SGTL5000_CHIP_SHORT_CTRL, 0); diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h index 18cae08bbd3a..a4bf4bca95bf 100644 --- a/sound/soc/codecs/sgtl5000.h +++ b/sound/soc/codecs/sgtl5000.h @@ -273,7 +273,7 @@ #define SGTL5000_BIAS_CTRL_MASK 0x000e #define SGTL5000_BIAS_CTRL_SHIFT 1 #define SGTL5000_BIAS_CTRL_WIDTH 3 -#define SGTL5000_SMALL_POP 1 +#define SGTL5000_SMALL_POP 0x0001 /* * SGTL5000_CHIP_MIC_CTRL From patchwork Fri Jul 19 10:05:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11049963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A648A13B1 for ; Fri, 19 Jul 2019 10:09:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9228C28832 for ; Fri, 19 Jul 2019 10:09:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 826B528852; Fri, 19 Jul 2019 10:09:42 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C774E28832 for ; Fri, 19 Jul 2019 10:09:41 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 244791695; Fri, 19 Jul 2019 12:08:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 244791695 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563530980; bh=GtHznw1+LfLKZBRz1BKRL8DCGd4Ec4B0X8YZqMPePPs=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=lAD5lsp9Oy2Mz7KDNEkjoHtSf3lQ/NOhB2AvBuIsuUgLaicU+8DfC3W/ndjH2VdwX bv5NMM8jOK5/0BBhI2i4sW5MEmINgThrSsxxVkZiBtgi4tkL1e69TsbbNNsbXZTzD1 OsT3b5uxd2HvcinBAtuR2QADYVj0UPK+l1rxTAZw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E75C3F8044A; Fri, 19 Jul 2019 12:05:43 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2683EF803D6; Fri, 19 Jul 2019 12:05:40 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40101.outbound.protection.outlook.com [40.107.4.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C61E7F80369 for ; Fri, 19 Jul 2019 12:05:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C61E7F80369 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="J/sRy4uC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F5UgrP1u/MqJ7gpV1x4YF9bApi9AIFIG/e62ykFGdrlxrA8HtonBfHwTMP/awd51ivqnnEFKwv/JR6Ow0JkTfbPByY80gIbBr+cxEDJNtnRLY+rYImXhxQ1MPRR3VL/eINShn155PLFqWFxF9Mnm/GuJF8gN+VUWBoaEwg1Wi4BHWx8tt2e/KpuBG44x5ot4o3AIsdQNMZhvRkOKzJN+LpBYsmqnMkcBF3UgJ0uJ3QXcmQ41JbdHbwW4jgH4zxocY3kOmGWZzhO94oNPa6aqYQP23XAL6KOHqSE+iJJUdTYOcxDDHUck5o8etPr2IEGk4PO+cWdqCAwL7CB81gfuXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8ne9/66fzNnqSrx7C88pPEdCm0f/kRbSaQoxLFDwHnY=; b=NKOh129T3mh0QizRbbYSMaOZ/vy4bra3NC5ImkoKUmZoWeZ9fPwTipK7FLey/n56MkOJSDRaQVA5F+ubHAeAkOn8OuezuVT4hpUwJNhLe4E2GdCRG53b7WoxF62pX2qdBt16zUV4lqNiVTi7pwROIqS3IUuNNt58q1ixVx+F18bX2+IM5oIwIkbhghKfpRhds5b4Gq0pzakfV2BQGBl+S8mA/JoJPNdg7P5GCaT41iE99EXQ/GqnXfA1zyL7g1eUPA5E47dI4JmyPTPaMT7ZHgpdpfwh5BLnEBu1LNT2mayt4CPyDiwOZzJ7+wznYTaCj0lwKGeSieIWDJfKwZaw+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=toradex.com;dmarc=pass action=none header.from=toradex.com;dkim=pass header.d=toradex.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8ne9/66fzNnqSrx7C88pPEdCm0f/kRbSaQoxLFDwHnY=; b=J/sRy4uC6bJr+F668hNnBTFcNSvjDsG85p1ZoDxAQcXabJZrF725f4m9vQp2R5F+bH0I0pILpyLF+8fIX2bhZzPNaWTmpDnBjDIth1Z406sn69BZpHQKS8r8f+sr8PdgFH5mK4/gFW8LTRVZBobtCPrFbCp+qSMiG1RqO2eeCec= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5925.eurprd05.prod.outlook.com (20.179.0.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.14; Fri, 19 Jul 2019 10:05:34 +0000 Received: from AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9]) by AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9%6]) with mapi id 15.20.2094.011; Fri, 19 Jul 2019 10:05:34 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v6 4/6] ASoC: sgtl5000: add ADC mute control Thread-Index: AQHVPhmB+ZcOy3sA7kOKlGoQrxM/0g== Date: Fri, 19 Jul 2019 10:05:34 +0000 Message-ID: <20190719100524.23300-5-oleksandr.suvorov@toradex.com> References: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR05CA0093.eurprd05.prod.outlook.com (2603:10a6:208:136::33) To AM6PR05MB6535.eurprd05.prod.outlook.com (2603:10a6:20b:71::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=oleksandr.suvorov@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [194.105.145.90] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6181830d-fc35-4aab-b83a-08d70c30a3fb x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5925; x-ms-traffictypediagnostic: AM6PR05MB5925: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3044; x-forefront-prvs: 01039C93E4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39840400004)(396003)(136003)(376002)(366004)(346002)(199004)(189003)(14454004)(68736007)(8676002)(50226002)(6486002)(8936002)(54906003)(305945005)(7736002)(71190400001)(71200400001)(6436002)(81156014)(186003)(99286004)(66476007)(66446008)(66556008)(64756008)(1411001)(81166006)(2906002)(476003)(36756003)(66946007)(446003)(256004)(6512007)(86362001)(6916009)(26005)(478600001)(66066001)(11346002)(52116002)(53936002)(486006)(76176011)(2616005)(25786009)(1076003)(6506007)(4326008)(44832011)(3846002)(6116002)(316002)(4744005)(5660300002)(102836004)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5925; H:AM6PR05MB6535.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: TbbxHtuFyzW1mB0UnLBRshDWJuuDCC9i6G1VYjI8Utvyp6LLAcb7ctQRbRAh5P6+HeqzMhdM7aLjS0s74bBOysJ+yuuWQG6aAmz/wzqhOjxoIumJQFran1gcepKzJfcTm0FxtvrB6xMZ/T035CbCyiG1LBK+I/HQrUejshsUja7xzkmvhA6BLqN/GPns3pgkTRlU4DtisnA8TOoLKx5AMLjUFJoSd6DM1tFs6lJyXtlc/ZapRwolZf+lOhtWeFo60xOPeV/VNGUfYlaI+1ZXnCgqGUu7aIx7IzG4PjuSLSICNwGhtiF7yqlt+/iVOXtH00VJ7yoAuMQStlq9cK1gz/kC8XuMss5SuQZwuJyg6f8CmkCx06zTmTqJgnnSe88PnzL18p2RZnk41MXljrEFgxp5JePT4HXdE5ZTIPQsf9M= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6181830d-fc35-4aab-b83a-08d70c30a3fb X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2019 10:05:34.6840 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oleksandr.suvorov@toradex.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5925 Cc: Igor Opaniuk , "alsa-devel@alsa-project.org" , Liam Girdwood , Marcel Ziswiler , Takashi Iwai , "linux-kernel@vger.kernel.org" , Oleksandr Suvorov , Mark Brown Subject: [alsa-devel] [PATCH v6 4/6] ASoC: sgtl5000: add ADC mute control X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" X-Virus-Scanned: ClamAV using ClamSMTP This control mute/unmute the ADC input of SGTL5000 using its CHIP_ANA_CTRL register. Signed-off-by: Oleksandr Suvorov Reviewed-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk Reviewed-by: Fabio Estevam --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: - Fix patch formatting sound/soc/codecs/sgtl5000.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 3f28e7862b5b..b65232521ea8 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -720,6 +720,7 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = { SGTL5000_CHIP_ANA_ADC_CTRL, 8, 1, 0, capture_6db_attenuate), SOC_SINGLE("Capture ZC Switch", SGTL5000_CHIP_ANA_CTRL, 1, 1, 0), + SOC_SINGLE("Capture Switch", SGTL5000_CHIP_ANA_CTRL, 0, 1, 1), SOC_DOUBLE_TLV("Headphone Playback Volume", SGTL5000_CHIP_ANA_HP_CTRL, From patchwork Fri Jul 19 10:05:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11049965 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C549912 for ; Fri, 19 Jul 2019 10:10:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 154EB28867 for ; Fri, 19 Jul 2019 10:10:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0391028832; Fri, 19 Jul 2019 10:10:10 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4737328832 for ; Fri, 19 Jul 2019 10:10:10 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9A615165F; Fri, 19 Jul 2019 12:09:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9A615165F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563531008; bh=4j01L5RwRcZVGiLMeTziHEW5QRkCsieV2PswmQIZ97M=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=VpXtJISOiI038rCj2QRkTzSfuLbFLYlsVwU76V6Hi70xXQER7vwCI9GNikzsBLHoM 5+w3hmK5RaTDf5mvtq4EF2mUYYUXAVbrXe5tqbPzB854BEpCtx1XUBfZyuLPsIkGSh gdozvoWmR9VnW1P+MPZ+iGAyCyZiffMmneCkLnDE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 31EFDF80483; Fri, 19 Jul 2019 12:05:45 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id A1AB0F80440; Fri, 19 Jul 2019 12:05:40 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40101.outbound.protection.outlook.com [40.107.4.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 13BDDF803D0 for ; Fri, 19 Jul 2019 12:05:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 13BDDF803D0 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="XzryjYEu" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CZZb5ntHBuxbcrDbFqQrWPXZ+2WcQPXQB7s3SlbvHzt8/Mug+f9wa98yYOoQY+gJjhAez0RUrG5p3WzP/Fu1o2QIxuJoIZnxNsSVhaRq7W/iVZU2ix6iO2viJs4ET11wyRi3p1I2YvQQBMM/2OOwJVcAo7CBPKnozJfWyNCUIoDGpR6bGHtYHI/AKx3GYiv8zAQyKjNGT+xRsq8Dc0ndqBmSI+h4KMri/GzWSBzNFFu9OyE7LrAgLNd5Vz1xqiuWu4ly+5MD7JCkHL/6fcYgXgXbWatDaDATXcdlXejVFx3QwSaIU7yDk61ttP5eeuPbV65iLuUBhgifpdwTjQW99A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PTq697b8pNY7VmSbc1Y0KPdxRSinFvfyYF/Yw8olZyc=; b=AE3jrfMi/5TsVYQ/f/BZIcerjnw7ySlFZIPdb7PWLwW0PU1/Ayxzl3gY+2H71ceZfBO1MwAV6M1fV8zo31JdDDhAr60pSo5Rz2+pai2ZpaMsF64XYDnBrPyAPNRdOLJt8BJGnQe2PppE3Lup4tdNVBrYfhhTpOeYMfyN6qvd2LNDfOGrmaRpgdkPBlLJb4Jzjx71L36CU6ilnSTqc8M/huebs0C2gu/YilneeE/IfUlhmquULAnPJI9KYqMwuJNQh8VXRBFtzrdIWStVp65mGLIVp7mhJVvPX1oNenodNWgyQrmvcLxYf9zYlIVooiqdAS7yGJKRa6zmCbbDYZCNTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=toradex.com;dmarc=pass action=none header.from=toradex.com;dkim=pass header.d=toradex.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PTq697b8pNY7VmSbc1Y0KPdxRSinFvfyYF/Yw8olZyc=; b=XzryjYEuK0NQf8ddJkax1js6gog/om9qn4lI1X6/ADDvQxMxiMuZUEMPu/ClzJ5QFTEaIRPXitT43hWx+2CbyS07YP689nR+e8JCo85n87YVAzieFXb6LaESHDz786+eh7wAFYGIkNdEzr42RJVUX/wpWsOGu0vfGnnF+CrWIS4= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5925.eurprd05.prod.outlook.com (20.179.0.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.14; Fri, 19 Jul 2019 10:05:36 +0000 Received: from AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9]) by AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9%6]) with mapi id 15.20.2094.011; Fri, 19 Jul 2019 10:05:36 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v6 5/6] ASoC: sgtl5000: Fix of unmute outputs on probe Thread-Index: AQHVPhmCYUymm5JNk0a5eEu3cWiMyg== Date: Fri, 19 Jul 2019 10:05:35 +0000 Message-ID: <20190719100524.23300-6-oleksandr.suvorov@toradex.com> References: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM4PR07CA0001.eurprd07.prod.outlook.com (2603:10a6:205:1::14) To AM6PR05MB6535.eurprd05.prod.outlook.com (2603:10a6:20b:71::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=oleksandr.suvorov@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [194.105.145.90] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ad4ff82d-0965-4e76-b23c-08d70c30a4c6 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5925; x-ms-traffictypediagnostic: AM6PR05MB5925: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3044; x-forefront-prvs: 01039C93E4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39840400004)(396003)(136003)(376002)(366004)(346002)(199004)(189003)(14454004)(68736007)(8676002)(50226002)(6486002)(8936002)(54906003)(305945005)(7736002)(71190400001)(71200400001)(6436002)(81156014)(186003)(99286004)(66476007)(66446008)(66556008)(64756008)(1411001)(81166006)(2906002)(476003)(36756003)(66946007)(446003)(14444005)(256004)(6512007)(86362001)(6916009)(26005)(478600001)(66066001)(11346002)(52116002)(53936002)(486006)(76176011)(2616005)(25786009)(1076003)(6506007)(4326008)(44832011)(3846002)(6116002)(316002)(5660300002)(102836004)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5925; H:AM6PR05MB6535.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Dv0083ngfx9lnpMcs/jYYvqTtsTV+KhRWfrJfvkRcTUSw7UdXZFTO1Q6SKO3rCJkRb/c4JXMBvbRrYWGxA7wfjwafgTJiLL6bic5DzCsbEVMSgIEPCfCw7mr7ImP+tkM740Y9PD9rsoCYCBdK7YdD2WxHNhiF9Ynb4ka1R/5ghT13MX+CJMMYcynCLAOqhp0bBd1ofLWe6zfyuFf0SOU2cMgYOdTrBcdkuEj2CyODn18jXeQzoAYmZrLqW7YKa2EFz0n5u9SrOaU9LlxKzjQivv92rC8cgbv1hMooheDJdZNWy0d6azGSUqt60QIGXACowOelOed1IhbTRlpQVuF5FNu0mr0ifX0x4vNJW3BepFqgKqiLsrun6yuF3nLwgv76aE2JlfLIPqVpDUFf5EQGYoDnwRwGNwPmyD20z+F2NY= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad4ff82d-0965-4e76-b23c-08d70c30a4c6 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2019 10:05:35.9852 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oleksandr.suvorov@toradex.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5925 Cc: Igor Opaniuk , "alsa-devel@alsa-project.org" , Liam Girdwood , Marcel Ziswiler , Takashi Iwai , "linux-kernel@vger.kernel.org" , Oleksandr Suvorov , Mark Brown Subject: [alsa-devel] [PATCH v6 5/6] ASoC: sgtl5000: Fix of unmute outputs on probe X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" X-Virus-Scanned: ClamAV using ClamSMTP To enable "zero cross detect" for ADC/HP, change HP_ZCD_EN/ADC_ZCD_EN bits only instead of writing the whole CHIP_ANA_CTRL register. Signed-off-by: Oleksandr Suvorov Reviewed-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk Reviewed-by: Fabio Estevam --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: - Fix patch formatting sound/soc/codecs/sgtl5000.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index b65232521ea8..23f4ae2f0723 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1453,6 +1453,7 @@ static int sgtl5000_probe(struct snd_soc_component *component) int ret; u16 reg; struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component); + unsigned int zcd_mask = SGTL5000_HP_ZCD_EN | SGTL5000_ADC_ZCD_EN; /* power up sgtl5000 */ ret = sgtl5000_set_power_regs(component); @@ -1480,9 +1481,8 @@ static int sgtl5000_probe(struct snd_soc_component *component) 0x1f); snd_soc_component_write(component, SGTL5000_CHIP_PAD_STRENGTH, reg); - snd_soc_component_write(component, SGTL5000_CHIP_ANA_CTRL, - SGTL5000_HP_ZCD_EN | - SGTL5000_ADC_ZCD_EN); + snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_CTRL, + zcd_mask, zcd_mask); snd_soc_component_update_bits(component, SGTL5000_CHIP_MIC_CTRL, SGTL5000_BIAS_R_MASK, From patchwork Fri Jul 19 10:05:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11049973 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C792D912 for ; Fri, 19 Jul 2019 10:10:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B496227CEE for ; Fri, 19 Jul 2019 10:10:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3E53285EC; Fri, 19 Jul 2019 10:10:49 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EDCE227CEE for ; Fri, 19 Jul 2019 10:10:48 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 517AD16B9; Fri, 19 Jul 2019 12:09:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 517AD16B9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563531047; bh=bvw1cY/O8mDoeX9dFtSYQF7YJknuLBrasdhW7ULycFk=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=mrppDGeTI7IiNwD9xl9ved41pPfY4AU0CW4XwedSjGTytqnDYm1TI+f89r8vF0BvF Li+8GyjX680O9pgN2MoACACZd61j4GbJvRiuSIiE8sqjD7OEoStjXv9qleKn/JIYpp 58w4PlWlw68VaALB8rX1ApmInJA/ScaSePRbxkHs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 34852F8049B; Fri, 19 Jul 2019 12:05:46 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8D089F80446; Fri, 19 Jul 2019 12:05:42 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40101.outbound.protection.outlook.com [40.107.4.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 51EB0F803D7 for ; Fri, 19 Jul 2019 12:05:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 51EB0F803D7 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="EHnLM8M7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EjoZsa0RMV9JGFR7vMzSsPdFAHqqyQhlIhIsz+C/KlyWndJfKUBQsJNPr4U2cJyUeq7DxfGpEa1l43ogflBQBB/iQvRglSZd6d4dxrPq+8Oe7TdOlfhBOzUJttRvvGDsO1NgoPU4HbP85mEBjsSKPrjyFkPVszPWYvz/eIJ8pdHFif/bsMLyHpHrTRoL7Ku85H446f0lTtieZ5oci2kHv8BDKiYoEy0KOLmYnh7fZDSB7beU8Y2GVy+MPwMuBxYoWv8Yu0eKneJlzG833ys1pQEl2wnL/MJ1ruh06sPHmPPVS35cRMSiuZT/UXKOHSkDUyoVCFUdXRdGwrLh7MrPyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=koq0CKddyZm2mfqkFPbj4WrPzE2dqUucDVLLxp5WBtk=; b=C4wwS5Nd92X1kqMfI7f1+rNXyTyHpTxB0AfstMXeUsIao1YV7B/EtLjWcduzqhg+qTmfiRfAXQNBgQexJTyJwQCVZGa0lfB5OB5/ExheJFYPzZ5H8T1IoHOEynaEPUw48Anrz9Kzg6PIoblWtC/5oZBkDs7pT7cr1/yn8ogfz/Oc3t+I2e3W/+zE/UpIAUVTNm/X6MkOj3fZ7ZIaKWiCNM0/CQqHxYEn+KY0HCgKYjUYdJ6/HFTVI6uOosGsVJQ+m9Tk1E6kRbrAsezNwpOClaYE/9OF4HXNYRmvKyopdMfEsTCftnNT+3qG4XbHIMGAJoOMqB5iqmRmCQCN/vRftA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=toradex.com;dmarc=pass action=none header.from=toradex.com;dkim=pass header.d=toradex.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=koq0CKddyZm2mfqkFPbj4WrPzE2dqUucDVLLxp5WBtk=; b=EHnLM8M7zXibs/SSSzJ+2XryzxOKO8jnsJ2NLnKS32qZxnap44yGAiMuBmMavWOqxLR5uQtDnMAetfiP6s0qFdzsOg/N/B/SZetMXshJSjy36kfsvnyX40Z3N/usRMeyS8fCjNLUoHSqnbZlgkj7p4pPvWj4YWKi8E+zjo2KcQw= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5925.eurprd05.prod.outlook.com (20.179.0.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.14; Fri, 19 Jul 2019 10:05:37 +0000 Received: from AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9]) by AM6PR05MB6535.eurprd05.prod.outlook.com ([fe80::c860:b386:22a:8ec9%6]) with mapi id 15.20.2094.011; Fri, 19 Jul 2019 10:05:37 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v6 6/6] ASoC: sgtl5000: Fix charge pump source assignment Thread-Index: AQHVPhmDKAGkLrCq2kum0p6xuKjV/w== Date: Fri, 19 Jul 2019 10:05:37 +0000 Message-ID: <20190719100524.23300-7-oleksandr.suvorov@toradex.com> References: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190719100524.23300-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM3PR04CA0139.eurprd04.prod.outlook.com (2603:10a6:207::23) To AM6PR05MB6535.eurprd05.prod.outlook.com (2603:10a6:20b:71::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=oleksandr.suvorov@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [194.105.145.90] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 74f73370-2ed0-415f-7721-08d70c30a5a0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5925; x-ms-traffictypediagnostic: AM6PR05MB5925: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:989; x-forefront-prvs: 01039C93E4 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39840400004)(396003)(136003)(376002)(366004)(346002)(199004)(189003)(14454004)(68736007)(8676002)(50226002)(6486002)(8936002)(54906003)(305945005)(7736002)(71190400001)(71200400001)(6436002)(81156014)(186003)(99286004)(66476007)(66446008)(66556008)(64756008)(1411001)(81166006)(2906002)(6306002)(476003)(36756003)(66946007)(446003)(256004)(6512007)(86362001)(6916009)(26005)(966005)(478600001)(66066001)(11346002)(52116002)(53936002)(486006)(76176011)(2616005)(25786009)(1076003)(6506007)(4326008)(44832011)(3846002)(6116002)(316002)(5660300002)(102836004)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5925; H:AM6PR05MB6535.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: SDVHdJ8TDLcNF/2T5Hpmk7+CYNiEpn+ILZESOY0qVqO2mSEMNpmG/Zm9HA9kONhWZ6nVzh9M4pKZDbcpCf7cgb8oeYScYu2W+2Em5bQyQB1vAeOtdS/HK6Hcc5ahIakPpApHHb2wbFaaT+zHUsB7Ka0i8B5VfkJGplViD5x2MVsYacKsbbMI3He3o8IvxfL2miYKwK9oWBZHurE9xIOgjFalBIgMQQmFa2aYkmWM/SHLivny32ThK0Ylu3u376pdnvldvKZxQ2emzrLbtoMlUZP3spQCR5ka7AbnpMznvFuDyUYXcg4Fd4eDJS5bSakFryQLAn+jnqxnn9mQ+y0X8DP06SnpfJ89QM52pGJRvIJx6BrbZdhZPV522H7nA0bTSbDmlI7nM/6IGufrV4Zfu4HAjqmLtqu0OKrXvOLP3Ao= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74f73370-2ed0-415f-7721-08d70c30a5a0 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2019 10:05:37.4154 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oleksandr.suvorov@toradex.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5925 Cc: Igor Opaniuk , "alsa-devel@alsa-project.org" , Liam Girdwood , Marcel Ziswiler , Takashi Iwai , "linux-kernel@vger.kernel.org" , Oleksandr Suvorov , Mark Brown Subject: [alsa-devel] [PATCH v6 6/6] ASoC: sgtl5000: Fix charge pump source assignment X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" X-Virus-Scanned: ClamAV using ClamSMTP If VDDA != VDDIO and any of them is greater than 3.1V, charge pump source can be assigned automatically [1]. [1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf Signed-off-by: Oleksandr Suvorov Reviewed-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk Reviewed-by: Fabio Estevam --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: - Add the reference to NXP SGTL5000 data sheet to commit message - Fix multi-line comment format Changes in v2: - Fix patch formatting sound/soc/codecs/sgtl5000.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 23f4ae2f0723..aa1f9637d895 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1338,12 +1338,17 @@ static int sgtl5000_set_power_regs(struct snd_soc_component *component) SGTL5000_INT_OSC_EN); /* Enable VDDC charge pump */ ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP; - } else if (vddio >= 3100 && vdda >= 3100) { + } else { ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP; - /* VDDC use VDDIO rail */ - lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; - lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << - SGTL5000_VDDC_MAN_ASSN_SHIFT; + /* + * if vddio == vdda the source of charge pump should be + * assigned manually to VDDIO + */ + if (vddio == vdda) { + lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; + lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << + SGTL5000_VDDC_MAN_ASSN_SHIFT; + } } snd_soc_component_write(component, SGTL5000_CHIP_LINREG_CTRL, lreg_ctrl);