From patchwork Thu Jul 18 09:02:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11048889 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 D3967746 for ; Thu, 18 Jul 2019 12:12:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3AC1285FB for ; Thu, 18 Jul 2019 12:12:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7B3B286E6; Thu, 18 Jul 2019 12:12: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 89898287F5 for ; Thu, 18 Jul 2019 12:12:07 +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 38CEF1676; Thu, 18 Jul 2019 11:05:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 38CEF1676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563440769; bh=YvF89ZSaEsxwIOsWRBcpA4gPheJyYIMunr78RrnQbkY=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=JHMYXgoEZUG672/ksi5PD6kZYeeuTIPf8dh82z+5aWePb8oaYw9hHIYqUl7yR/vw+ qkgsTTi8zczuzXBzFfVnfKr+5nuQDRV+M/DGpZ1Glegh4rHVocd2c64Iz8VkhTB2YV BrGuIPcJmCLAMskq390RXMFhdC+ejyBBR5wAgfCQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 67EE9F80440; Thu, 18 Jul 2019 11:02:59 +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 28B6BF80391; Thu, 18 Jul 2019 11:02:54 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40095.outbound.protection.outlook.com [40.107.4.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 4DC1FF800C0 for ; Thu, 18 Jul 2019 11:02:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4DC1FF800C0 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="bI1kk/RJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ifz9wzmY5t8VUYDGA0m25e8deF8ohlT0PsQQaTJvjgn+VqRxThRmVCC8jnfG1/FR4+YKGq/1RV52JqQ1Jy6dV1XnqR+Z1HqS1X6gyf85K2vtyOPnXJHvrTmuYEgmWXQfSf4yHbOkQQrtlcSHeGuLH/a4jaKNEyLhJyXzyrAbAZxVDkqO40vNLnurSKleEVZYOgWhizJ8rZnS5RBOG2CZjEO/w1zxQK0dfnAku5JIxJCUVjJS9gyGKmHY2qWQYQQmCF4YCscScidQ4WJc34Gt6VfNXNmrEKZ80goaBsCRoaTDk/Wokn5vCuWPW/c2L2KU60G5QMg6fYwnmyWczFlS0g== 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=S87Civ+imIotVJnH/pRunGuVH1yWxjeYZ9AM8eXK11s=; b=WCZgbzQmymLZtYysWsarwmVpQTC30IHvfEBwLNVmNPna+IrG9/G4KAKzq9mQe+lhKtb48eOdEVFAG9HIMG1bZo6MuYBpdXYC+wVq0dqzyp3CPO4nq/BNIJax5RHjJkm6ZqIL092QL2SXEih0qSG1zH2vCkfirVsteBO6CkOIvNb3VasvIP5WWhPPL6K7iVg10Yk7xqjY5YDPqaS3jHwd73TgTkSWJPsPt5tQGCJnV3qGvZefFBh72oxPCSeJAv5ypsC8rwD/Y/ewaLn9P3UX2Ld7Eb7N9RLuWo47F2Iq5kTMcbBYFt+M96fclRW4fJJvDh2jOmFEuzSNkY11zUFKiQ== 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=S87Civ+imIotVJnH/pRunGuVH1yWxjeYZ9AM8eXK11s=; b=bI1kk/RJZN28IZXceylRPHDFOSEKmuSAYRe2zJT+bHfGmrbgtf4G4M04Kect7Icuj9dthSJ8m6fOYfh1moRv8Yckmf4jGWISZakaLVbYU+F69M80zD451mBbI/DflvfvJ4VvNgLIGMKHdoj/T0sf4NWE5g3ibsf88sJHGJBMA3E= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5013.eurprd05.prod.outlook.com (20.177.35.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 09:02:45 +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; Thu, 18 Jul 2019 09:02:45 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v5 1/6] ASoC: Define a set of DAPM pre/post-up events Thread-Index: AQHVPUeQIlRxXSX2H0OhdtyVf6Sb7w== Date: Thu, 18 Jul 2019 09:02:45 +0000 Message-ID: <20190718090240.18432-2-oleksandr.suvorov@toradex.com> References: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR0102CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:208:14::46) 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: c76ede34-0c0f-414e-e279-08d70b5eb2fb x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5013; x-ms-traffictypediagnostic: AM6PR05MB5013: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(346002)(366004)(376002)(396003)(136003)(199004)(189003)(2616005)(99286004)(68736007)(476003)(446003)(50226002)(11346002)(486006)(86362001)(8936002)(81166006)(76176011)(81156014)(26005)(14454004)(4326008)(186003)(386003)(6506007)(316002)(102836004)(6916009)(54906003)(52116002)(36756003)(6486002)(6436002)(71190400001)(71200400001)(6512007)(25786009)(66066001)(256004)(66946007)(64756008)(66476007)(66556008)(66446008)(1076003)(1411001)(5660300002)(4744005)(8676002)(478600001)(7736002)(44832011)(6116002)(3846002)(305945005)(53936002)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5013; 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: d8RjVqcodn8twyL9OeTLVp4nqi97gBaqQK3CBOR7PTmg4itUVDJ5v5rAf/7Vfes+X6eXbsGFmai/uvwGiwGXfLj+FWXzvirbZMQCJ56P/BX7s/UYiLH3LYU8/eEa3XfgwU07bXoKK5xAmfLPxoXSnt99jG9Ctc+Mxg3LVHh01og4P0QZf2eZCnsVEC1kGPzoW//1pIlQmTAuHWHbnHrmQ9gElk62j73nHm4JIexs2pZeiw5zk2FXUbLm/eYKJt67suQ+/7a2Hanh1k7td+lGRVDYQ6uI38hmj94pbdXSILiNSh62nCCOPW5z/TpaQDFnv5Gnm9Rj+TqmWrTCU0BcC93Fk4oBXfXu6bLku0TVy5OOyjfgaR5lqefO+n6WLxtdtTkNngvDFbzMen+e9oEk0Kivby9xipSmAIsC4ypZA24= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: c76ede34-0c0f-414e-e279-08d70b5eb2fb X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 09:02:45.4767 (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: AM6PR05MB5013 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 v5 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 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 c00a0b8ade086..6c66941601307 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 Thu Jul 18 09:02:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11048715 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 71D4A17E0 for ; Thu, 18 Jul 2019 09:42:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 601D72871E for ; Thu, 18 Jul 2019 09:42:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 545D5285BE; Thu, 18 Jul 2019 09:42: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 12E0C2871A for ; Thu, 18 Jul 2019 09:42:07 +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 0A9FD1683; Thu, 18 Jul 2019 11:03:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0A9FD1683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563440678; bh=trq/mcNq4RLZDtCoTj7YVM4DFBDgXH8w4C6oycqwUno=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=TbFePm/uZA/uOw5EDr63B4uVsHnctzP2Va3f63ne/K9LhwrhefeSVArbtEYMoDpTC i1sxePbTrkQmJcTB7RrH5yLF4+b0vEjIFpUMl9N9mHOaVkAF+SnYFcC/KLN0/fCDQ9 OlCTX/qy5dCB5SqLJbLD21Tf6twyi/LPu3HLtzG0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EDCC8F80362; Thu, 18 Jul 2019 11:02:55 +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 891A8F803CF; Thu, 18 Jul 2019 11:02:52 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40095.outbound.protection.outlook.com [40.107.4.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 915A4F802BC for ; Thu, 18 Jul 2019 11:02:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 915A4F802BC Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="nHDs67sG" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iEoiMIu16Uffu2PLgxvXgdh4cPGX+tuWjO2prULf/mHQFpBeGgPvhHXsMUt09tx54oVeQTZK7kVs5k18vvpyNgaC+QbGoTGWmH9Tf1vEKik65A1JkdB2i/JbZOkO9OGHrMM5vCIyQsHcrZEOptAIKq+XS9zEWvQNow9eSFj28ONCq7mP3fGzs8YfRGnR66uKmO9sJYglN923w7udA4BbYyxQhkhREFmWUAGowwib/6hjGp9v0cDP5TUT5NttQh0odHydRkgcZnS6bGqQ6hcqQZfHKE28atCjypb8Fu+RDvnpJSpbC/yv9F/H4CnxHlDwkZQwNCIn6M07Hrp3jYLS6g== 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=KiI2/bqoHbF8ZhxZs3JQNAQmdgq1SbcQzRRycBmo97A=; b=nth9DTXu4T3u8ydWkrfhQvH7n8wKKzks0j/hFdd85befy6ybjIQ3RQclxwr8Hu25u6Y+QlAKZfynb7Beqn7vDRDaEsNf9GM/u4CPiA4cUOoviuTtLe8vl5P+mS4HXMsWjU9JyriVMbiLREVApnDU2m4+CPT7vsgC7yCb+ygrO5udGvhbnhLdRcNR98pjPjwrLRgIYsZ3+tJQ4Jq40WD9urfvE+YOw351qWWntPb7LkVqm8HQOSYVd2vbUetm0wKgTx+kXeCuiQBURYqxW2puruY4Lpjms1lSbu1+C43emiyYp/+oyzWrSFsEM6q0QZDeYKGmEerkZbcBbnL0TsoebA== 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=KiI2/bqoHbF8ZhxZs3JQNAQmdgq1SbcQzRRycBmo97A=; b=nHDs67sGtWkUKUmH8+dBdKP2aJ2NPtaSXlqDchqQrJSOQ48mqO8DLhJW80m9rAk3G0+534kYg2zWGeAEa6ip0TPTddpd4PJ98KiiQrL2eVMMgRNkQFa7qvfX+az7aIB85IALInuOm1ztSB2Txdci8NwQxTxCw4hQwTuXCojmKjM= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5013.eurprd05.prod.outlook.com (20.177.35.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 09:02:48 +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; Thu, 18 Jul 2019 09:02:47 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v5 2/6] ASoC: sgtl5000: Improve VAG power and mute control Thread-Index: AQHVPUeRRPlk8qJu2UinCpynQ1zx8A== Date: Thu, 18 Jul 2019 09:02:47 +0000 Message-ID: <20190718090240.18432-3-oleksandr.suvorov@toradex.com> References: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR05CA0078.eurprd05.prod.outlook.com (2603:10a6:208:136::18) 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: 6cad9cd2-fcfd-40f2-23cf-08d70b5eb3ed x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5013; x-ms-traffictypediagnostic: AM6PR05MB5013: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:236; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(346002)(366004)(376002)(396003)(136003)(199004)(189003)(2616005)(99286004)(68736007)(476003)(446003)(50226002)(11346002)(486006)(86362001)(8936002)(81166006)(76176011)(81156014)(26005)(14454004)(4326008)(186003)(386003)(6506007)(316002)(102836004)(6916009)(54906003)(52116002)(36756003)(6486002)(6436002)(71190400001)(71200400001)(6306002)(6512007)(25786009)(14444005)(66066001)(256004)(966005)(66946007)(64756008)(66476007)(66556008)(66446008)(1076003)(1411001)(5660300002)(8676002)(478600001)(7736002)(44832011)(6116002)(3846002)(305945005)(53936002)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5013; 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: R8rq0yQW7HsKhrB6fjKX6L76F4EIfeQjEdsVZHg8eaLpM2HH5b9sZkhOjgm0zZUqauv5Hwe9yqxzELd6rb/LHxgPVJVt/pi7CO1T8h6G/cViGT7Qh5ebtwheYKnBLvYcOX6/EwiwF/wUonysbvS5f5DjAjCyDyhDLJOu9Yg5BU+rV4yybnyQ21WEw0i5wugw8A3Jyh9itnsGy07aEltUdC47L+j7Lko3h7lz7s1bH+YEv16495wwunTLNeq3PQX1WbYSWJc4qd8k5V+V71QV3YpQDj78BPady4GJc3z1QWoZgo0Z2JMLrX0aTw4TCoU1r/3C/eATCjNGyP8N8kptRlGpViRViPylsr0hmAdPCmB3kI+E0LobaXGXgK7yc73ddL3pVGRbOyWbg5IKNobbBvyiVSir8K+4kkq/79nvm7M= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6cad9cd2-fcfd-40f2-23cf-08d70b5eb3ed X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 09:02:47.0998 (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: AM6PR05MB5013 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 v5 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: Igor Opaniuk --- 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 | 216 ++++++++++++++++++++++++++++++------ 1 file changed, 185 insertions(+), 31 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index a6a4748c97f9d..a2aeb5fb9b537 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,19 @@ enum { I2S_SCLK_STRENGTH_HIGH, }; +enum { + HP_POWER_EVENT, + DAC_POWER_EVENT, + ADC_POWER_EVENT, + LAST_POWER_EVENT +}; + +static u16 mute_mask[] = { + SGTL5000_HP_MUTE, + SGTL5000_OUTPUTS_MUTE, + SGTL5000_OUTPUTS_MUTE +}; + /* sgtl5000 private structure in codec */ struct sgtl5000_priv { int sysclk; /* sysclk rate */ @@ -137,8 +157,109 @@ struct sgtl5000_priv { u8 micbias_voltage; u8 lrclk_strength; u8 sclk_strength; + u16 mute_state[LAST_POWER_EVENT]; }; +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 +291,30 @@ 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; + 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 +323,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 +430,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 +454,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 Thu Jul 18 09:02:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11048887 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 08B1813AC for ; Thu, 18 Jul 2019 12:12:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB3BF285C7 for ; Thu, 18 Jul 2019 12:12:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF82A28820; Thu, 18 Jul 2019 12:12:08 +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 8911D28717 for ; Thu, 18 Jul 2019 12:12:07 +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 83E9C1692; Thu, 18 Jul 2019 11:04:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 83E9C1692 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563440723; bh=ueqK+gk0cgBtGygsxHhdfiRgh6Q8HeB+7wUnufh527A=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=DfNKN8eRWcBkgNPx2HYjgoSqeRInli/edp2/K32u1QvfnXt5UzVUaH3C7HVktjhaa XUvuIeBnE5mS7J8sc8dQ3HM9tfYAomqxNIbUg6y4ZW+3XO54C2lvGyWu46hAfve+1p 3or7+zzSKcVLu8YslnU+QXsOriFJGVc0imPGkw20= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C37C1F803D5; Thu, 18 Jul 2019 11:02:57 +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 09B87F803A6; Thu, 18 Jul 2019 11:02:54 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40095.outbound.protection.outlook.com [40.107.4.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D4980F80362 for ; Thu, 18 Jul 2019 11:02:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D4980F80362 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="f3W/puXc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lw5Ydb9hTIusn9jzjav3CYJXkGQfte92NHVhVoSuLFmJ4O3OVC6Lkk60pG8JQGSbiS3z7NkteClfHDEJHRIpP7Q74VmfXa1TiAaSmQ5V8nvuiNGCTyRW0xR63CHbJUcDgNLUzTmLAf7hT2A9s74Otx9HnwEp4w6kX8I5AVPtmT6LcrDPJQqlQQU10qYTshkcMQ0t2ej18U2Gf5wPLk7Yv6TTnXZm8EE6HiMb1RQIvD19YqSpzZ3DuXJY0vd8Hku/lQcdsXwLg/eSDDDAW4uCW256v/gcUgqIE44FsT/OZFAeJQpL5zOw5LQYmo2bSh8xmGMPhzfvdkYmHFawNGIdLA== 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=KENG8EsMsbygLILn6kmKiGP20I0vqpVPRW9K7S5YINc=; b=Lb+aBs7pZo3gDvr3NXVnnahm3BDxDAC/gLwrkSjsvOFUd5HdnkCtySb6D5QHXr/X1XlPmY04/XmKRPplM/yzRsmCnNPbjwkHCUtdbPmdBpqSHQk8Cq40tQX/EM+9YW/zoxZIrglZA9mBX4sYsQ0o/srvTaQvYFK7rufEbEJTv+Yi3udns6whpBQVZESNn0RZq+rdIhuxt24N5YBZNMo8xQgm5hikfehgJiTsuXvJKk6/DsRSeuk4zzUqgsfY1pINiJ+a3umkCQueo4r/j05H5TWn+LgvQOLCqD5jjgpWc4DRj6nsoHO5EV7qd4BfPYbFsjO9RghGrEASUj8tZ9zEOg== 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=KENG8EsMsbygLILn6kmKiGP20I0vqpVPRW9K7S5YINc=; b=f3W/puXc6OUJpl84Lz98+KP9rmDAXJ6QzfLE1rAiPWx4HppQBQTUprCujpmg/i7kb94komGELDQoKyKQXDuoP8/aURxgixRCSkgDGoz72LXnpMMcnZQVwG9CIEvMDY/dZuob2s/Fdyd4vKglN4bk86+j43oZ/kPSl4qYCkFPY+0= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5013.eurprd05.prod.outlook.com (20.177.35.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 09:02:49 +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; Thu, 18 Jul 2019 09:02:49 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v5 3/6] ASoC: sgtl5000: Fix definition of VAG Ramp Control Thread-Index: AQHVPUeSMC+aACEaGUiWMvIQp2qocw== Date: Thu, 18 Jul 2019 09:02:49 +0000 Message-ID: <20190718090240.18432-4-oleksandr.suvorov@toradex.com> References: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190718090240.18432-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: 5b6bc69d-304c-4eb0-948b-08d70b5eb520 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5013; x-ms-traffictypediagnostic: AM6PR05MB5013: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2657; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(346002)(366004)(376002)(396003)(136003)(199004)(189003)(2616005)(99286004)(68736007)(476003)(446003)(50226002)(11346002)(486006)(86362001)(8936002)(81166006)(76176011)(81156014)(26005)(14454004)(4326008)(186003)(386003)(6506007)(316002)(102836004)(6916009)(54906003)(52116002)(36756003)(6486002)(6436002)(71190400001)(71200400001)(6512007)(25786009)(14444005)(66066001)(256004)(66946007)(64756008)(66476007)(66556008)(66446008)(1076003)(1411001)(5660300002)(8676002)(478600001)(7736002)(44832011)(6116002)(3846002)(305945005)(53936002)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5013; 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: IC+hQCehtd+T9XcUNZfEE+IHJ5zkurSvijpuwOe7YL+d4F1k+SxGGa7JCBVGelBaasX3GuJFc2MCJ4M+VrmT74mNLtpPYvCW2wqsQh/ubgKp9bRYjQTfMJiZTc/ki9OUbSkM3wxzFpkLNTsbD8YJmkDu3S9eQ2jsRsXrdRy6unXz35Bfz+kaQ76IbZ7TZxp492UsUd2v9sKsIYDkU7rAxBt+9xFBpv8oUjRo/t60FPObi8nHyh9NCGucN+ZGuBOo6ecEmtE2qKFIjvyrXlBxggXqUaOsratqpYpC/aKkQX25uWy6OUL5bocW3ybK/vC5inVdz1qMENCqs69untCnNmAEXWBcxw3XvbI2pQwFXvd8jWOZWtP1o0zvxCFZx13XsWqC9Po+hvPMpa1P6XaZaHyrtT+JqBiZaJ7uHcli5qU= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b6bc69d-304c-4eb0-948b-08d70b5eb520 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 09:02:49.0946 (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: AM6PR05MB5013 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 v5 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 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 a2aeb5fb9b537..a8d55c21a5f2d 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1450,7 +1450,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 18cae08bbd3a6..a4bf4bca95bf7 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 Thu Jul 18 09:02:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11048891 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 7BC9617E0 for ; Thu, 18 Jul 2019 12:12:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BD4F2858E for ; Thu, 18 Jul 2019 12:12:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60789287E8; Thu, 18 Jul 2019 12:12: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 8DAF72858E for ; Thu, 18 Jul 2019 12:12:07 +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 6FC4516A0; Thu, 18 Jul 2019 11:06:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6FC4516A0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563440816; bh=EJZAdtzzHWYt0O014G9iP4cTHSw5vZvc7LXZli2zEIg=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=X+mqL9++ymLVx2YoeCAtXidMJpJcDVJbK6dyYHWaFApUPvBFggE9qIwIB6XB66dOo c8O387LvYkzxAkewXraZh/NFv677Qy0XWtmlQXDtN0/ZtJHOMArJSG+fTc0p1JUwot kkHWaa0r2vqX9OElBzHUYyDPDlKKiycWJfuW12ic= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 0FA7CF8045E; Thu, 18 Jul 2019 11:03:02 +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 55E10F803F4; Thu, 18 Jul 2019 11:02:58 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150109.outbound.protection.outlook.com [40.107.15.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1F0CCF80391 for ; Thu, 18 Jul 2019 11:02:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1F0CCF80391 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="SrEJySmM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DjNEVLu5YDKYDry32xW80etNyJ1iU99mRu/+9yCJhIrOslIwFg7r1rOI2t6efhSodWFxFqyrWoKHqKuTriOH+hmRu97VCBC6OYb4mvt5s7sTC8d+pIEM5Bx0iVuxQ8dBoRi1Uxe8PvcnWsv1cbIZyi/m45DNNsf93yNfgURq7sAJDC7rOaOM5GJYeW2pNe+QaM3XNoffvUGXZ51L9OAkD0mVcFrIaAjvD4VtjUWA4HYlwHiuuAUITDANijcMp9uOU+HBnox3a94ejFrcBHsMHDz0rofRL6tZ/vtA7temyIpVAYgAvbOUWtzDe4WowWGYgaVEw20vgRT7h6QDnfWjmg== 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=45X+Y2bERyBfazVTmZxOV1DjVVuSO5pnlowazssve3c=; b=hN7qLEflPlQ1QhNS3kY4kTuGwrWsJdGW+aMYwUF97rniOFAbp1Eq6dH3K8nm4GudV/gPFU/5GW7H4JsbpQ4SwW4ehs3gkELB/1fG/Zcs0jmxaOuxcziE5nbl9azw9Nr9/R91JPRryxKJbek24n7LV+m/+T8iRO5vj42alECQqLktkmAxQGAvowZAyYStIv8Le/FTK4u8kFYxM0243H3npT88ZxjRi13UR3JmpHPKJxPQ7cbAgFD2RY9kJ/KlXIsGdHLOoGztsXR0gI9PQlWyU1XJ5CZGwEshBGtkN7fxmyskoBQRXmspB2it90G2jUB5lGyTD7LYfJrVz9ZQnhqnTw== 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=45X+Y2bERyBfazVTmZxOV1DjVVuSO5pnlowazssve3c=; b=SrEJySmM1iY2dCpRPscd6btFW1n1emjA2SjCOVfLHT3tp25rn3Do5BbN7P5tKlVAd/3DcefJWKm+cVbRX21jYaLJR/c6HBNBPuYyJQ6x94RQKHVHVQ4E2ERTd3cSk/FCNTZktgZ0+EKByCm0xL9PKzMEuRENvaOyaPPVFIHF7b4= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5013.eurprd05.prod.outlook.com (20.177.35.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 09:02:51 +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; Thu, 18 Jul 2019 09:02:51 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v5 4/6] ASoC: sgtl5000: add ADC mute control Thread-Index: AQHVPUeTL7C42F/420K4CqAM90BbWw== Date: Thu, 18 Jul 2019 09:02:51 +0000 Message-ID: <20190718090240.18432-5-oleksandr.suvorov@toradex.com> References: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM4PR08CA0058.eurprd08.prod.outlook.com (2603:10a6:205:2::29) 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: 1ceb33f8-3a81-4a7d-c879-08d70b5eb654 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5013; x-ms-traffictypediagnostic: AM6PR05MB5013: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3044; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(346002)(366004)(376002)(396003)(136003)(199004)(189003)(2616005)(99286004)(68736007)(476003)(446003)(50226002)(11346002)(486006)(86362001)(8936002)(81166006)(76176011)(81156014)(26005)(14454004)(4326008)(186003)(386003)(6506007)(316002)(102836004)(6916009)(54906003)(52116002)(36756003)(6486002)(6436002)(71190400001)(71200400001)(6512007)(25786009)(66066001)(256004)(66946007)(64756008)(66476007)(66556008)(66446008)(1076003)(1411001)(5660300002)(4744005)(8676002)(478600001)(7736002)(44832011)(6116002)(3846002)(305945005)(53936002)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5013; 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: S7wzwTfOrl9dYaeAUK5URitFYxl9sn4UBtBfgZfv4KPooKlR9/thtyub4Az3sW3ftV72z5vfu/34nIM3CgJkxZZ/OHmt6I1q2Lljb63hc/Th/Mp0ZE3afsBvESIAiyzKRjLzHrUd3+A87WmmO8RUFmCtbIo7CAUzEeTH0U48apZelRv943pW0zzjjvqJbVsVj5J+Fc5FF/jc1TdkRFuZJKtcuvjm1GfHclKEMbGMW9PamgNvJu62QHk0Qzw9yUDxGLFjqiLNOSUN+3E0yC8p9aMd9RCnhKodyNN3zPQ4W7og8idH80YnsMA1IdMi91YoHKLsN/6Z0TNnpBFgnD4zx+3vOOv/B9YD0wcKKcLsigvMsieb9bidjAi23PrcXOS7BNgjswbEElmf8DRI6/RsgNyni7HXeiDrBl1SYBHqeAM= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ceb33f8-3a81-4a7d-c879-08d70b5eb654 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 09:02:51.1644 (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: AM6PR05MB5013 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 v5 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 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 a8d55c21a5f2d..0123d9cfcb473 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -710,6 +710,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 Thu Jul 18 09:02:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11048893 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 70C6213AC for ; Thu, 18 Jul 2019 12:12:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F465286C1 for ; Thu, 18 Jul 2019 12:12:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5351F286E6; Thu, 18 Jul 2019 12:12:11 +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 900D728803 for ; Thu, 18 Jul 2019 12:12:07 +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 B177A1673; Thu, 18 Jul 2019 11:06:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B177A1673 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563440844; bh=Xn7qzQxKdp8FIz+CEQUKi3fiRxHsXQiReJZBEgHwUc4=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=NDKQU6D1k6XSA/BKvg+fRGiJgraG4ooAvQ26baAUQPurJ35B1NUKdenouHq3cVt4+ 8w2GeDQqdIjD8ybWo3oaFSTqFLOBf1u78Lq8Krq5Qt5uWVo7UkffLLIlQawFRTx1R2 slwxWdEJOsZ2blGl0apR42Jcv0NQ623/3i8/rY6E= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 98CB7F8045F; Thu, 18 Jul 2019 11:03:05 +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 8BEFBF80448; Thu, 18 Jul 2019 11:03:00 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150109.outbound.protection.outlook.com [40.107.15.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5DF02F803D0 for ; Thu, 18 Jul 2019 11:02:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5DF02F803D0 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="q8ZRS0jd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lYZCc4pgnE1rJWTMDhqhe/0YzEkDME8mJASJdq0HrnrL6isKOUXARCDA6uG6thvFmRASz+6ew+0f6spF2PaBCPZsVaGimK+s/cW0JnrjSV7HtJLP1kdZY5wzw9O+q7MsIcWS8Yc0u4wU6w/46RwiHYhpIXas0+VFw53O87E0jhcqNuYmtdjsPQa9/51yLQwcS4ELZt9+FPRaxxLHBXvp0ZRwDxFBwZaAERpSWCNLpdNeIp/KqSWKGcrsqgDQVZx4P1dtSe4fxjNdRPtrDs8M2Phye2dxZYLcyfZ7HoHeCG+5Qi0xAB89fD9ED+VNbbe8/z+15ajqxRfLVpzYWxZzyg== 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=5uLXKJYrLvfHg3G7lZuDe0a46kS1kUy/19CYoEhFZ8o=; b=djbttD9JIf7mYEpn1d8/SobCzlvVyv3lmxBhJL/grHJ1qRNhCGtrpbARd9OtFWFlqm1aAJzx2JE9ss3GtuVW7QzHOB4XtTPL1mEJtzorOv5t1g5DYi6GjEnCw//3hG2MIqOOLEv2GiVZ0UdXNK0Vz6e70tHbm2WQ2xJyFlvTVECbHpTIkfEtzfrYkhY15gzeyeJ2nPcJIYthepKBqvx94GnGoynqCBo+qAazjkdcRRaGuDLQUxCekkgsmOrm0t84ILkn6Qxnr8QGIcKUm0Xp7vBSQX6DZ85HvwGOcRIXbijrrI9AVw6t7TCMsVZQBfK9QVQ/2fl08O4He2GkjxQ1Zw== 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=5uLXKJYrLvfHg3G7lZuDe0a46kS1kUy/19CYoEhFZ8o=; b=q8ZRS0jdoMecmlBF7Y1puxynwCSafg0TBSl1nLybxE6kzOif//Bep0fi5e5MUm3MoGU8FerwL94nN5G81MnOqPs1TpV6Phb91mY87kqfOTx0/Ews+S3oJpiDjsLSJxLz96v6ZJb+6VfOsUtvXSh9nagFjnRCobBvYZ89GX3A7FE= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5013.eurprd05.prod.outlook.com (20.177.35.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 09:02:54 +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; Thu, 18 Jul 2019 09:02:54 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v5 5/6] ASoC: sgtl5000: Fix of unmute outputs on probe Thread-Index: AQHVPUeU/o3Hdj/K5UqwPeiB1Nflkw== Date: Thu, 18 Jul 2019 09:02:52 +0000 Message-ID: <20190718090240.18432-6-oleksandr.suvorov@toradex.com> References: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR0102CA0001.eurprd01.prod.exchangelabs.com (2603:10a6:208:14::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: 2b14652e-3b4f-4b88-eb28-08d70b5eb74a x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5013; x-ms-traffictypediagnostic: AM6PR05MB5013: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3044; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(346002)(366004)(376002)(396003)(136003)(199004)(189003)(2616005)(99286004)(68736007)(476003)(446003)(50226002)(11346002)(486006)(86362001)(8936002)(81166006)(76176011)(81156014)(26005)(14454004)(4326008)(186003)(386003)(6506007)(316002)(102836004)(6916009)(54906003)(52116002)(36756003)(6486002)(6436002)(71190400001)(71200400001)(6512007)(25786009)(14444005)(66066001)(256004)(66946007)(64756008)(66476007)(66556008)(66446008)(1076003)(1411001)(5660300002)(8676002)(478600001)(7736002)(44832011)(6116002)(3846002)(305945005)(53936002)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5013; 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: uJZ8wbCj5V1wQSomMxF4TN9ZL4E6y3WcyyJGQLp2qPIG+lfweDzCq9Ud9D2igmOLbFLkLJSHNfaN0JxpTVKLJW5dAPhBvui2mr8HH7trn4Dvz8aMT2PkY3Y4BGuEruvVKqja2IxwP74KkB+u/XtmnOGdOeUxQZLmqzeRjUB0ZeuZF5XQDQhGqQy79B4fzXRXr6KLNCr5ItLZyq4G029OSlahdRn+V1pHkmPJ3/C3PG8dAaKRGqsEU0WCwdpz03vHOR0JQXmCSh6P6Fxphh65KRiXsp9grWpng+yTqBmLCVakKU1mr03aUMZFaytSdALCK4cZ+JdxPY6ztqJqDmp4hAtkNTOLleZnUPhMicFc/mV288OJqZpgkudkEcpv/j0ZViGIENE41h4s3sonbPpVdiyARaiTduAWblcyWFq6GvI= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b14652e-3b4f-4b88-eb28-08d70b5eb74a X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 09:02:52.7115 (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: AM6PR05MB5013 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 v5 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 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 0123d9cfcb473..31d546abde717 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1443,6 +1443,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); @@ -1470,9 +1471,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 Thu Jul 18 09:02:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Suvorov X-Patchwork-Id: 11048735 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 CE03C1800 for ; Thu, 18 Jul 2019 09:47:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC80F274A3 for ; Thu, 18 Jul 2019 09:47:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B036C285C7; Thu, 18 Jul 2019 09:47:08 +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 4BAAF274A3 for ; Thu, 18 Jul 2019 09:47:07 +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 ECA8316AD; Thu, 18 Jul 2019 11:07:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz ECA8316AD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1563440884; bh=6JMeAyR+ZtFFSoQn2UnB2i/iq7xJsDSGhCv78Cyn+Ug=; h=From:To:Date:References:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=uwBoBJ+AV1wEfdRsjxf6DaaneX4+Q6ApAN4Q2AftVAgy1I0VBjfWD/55Z6OMPdiRA HYKzSsjfPtkZlHqsZuCdqEfC9jBQxGPrzeB69HGxPC3uSrfk6GbHpykUFfiUfG4OFk fD7Sr6qT/K2R71OHnIoC07f25f9ZzBTUW7SfqGMM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C1252F8049B; Thu, 18 Jul 2019 11:03:06 +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 B66F3F8048D; Thu, 18 Jul 2019 11:03:03 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150109.outbound.protection.outlook.com [40.107.15.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A9998F803D7 for ; Thu, 18 Jul 2019 11:02:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A9998F803D7 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=toradex.com header.i=@toradex.com header.b="BU4loIDy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LZe3sdMX9hQ9Iv05IKMsNq7N8Bj0I/z8O98wCaF6bWLOxP7EzI8wQNGPqnP7VyG1+sS6c27TpRzCrMDi14Uc2Jy0+PBtGMiGPmF95vPNGX6RGh/SMfdFDmhh7zcN9pYQPlM5i3S/3Cfh6uFpP/DibWuNNXGPTZMnDi6B0giaG6Knkeno/wAW1Ct4qjX2ncJGXObpNTv3GP1Q3nEnclapzh+Pm5kDqid98BtVQfgqH2SG+jH1L8tMVMjhhLS5/dz104g+5HBQLOyosc9KHMph6KqvlOh40q+i2saLfhV0Zp57COG4j2p8IzbEyfnD1dyoDVLyEZ+AdBdqu2Mu7CK3rg== 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=lYc9e8uahuZAcaT3aYVVhZcDDrFl+ic72daQUBU6/S0=; b=UzT6VEF8h0bX8lOiKu3OuaHeBlmAgGcQrOOOlPA6As0spDS9KG6NTFqPQP5MOIeEfAiUgl2m3ozCtjU9gCthUuZRAW9gHfAYXB37nxRfZfGJMd40wzD/MA0jr7tuPyVQV2iRUM1+/FNcX/QN4Vk6iZMWLlwIyJP68Txhjaw12Egb2NTqwd3erXUtyEe16Jpp5vSG7zXYH1Cfcm8N96OVeXtvOT/pG2ixIOMCn6rUSUNQIOKYfucgUr8wliuGSP/fyipX4xyF3zatK7Ms7GHeeVYtdMEBttajDQR8hm5VaqHkBkWLvHXMVc6ol9M/6jHOZlLvmdcK7YijbLK4031E+A== 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=lYc9e8uahuZAcaT3aYVVhZcDDrFl+ic72daQUBU6/S0=; b=BU4loIDy0aFyvMtCfkSGO82ZdgWTmpA2T+X3s+sQnxGSMuwPGf8K9I/DJ8oEGiWD9jgfvF8LebV28ztpyXKaPKOzDDEILKeqhxvSIPGF92Bxiwg75jNmXCK/kdJu+z6l9mXorU5VtgXHrYbC1SY7ASg7UH7Lfj4qZ1fFGVLFOS0= Received: from AM6PR05MB6535.eurprd05.prod.outlook.com (20.179.18.16) by AM6PR05MB5013.eurprd05.prod.outlook.com (20.177.35.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 09:02:54 +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; Thu, 18 Jul 2019 09:02:54 +0000 From: Oleksandr Suvorov To: Fabio Estevam Thread-Topic: [PATCH v5 6/6] ASoC: sgtl5000: Fix charge pump source assignment Thread-Index: AQHVPUeVZISUvwZOT0igggD8Y5/fAQ== Date: Thu, 18 Jul 2019 09:02:54 +0000 Message-ID: <20190718090240.18432-7-oleksandr.suvorov@toradex.com> References: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> In-Reply-To: <20190718090240.18432-1-oleksandr.suvorov@toradex.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR05CA0084.eurprd05.prod.outlook.com (2603:10a6:208:136::24) 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: 694a4b9a-0f84-4976-4b30-08d70b5eb837 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR05MB5013; x-ms-traffictypediagnostic: AM6PR05MB5013: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:989; x-forefront-prvs: 01026E1310 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(346002)(366004)(376002)(396003)(136003)(199004)(189003)(2616005)(99286004)(68736007)(476003)(446003)(50226002)(11346002)(486006)(86362001)(8936002)(81166006)(76176011)(81156014)(26005)(14454004)(4326008)(186003)(386003)(6506007)(316002)(102836004)(6916009)(54906003)(52116002)(36756003)(6486002)(6436002)(71190400001)(71200400001)(6306002)(6512007)(25786009)(66066001)(256004)(966005)(66946007)(64756008)(66476007)(66556008)(66446008)(1076003)(1411001)(5660300002)(8676002)(478600001)(7736002)(44832011)(6116002)(3846002)(305945005)(53936002)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR05MB5013; 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: HYgO9frOYddaYCVwS2gHQCZjnpEitNPA+QhlGLo2T57XJP6hcsN6gZpiR64j3tIcQ5HsctVjlS1ScgJy3JgOnbVwi3vij3PhnpDATThvaFMF/WAWy6D6FMopg//yQcCV7jkJ40kNPiXfwiIBU9ApIBjpMgG0qS9lqpxJc0ORo2kFg84iHFyN33jBrhKXam50NOQ5Dyw1JT16HZgFQdKNhBFjsji9v3X2GD1OTq1e1zZrbuf0td8nUN90+jm/3WzgHd3jcyjWd0eLrlLDAFdyivI/L3G8P/JGWnBOil+t8FVXB/b+r3BlI18a8RVo5g2iIvCp8RlHAIrjPJI2gM4TDTQdZdsg8pfBO9VZT6cCK/3uPCuZqg5fzj1UwGWQxZGme8mPInsrjw1l0MtlvcAREf9g6bPVE8YzULCBAgAaJyA= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 694a4b9a-0f84-4976-4b30-08d70b5eb837 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jul 2019 09:02:54.2586 (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: AM6PR05MB5013 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 v5 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 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 31d546abde717..a04cba66615de 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1328,12 +1328,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);