From patchwork Fri Oct 6 11:10:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 149197 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp240068vqo; Fri, 6 Oct 2023 04:11:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+tkiy+2cp1nGvI/i/1OXIurF4sOPJRn8wllrRsLvVClkkM87yo8EhC1jnMD0Ldft1P6Zr X-Received: by 2002:a17:90a:fb58:b0:26b:9e2:1298 with SMTP id iq24-20020a17090afb5800b0026b09e21298mr7317685pjb.11.1696590713300; Fri, 06 Oct 2023 04:11:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590713; cv=none; d=google.com; s=arc-20160816; b=gxzDS7WuDplrNRDafoYs/cDyxYUlXGh2z3YB8UgfSL0vK7aWYfXi4GLH2bnjsCiTt5 P8WziWU6q4FL1LKxNOTwZ65oXLlGh2I3knSCn3fG3cFerNY4DI7SvUU/MuDWUOooAYqH J5rk+m5wHcqLSzbZ7CQQXX34lXjz3KLo7anoJpImBN51vswfiW/70k7AY+RNIGvh9ILp wDb35/5RKZuOER2ebf3sNAH506rzHkz0lnbPm6z54g2OCr9XEH9MuiC+qCiug4qtzrrz snISdR4b0FyyPCatWZ1AGUY6w1JfsVUzbKYzbl6YoiYRnuXC28PM1yuxGcRWoUHJ/iHi CgmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0zBqGPEQTQ7H/6c/RrnU9opyRaEYN9jVzR4spOSXdYI=; fh=Rl1wQ59/j6+8vTsmPNZ5QU5HcfLJ8GHCArwj1jVIO9Y=; b=M13BM3sF+MXtWsb7p3pC4JpRUh5V08WXH0Pu4xomzOAoK1ZulR7xYn57WIpv9jb53C nDIJN2dIZKVA0bLm5WoR6+RQQ/kbISwHcUtjtjJRNCx4Qr7RQxkNBD4A9UUzDvJN5RoW C5c8+7NetvT++qtbZ31V+nWz2Pkfm2ydCoJZqdnUUEC8jF/0TaJk+ucit6m/STnaCUwv dmSvTiUCNE/5SxJrhl+I68XF1VdzozeUnmzVlXoL2po6EH46YzaTwReTP35zUNeB1aKZ O3bGZ4sg0fEeTlaKkesnX4Vuf+TJVMqzbSZZv1TzjkT8pkX8XVrAXOixRZJ7VlGjvOZq j3ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="DpTv58/r"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id ie14-20020a17090b400e00b0027460ba24bfsi5671596pjb.65.2023.10.06.04.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:11:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="DpTv58/r"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 372E7823C119; Fri, 6 Oct 2023 04:11:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231996AbjJFLLH (ORCPT + 18 others); Fri, 6 Oct 2023 07:11:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231942AbjJFLK4 (ORCPT ); Fri, 6 Oct 2023 07:10:56 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2633EC5 for ; Fri, 6 Oct 2023 04:10:51 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 396An4mD006823; Fri, 6 Oct 2023 06:10:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=0zBqGPEQTQ7H/6c/RrnU9opyRaEYN9jVzR4spOSXdYI=; b= DpTv58/rHiV2u/LVDUIFqqlkCsb/+hcY0tyZznH4kN3eEALncTzco2Tg8GHr4WKL RXDycWbUaNA4d35Mz8xofJ4CZDVOMEO1eRRfCgENbBASFK8zgU9LgeQaYaZV2lXj aTKKhxkPgjB5GU3EnvXIlOFa3/FneiD8IKOBKy20fGDHjFDLSGG6kg3/Kb4kraV5 ryMk381rqeipdr6DUMhfe/eXG7EtrFBfVQDSvmw0sa1sS/lMqLfM/Ic4iZn1XmtP EIVl5LoA0Hj0l1h4BG7H4jLnj9BHdXKuvBWjL3K9MxcE5OniFHFTtzOy5MbLf1iE +fUVEWrkW/WqM0gA8Cve2g== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3teg3k812p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Oct 2023 06:10:44 -0500 (CDT) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Fri, 6 Oct 2023 12:10:42 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.37 via Frontend Transport; Fri, 6 Oct 2023 12:10:42 +0100 Received: from work-debian.ad.cirrus.com (unknown [198.61.64.45]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 4B69A15B9; Fri, 6 Oct 2023 11:10:42 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH 1/4] ASoC: cs35l56: Change hibernate sequence to use allow auto hibernate Date: Fri, 6 Oct 2023 12:10:36 +0100 Message-ID: <20231006111039.101914-2-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231006111039.101914-1-rf@opensource.cirrus.com> References: <20231006111039.101914-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-GUID: vuHgu9vlpzucuUgr3uO0ndyVgfLXYYqA X-Proofpoint-ORIG-GUID: vuHgu9vlpzucuUgr3uO0ndyVgfLXYYqA X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=2.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 06 Oct 2023 04:11:51 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779004303732895222 X-GMAIL-MSGID: 1779004303732895222 From: Simon Trimmer If the hardware uses SPI_MOSI, I2C_SCL or I2C_SDA as the wake source the bus activity of sending HIBERNATE_NOW will wake up the amps that were already put into hibernate. ALLOW_AUTO_HIBERNATE tells the firmware to hibernate itself after a timeout of a few seconds, giving the driver instances time to send this before any amps have gone into hibernate. Signed-off-by: Simon Trimmer Signed-off-by: Richard Fitzgerald --- sound/soc/codecs/cs35l56-shared.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index 01b6fa97b36b..68dc93b82789 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -439,7 +439,7 @@ EXPORT_SYMBOL_NS_GPL(cs35l56_is_fw_reload_needed, SND_SOC_CS35L56_SHARED); static const struct reg_sequence cs35l56_hibernate_seq[] = { /* This must be the last register access */ - REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_HIBERNATE_NOW), + REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_ALLOW_AUTO_HIBERNATE), }; static const struct reg_sequence cs35l56_hibernate_wake_seq[] = { @@ -473,12 +473,6 @@ int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base) return 0; } - /* - * Enable auto-hibernate. If it is woken by some other wake source - * it will automatically return to hibernate. - */ - cs35l56_mbox_send(cs35l56_base, CS35L56_MBOX_CMD_ALLOW_AUTO_HIBERNATE); - /* * Must enter cache-only first so there can't be any more register * accesses other than the controlled hibernate sequence below. @@ -545,11 +539,12 @@ int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_sou return 0; err: - regmap_write(cs35l56_base->regmap, CS35L56_DSP_VIRTUAL1_MBOX_1, - CS35L56_MBOX_CMD_HIBERNATE_NOW); - regcache_cache_only(cs35l56_base->regmap, true); + regmap_multi_reg_write_bypassed(cs35l56_base->regmap, + cs35l56_hibernate_seq, + ARRAY_SIZE(cs35l56_hibernate_seq)); + return ret; } EXPORT_SYMBOL_NS_GPL(cs35l56_runtime_resume_common, SND_SOC_CS35L56_SHARED); From patchwork Fri Oct 6 11:10:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 149194 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp239876vqo; Fri, 6 Oct 2023 04:11:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdtpfQZqprxFfMvcFTY7uMmtPlgYPheN1UXJM7Leies99gkOuOzI1XG7A4lybWj14JjXBM X-Received: by 2002:a05:6a00:409a:b0:69b:5395:59ab with SMTP id bw26-20020a056a00409a00b0069b539559abmr2447262pfb.8.1696590690330; Fri, 06 Oct 2023 04:11:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590690; cv=none; d=google.com; s=arc-20160816; b=nktDadNMuSEiE88OwitjotaNDljZ42Jcw326ld6UXkFbwDIdu++c1Kl+1yAPraqyz6 eHjh9kCpYGcgVxbXEmxdcQO62rV7qrlLDe4+pcUt7Qe+ZZE4ui93GiC+2lQd9Aqt6Rae aIjLxPjjWoTTG0XQA5fDpe107RdwI25+BfaFVe5K9nQwiNoLBkZHa2y2PKZWWUuVzpNf acPVC00zg0TDpgilpLhdYZftT+8Lq1xiTp3Acz7uSFegF4f7pRMpKshy7Q315v40HV2r qP0mv7FnTnkvlym1GyBsDq4DDNo0r4P0VKlDxSBvXgL/iusGoSbAh1k9Z9rSALixJF0i bA3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RlyXKyITjmeNbb6voK2kiPtwUMgBnTpkOA+RxMPoLIg=; fh=Rl1wQ59/j6+8vTsmPNZ5QU5HcfLJ8GHCArwj1jVIO9Y=; b=TmQzgBLS3RCIOCEIbw2f7Y3EA5LijnE/N6yGr/MTk0h3oDwxhdLv2Cl7R9H9vXl2hD ZxBzH84qq1R407gaAgcv0TuBwPc4KSRt1eBatuk3VIoXLiqCM/+2PJoPONXx6kWIQ2iO 1CLn+qqxAu1JWZWaL9qdN0qcfKNEqTy83BtGO8LfBIQvSWT+27MXMpby7IxqZe+WlLj4 YvC3WFDvzwHUTl1wR77fMtf6sueLEkgsultvryHSsyht+A48HDXkf2ohiDV8Eav3S7k8 m6ahdOhCan8HvQ1juHlo/RtNlS/lQ3yOFkDMAQG7NTHYtciZmj2V8QtLX0OCWvuAdoJI qwAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=QPOi9KeQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id g9-20020a056a000b8900b0068fcae723easi1327975pfj.368.2023.10.06.04.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:11:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=QPOi9KeQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 85B19814971A; Fri, 6 Oct 2023 04:11:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231953AbjJFLK5 (ORCPT + 18 others); Fri, 6 Oct 2023 07:10:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231889AbjJFLK4 (ORCPT ); Fri, 6 Oct 2023 07:10:56 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2850DB for ; Fri, 6 Oct 2023 04:10:52 -0700 (PDT) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 3965fxce025983; Fri, 6 Oct 2023 06:10:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=RlyXKyITjmeNbb6voK2kiPtwUMgBnTpkOA+RxMPoLIg=; b= QPOi9KeQqQpZRQU+r2xbZi+XuvNxhBp7qpe46+J1LFQhcf0/TUgjngZ5WnC1dnW2 gYhQ9YcSo4/Lj6Y2CNNPiLvyLgp9tksCwUT7n2UHjSwcCk7B8jvZQvOrN+jAuAmB mkDOMtxjmgHBp1/gPqjLCDucE+6LtoPA4bRyVzLcU1map4KgGMGOQe6x5UZ+XUq9 b5hk5qlUyPjs1Xrp5MRUW8y8yMEZCiPLlGJLrCSdMm30r0ftzWsDAO/Si20qGmW1 +JbzZHVcbOTPWMfXfIjlqOud9ngfcf2ITJdHQgORXlHAR60lE26Rc8JiLgtpPzFn JDNBkwUumvXylA4ki2IZLQ== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3th2dtbmxb-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Oct 2023 06:10:45 -0500 (CDT) Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Fri, 6 Oct 2023 12:10:42 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.37 via Frontend Transport; Fri, 6 Oct 2023 12:10:42 +0100 Received: from work-debian.ad.cirrus.com (unknown [198.61.64.45]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id A1CEA11AA; Fri, 6 Oct 2023 11:10:42 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH 2/4] ASoC: cs35l56: Wake transactions need to be issued twice Date: Fri, 6 Oct 2023 12:10:37 +0100 Message-ID: <20231006111039.101914-3-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231006111039.101914-1-rf@opensource.cirrus.com> References: <20231006111039.101914-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: vfrFDBZ8iX4B25Cg-1VZgT8UXHnE1qt4 X-Proofpoint-GUID: vfrFDBZ8iX4B25Cg-1VZgT8UXHnE1qt4 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=2.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 06 Oct 2023 04:11:20 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779004279712286474 X-GMAIL-MSGID: 1779004279712286474 From: Simon Trimmer As the dummy wake is a toggling signal (either I2C or SPI activity) it is not guaranteed to meet the minimum asserted hold time for a wake signal. In this case the wake must guarantee rising edges separated by at least the minimum hold time. Signed-off-by: Simon Trimmer Signed-off-by: Richard Fitzgerald --- include/sound/cs35l56.h | 1 + sound/soc/codecs/cs35l56-shared.c | 51 +++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h index 762b96b29211..8c18e8b6d27d 100644 --- a/include/sound/cs35l56.h +++ b/include/sound/cs35l56.h @@ -243,6 +243,7 @@ #define CS35L56_HALO_STATE_POLL_US 1000 #define CS35L56_HALO_STATE_TIMEOUT_US 50000 #define CS35L56_RESET_PULSE_MIN_US 1100 +#define CS35L56_WAKE_HOLD_TIME_US 1000 #define CS35L56_SDW1_PLAYBACK_PORT 1 #define CS35L56_SDW1_CAPTURE_PORT 3 diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index 68dc93b82789..953ba066bab1 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -446,6 +446,32 @@ static const struct reg_sequence cs35l56_hibernate_wake_seq[] = { REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_WAKEUP), }; +static void cs35l56_issue_wake_event(struct cs35l56_base *cs35l56_base) +{ + /* + * Dummy transactions to trigger I2C/SPI auto-wake. Issue two + * transactions to meet the minimum required time from the rising edge + * to the last falling edge of wake. + * + * It uses bypassed write because we must wake the chip before + * disabling regmap cache-only. + * + * This can NAK on I2C which will terminate the write sequence so the + * single-write sequence is issued twice. + */ + regmap_multi_reg_write_bypassed(cs35l56_base->regmap, + cs35l56_hibernate_wake_seq, + ARRAY_SIZE(cs35l56_hibernate_wake_seq)); + + usleep_range(CS35L56_WAKE_HOLD_TIME_US, 2 * CS35L56_WAKE_HOLD_TIME_US); + + regmap_multi_reg_write_bypassed(cs35l56_base->regmap, + cs35l56_hibernate_wake_seq, + ARRAY_SIZE(cs35l56_hibernate_wake_seq)); + + cs35l56_wait_control_port_ready(); +} + int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base) { unsigned int val; @@ -500,17 +526,9 @@ int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_sou if (!cs35l56_base->can_hibernate) goto out_sync; - if (!is_soundwire) { - /* - * Dummy transaction to trigger I2C/SPI auto-wake. This will NAK on I2C. - * Must be done before releasing cache-only. - */ - regmap_multi_reg_write_bypassed(cs35l56_base->regmap, - cs35l56_hibernate_wake_seq, - ARRAY_SIZE(cs35l56_hibernate_wake_seq)); - - cs35l56_wait_control_port_ready(); - } + /* Must be done before releasing cache-only */ + if (!is_soundwire) + cs35l56_issue_wake_event(cs35l56_base); out_sync: regcache_cache_only(cs35l56_base->regmap, false); @@ -578,13 +596,14 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base) unsigned int devid, revid, otpid, secured; /* - * If the system is not using a reset_gpio then issue a - * dummy read to force a wakeup. + * When the system is not using a reset_gpio ensure the device is + * awake, otherwise the device has just been released from reset and + * the driver must wait for the control port to become usable. */ if (!cs35l56_base->reset_gpio) - regmap_read(cs35l56_base->regmap, CS35L56_DSP_VIRTUAL1_MBOX_1, &devid); - - cs35l56_wait_control_port_ready(); + cs35l56_issue_wake_event(cs35l56_base); + else + cs35l56_wait_control_port_ready(); /* * The HALO_STATE register is in different locations on Ax and B0 From patchwork Fri Oct 6 11:10:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 149196 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp240011vqo; Fri, 6 Oct 2023 04:11:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfSoWTAjuL8Nyl7M/FbrSi+yQYDw3LM3rbr6BMEFbCOmHzAyo50+fmMvOEgghNN9nczIO2 X-Received: by 2002:a05:6a20:3942:b0:14b:8023:33c8 with SMTP id r2-20020a056a20394200b0014b802333c8mr8762915pzg.2.1696590707678; Fri, 06 Oct 2023 04:11:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590707; cv=none; d=google.com; s=arc-20160816; b=j2Qp0as1inKoc+53RDlNrYRsTVkMLCJtAg+zUjrjBnYlqLZ+FN/lL0It4v/jPe8yST zbsW1fKmx82tself7YDUhpvZMLij4zRxFxWg7HNmRfbPbY86VTsNPcH+dDpiONYadXBK F3xaB7Bs69q6P37b7bVOs+938sS9qNG/C+kandQdnAL36bI1q/h9G3L85a51jPnqb4tX csza34/p3z1sKhLpNe9LxF7R2ctFsqc9MEiHln/26ygZ2+aRLxPiD/AJBwK6Vy0ZDqnC 5+Lqs9B5T2Wb0vRAYhuntN83WhKxP5TA/aCv2bKmZojHLj7wesw4WNlyXrMN3AMcoCj/ xOxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=g8oiQTo8bruK3bLc2ltLGw1QTSsNOM4NkrryXMd4wTo=; fh=Rl1wQ59/j6+8vTsmPNZ5QU5HcfLJ8GHCArwj1jVIO9Y=; b=U1VKZnIlKsnoGI4/GgtwT5h7K62vuaGSN929ofvKiySclLegPTGozRDoZgldtI4cV8 J1NvG7YZgz/TvZ2PP11zj//yreD8F7HIYYyCjlKI9AnX9T8mzz7YSZv7fegz0h0KpPgD mWh9+hwQmV1aHBc8WRt2siXf8JjjhtF57BUAyHRqyNWbQrAGvGvS0YQMsThL5jb4Eqgt IMkgrdZnf4cs77GmqldU8mxa14AD1fjJhlh/pbqk0QZkVy28Jf6MyKWPRuxt++DZq3u8 4Ez2WuRgHwQ38s6VrfHJeCOSnc6jK5iNCD+1iM4wLYONjUTMqjGLuyb6bX8yLuORrsrS C+Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=XcLCzlUy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id d16-20020a056a0024d000b0068e3f55075esi1302788pfv.134.2023.10.06.04.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:11:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=XcLCzlUy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id D888C80BF4E3; Fri, 6 Oct 2023 04:11:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231985AbjJFLLE (ORCPT + 18 others); Fri, 6 Oct 2023 07:11:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231678AbjJFLK4 (ORCPT ); Fri, 6 Oct 2023 07:10:56 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2611A83 for ; Fri, 6 Oct 2023 04:10:51 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 396An4mE006823; Fri, 6 Oct 2023 06:10:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=g8oiQTo8bruK3bLc2ltLGw1QTSsNOM4NkrryXMd4wTo=; b= XcLCzlUyVPBMMkJDA2uTe6duhysQotdFctsjKRKwrCv/5/YHRZanSHTZp3DlT39F ySEzu6ZihTVgjr7U26jiYGpLsHOzWt0cEH8inqp94Os4xVGjtNh9H33U05+j7Ruw HusqwGuJifvxWfy0wm73k3H6ozLwVdw5pFYLyvIW6oyxHGeHfjigvcKAl83bFmz9 0t+k6hejFgcMovblAPrZxBUjws4TkO4M8y3t6S6hFrL3hab8RcDGwyqq5Vrw0jDH 1I3JmAajQcC+yuzrW8yHtYblGEs5uIW4dfhSIzWmtWDtFVpO5f2slTfO+iOvnaMX cyj0LPwDZDp2N85WA71d2Q== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3teg3k812p-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Oct 2023 06:10:44 -0500 (CDT) Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Fri, 6 Oct 2023 12:10:43 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.37 via Frontend Transport; Fri, 6 Oct 2023 12:10:43 +0100 Received: from work-debian.ad.cirrus.com (unknown [198.61.64.45]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 058C43575; Fri, 6 Oct 2023 11:10:42 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH 3/4] ASoC: cs35l56: Enable low-power hibernation mode on i2c Date: Fri, 6 Oct 2023 12:10:38 +0100 Message-ID: <20231006111039.101914-4-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231006111039.101914-1-rf@opensource.cirrus.com> References: <20231006111039.101914-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-GUID: kcUkljDucTnCyy5E_GLIs-2oIMLT0mAc X-Proofpoint-ORIG-GUID: kcUkljDucTnCyy5E_GLIs-2oIMLT0mAc X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=2.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 06 Oct 2023 04:11:41 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779004297581264033 X-GMAIL-MSGID: 1779004297581264033 From: Simon Trimmer This can now be re-enabled as the sequence to reliably wake the device has been implemented in the shared code. Signed-off-by: Simon Trimmer Signed-off-by: Richard Fitzgerald --- sound/soc/codecs/cs35l56-i2c.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/cs35l56-i2c.c b/sound/soc/codecs/cs35l56-i2c.c index 9e5670b09af6..7063c400e896 100644 --- a/sound/soc/codecs/cs35l56-i2c.c +++ b/sound/soc/codecs/cs35l56-i2c.c @@ -27,6 +27,7 @@ static int cs35l56_i2c_probe(struct i2c_client *client) return -ENOMEM; cs35l56->base.dev = dev; + cs35l56->base.can_hibernate = true; i2c_set_clientdata(client, cs35l56); cs35l56->base.regmap = devm_regmap_init_i2c(client, regmap_config); From patchwork Fri Oct 6 11:10:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 149195 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp240008vqo; Fri, 6 Oct 2023 04:11:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+CVW0Xt2gHC1yGNluqqhhrY2lNMGs0j7jMQjH1fwir89D05aCBKy2cbyjFfdtPFq0aNkz X-Received: by 2002:a05:6a00:2f4a:b0:696:d529:b502 with SMTP id ff10-20020a056a002f4a00b00696d529b502mr6032906pfb.7.1696590707108; Fri, 06 Oct 2023 04:11:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696590707; cv=none; d=google.com; s=arc-20160816; b=m1IDYQ+L8X2+DiTE3VWlakOgGXPv1Noj2xLvBj37924rgVQbygpvTonVOrECuNInu9 oK6QF6eXG1YhlgEQRgjeqWKlJzwnXXHhTNd02/tB8qriAUKCZGW6KXuLlAst0H1h5wP2 YqlzW77wGG1K+MEoxAR2rsr7OyDIvmwE+VXutHS8fta8rPxCX5WFDSc+idUROGWfMolU 3OakIjIFVED7RpUpPi5E7jbTr1YA4Q255fCx9l3AIrqSqv4wnHw8Vv9IiMPnf+11Ne0p Ujq7uPh79xZy8Co0dSveguVKQivAGEC3MJTzyp47PmWdnfMDT0Zl0IqggDED/+4K5o8b nbsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=n31ClrR7pAHjPb9Ka48kOGEYMP6+xN1DN1qSQpeBfl4=; fh=NZvDB3p5/dj12VJ6bkH8XKdPoVUS76nabXbZ7yzlKB8=; b=gTz6nDpyKtycelnd1gUR0XDbUeOOvOz0ZsNkYVlCPRYAgNyc509YsAGuY99+j4cQ21 aAWQb54Gqc1edS5rks1WiAyH6QwIdRa0Rs0s/k9kMwIZbEWFBWSmy7FN7s6moNWkklWB F2rIhGkrRUikR34qtiqVAipLILqaXVEciBo41raEBAKmzJPkhVoRmOllfS5YyXJhNtxb EGAREDQQfmSrAD+CdW09LC4CHRjtgQHYUFDPhLBDyNc6g3PQISfa3dHGf+e/SK0MpQo4 9QaDVSzlyEwQ3QD+OfsCteKkBPVEf+1g8XMApMwS4vKXE9xO9dlspZYM8/2QHPOr93Ey MUXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=PddZTK8F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id y64-20020a638a43000000b00578bd92e502si3366078pgd.558.2023.10.06.04.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 04:11:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=PddZTK8F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 8BC9D802937F; Fri, 6 Oct 2023 04:11:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231959AbjJFLK7 (ORCPT + 18 others); Fri, 6 Oct 2023 07:10:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231916AbjJFLK4 (ORCPT ); Fri, 6 Oct 2023 07:10:56 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C89FCF for ; Fri, 6 Oct 2023 04:10:51 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 396An4mF006823; Fri, 6 Oct 2023 06:10:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=n31ClrR7pAHjPb9Ka48kOGEYMP6+xN1DN1qSQpeBfl4=; b= PddZTK8FflKwXLmBVeQPRdvarSPJ9RBGhnLcI5SzrrPi0E24dDEzzyAfPDK9LISE Al23Ti7d7cwhyXuQFs/t+Gcii4M6O+GiPmXpPkSobjjcFe8Ctd4+Li23xg1B78Lu AFxhbwd/APlNDs3RjehEOqdofA66GlHbqfgoQjkjNEPzVNfP05z7rgxCZzIm5I5b PQFXufE06gveYUDJ9eapfS1vHt6DWz4b9NU7dfn9KHEq1dVTWk9NqHlDUSFFgXpw q6hwmWJ+3KpxUfn5/W36P6zrfyHeV1GVoPthFvXrnEVj4m4Hz7oEzUIGLwA1iAwi ZIR3xdfflOEoQ+LKmY/ZnQ== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3teg3k812p-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Oct 2023 06:10:45 -0500 (CDT) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Fri, 6 Oct 2023 12:10:43 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.37 via Frontend Transport; Fri, 6 Oct 2023 12:10:43 +0100 Received: from work-debian.ad.cirrus.com (unknown [198.61.64.45]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 6AE18357D; Fri, 6 Oct 2023 11:10:43 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Richard Fitzgerald Subject: [PATCH 4/4] ASoC: cs35l56: Enable low-power hibernation mode on SPI Date: Fri, 6 Oct 2023 12:10:39 +0100 Message-ID: <20231006111039.101914-5-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231006111039.101914-1-rf@opensource.cirrus.com> References: <20231006111039.101914-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-GUID: t_TLtslMzrYc01xR3S83o8_ipRHwwlvM X-Proofpoint-ORIG-GUID: t_TLtslMzrYc01xR3S83o8_ipRHwwlvM X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=2.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 06 Oct 2023 04:11:15 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779004297103369638 X-GMAIL-MSGID: 1779004297103369638 Hibernation can be enabled on SPI-connected devices now that the hibernate and wake sequences have been updated to work with wake-on-MOSI. Signed-off-by: Richard Fitzgerald --- sound/soc/codecs/cs35l56-spi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/cs35l56-spi.c b/sound/soc/codecs/cs35l56-spi.c index 768ffe8213dc..b07b798b0b45 100644 --- a/sound/soc/codecs/cs35l56-spi.c +++ b/sound/soc/codecs/cs35l56-spi.c @@ -32,6 +32,7 @@ static int cs35l56_spi_probe(struct spi_device *spi) } cs35l56->base.dev = &spi->dev; + cs35l56->base.can_hibernate = true; ret = cs35l56_common_probe(cs35l56); if (ret != 0)