From patchwork Wed Jul 8 07:22:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zidan Wang X-Patchwork-Id: 6740871 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E97F8C05AC for ; Wed, 8 Jul 2015 07:22:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D01B8207ED for ; Wed, 8 Jul 2015 07:22:26 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 8632820767 for ; Wed, 8 Jul 2015 07:22:25 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8FD452652C1; Wed, 8 Jul 2015 09:22:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id A7FA82654E5; Wed, 8 Jul 2015 09:22:04 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 782FA2654EC; Wed, 8 Jul 2015 09:22:03 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bn0103.outbound.protection.outlook.com [157.56.110.103]) by alsa0.perex.cz (Postfix) with ESMTP id D8867262607 for ; Wed, 8 Jul 2015 09:21:31 +0200 (CEST) Received: from CO2PR03CA0041.namprd03.prod.outlook.com (10.141.194.168) by BN3PR0301MB1252.namprd03.prod.outlook.com (10.161.207.28) with Microsoft SMTP Server (TLS) id 15.1.207.19; Wed, 8 Jul 2015 07:21:23 +0000 Received: from BY2FFO11FD050.protection.gbl (2a01:111:f400:7c0c::172) by CO2PR03CA0041.outlook.office365.com (2a01:111:e400:1414::40) with Microsoft SMTP Server (TLS) id 15.1.201.16 via Frontend Transport; Wed, 8 Jul 2015 07:21:22 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD050.mail.protection.outlook.com (10.1.15.187) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Wed, 8 Jul 2015 07:21:21 +0000 Received: from b50113.ap.freescale.net (b50113.ap.freescale.net [10.192.241.89]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t687L1gC031432; Wed, 8 Jul 2015 00:21:19 -0700 From: Zidan Wang To: Date: Wed, 8 Jul 2015 15:22:30 +0800 Message-ID: <85fd343e78e9881923557d936548bb215fbf673e.1436339869.git.zidan.wang@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD050; 1:/4u4nqoMqO4ipmdIyl9MnAHD9F3Vsm2kqDQdAjDu/rfswDR5ja5Dflmp6NSotiLhd5n/EJzGNcr8bHXAmYIoyAA3L/+pwZKWz+GIL1ZdR+Be7AXhAdMze2D1OE5hIuG5igIcASC50Mn6PZ77ru/SGhNK4XGNtMhPpEOgs7Yye0eF3lNXIS0EUxEQdA8GeceZSh5H1FN/BFYSxQNIBGe6qYmxLqAx+qBcYH1PQBs2ySth7AnOO8x/tjuGSJLB1WDUT2RKSOHU+SVv+E2HDN4sgw4fYhvc1NOhW71slFAS4IAgSXeYtUPg9VdalGVYyXWr7CJMDMnQgCm/KwH0j/oGTFS2zxHy9j0VJa0cFlnZYAU= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(1060300003)(2980300002)(339900001)(189002)(199003)(87936001)(86362001)(19580395003)(6806004)(36756003)(85426001)(104016003)(110436001)(5003940100001)(33646002)(107886002)(2950100001)(229853001)(47776003)(46102003)(2351001)(5001960100002)(110136002)(19580405001)(77156002)(62966003)(50226001)(118296001)(106466001)(92566002)(105606002)(48376002)(77096005)(50986999)(76176999)(4290100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0301MB1252; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 2:WphA0LYQRqyWRjhr8OY15qSwmfnUMZt96XV/0qkbVOh9KzQe3qiOt3eirXrMhsn6; 3:A4K6UrmVHQRfKdXOzKYuGBCrwfxQQNI1tTRSl5/f141zRTiRPMKEsE61yq6qXYu4m+xQ9zL9m0+EKWe0IK+4QVJZ8wnZLWnWowqzabQNvNwYdW0yeJc3qPagXF3Q2H0DYii/5/mtsmnXBllTPDOhGygg1VZVR4hgCQUM+B/lLMFw9s3rZv629GM/CIULtM5qop9m804ck5gJU6sRVQiEo6rOLqtd7+cCrWiAnFhDGPA=; 25:dNbLiIVBwsG/H+uGrrPXDBXBfAvrBlMVBBBC/wK4gkJjpinVnDN1a9DGIkWxhDMWgWKX3DmDUcMkx93nkOUlVSXbZ/Tu6MDCiUr3o/Ir89NqGcYzkP+HgkLi/oBMlY2lnwiFmi0godDV6x5zVX0fVyryIlEF4OeJWbNXMLsMJL9PlpmS0QUEAGa/ey74JLzu0Vi4Lfev1exm2qyL28lgrorsW7TwO9sxREiUqJzc16UPiYpsyg4OqloEdgn1Z65LXDccChT/AZId3gjEpqsSqA==; 20:UNYsoxadBNzHHjSbw7YXPGMfggwu8OvtDhxmbwALvZ1aNg2o8k3bBNTPMfwW6CdsivYeyv6PErO5umLETdkei06IRjSVvPBQ91hdhXOBPVmmcJHaua8Th4h7NoY0/dL92AM9CsIwVL4TMydXHlZ65tm6Yfmljd91Zm2cPMnLJxjLIVHNWMB2RuPNFZjeGEmG/CUAukcSMrZvg6U6DXYwAGP359cw/aDNcZuhYGXnVRErkAlZF/EbYjkYeUlq8m6IJZuCRK0fxfWgZGGcpoguCCvLCq9KlIEwTIElFKDnwkVLFSgAEuURQu+ZFoOUZp5mwea9WRWMN9OKo7wAe2x4t+oymq1Tg+HFTjhDeljvVZ4= X-Microsoft-Antispam: UriScan:;BCL:1;PCL:0;RULEID:;SRVR:BN3PR0301MB1252; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:1; PCL:0; RULEID:(601004)(1201001)(5005006)(3002001); SRVR:BN3PR0301MB1252; BCL:1; PCL:0; RULEID:; SRVR:BN3PR0301MB1252; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 4:IYEMDCmCb7wiYLbEc2ZOGhUej96zxDJ5ZZKKGSJb0pPEPo3qsGgFwNYRQruidfxMDw7X0M5PTq2bGZK6j8J6fGbP75WrHMXyPiX0hnJ5F61x4nylc1kRIxqXLC2YVKn7siZFbV5ScKx6Xg0dsY7b2/AVlGY2jfHxbub5id8x8L0AxOl0neo6xvYLCkh0HOeVouh/BrxFXZkl4olCzXivuwVHaKhXfccwj7gFqoiIPirNAWHHXsjPqs0tJEKKkxk3Wqeo93oCgwOTe3SINZwRk05LrPsAsvCjj8TChcjURTABEic0D/8Ucnjqc6hhj7ki X-Forefront-PRVS: 0631F0BC3D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB1252; 23:91IUi0n8FuuxLfRfY6U2SiODTPpFkxfmirSsJn4?= =?us-ascii?Q?rHxd3p8e8FCVFiHBVhzSYcCIwV7gQ0HBJTGNA/a53O6GbEmgEUJa9/JGl0rf?= =?us-ascii?Q?hrSk+68Ob9/rDMqyZZTpjN6eF6PUruZWS7jfTDaMmThRJx3ebnMKhtOif0/S?= =?us-ascii?Q?MSswySGjZ10lEGl5QOwVHXKSkoT5iebbQfUF8+RLo1YIgnQYQUgIyl7chYoI?= =?us-ascii?Q?GIB8hEgDl5pHbCOODx/Fmthzld9G1up7oNsXvGCfSK/p8ICfVZHk//t+o2Jl?= =?us-ascii?Q?pG3hf4tlESymvkfNn2I/UxURm0x05LMtuyATcaGfEj2II4Kg4Q9EwpMr3lyY?= =?us-ascii?Q?hizMfFEE3FtqN2mt1MyIwUbTPAlBoCU4cKf3mjbTlC/jOOQeAMwY04l6Iw+q?= =?us-ascii?Q?37XM6uwPHYOmFmdvI5zBUuTludpyzSVf74g2z037rXOp1//Lu2NMZpqjhAhd?= =?us-ascii?Q?zqB2kn+OpmIe2dy/2svfHoconBYH/muxtS8iw8gE3r83LbL1TwnPcshRy6Z+?= =?us-ascii?Q?CQpsNilDCpe42Yy8cu8IQ1URo3z9tyURB/wmUuPZ8b2x9un1Q4ajagPHDb4s?= =?us-ascii?Q?ialYb3oCfRR/GIhlePJuLIawUQR+5uXy5JTO/z99k7hzkcj9RnHEBQV97Gsw?= =?us-ascii?Q?I5gOtpbsMfyJN1ForsUyRwwEq2cFrXZHXG4G+GuRSFa+VRoSV08cftZkzo8J?= =?us-ascii?Q?JxehDPQX6xloO78WNOiF7W6pztvJnnkEHbY0FD/YH+n61/fwmLove4BVHsX7?= =?us-ascii?Q?cUS+31g3bplMZwT6I46g7YGXXxCLeUOnArqNcnp+WR0HHvdf1fZCtXtroNh0?= =?us-ascii?Q?rAbry31ypfQPv+q8PO9qAPmZaqF8TecMFJvukt5uRuZzxZjJqGoaiJkyfmUr?= =?us-ascii?Q?QzIch8TKzj7ztLc4XE5eWGNL8UlLFlRPUwWZ5iEb7fx68m9nd1kIrVlhKjau?= =?us-ascii?Q?uNX5+w5oO4ShY4JrSkXpdzHk9BOU4RumQv4PMbGPQWapGVYKknv+HfmBA9qA?= =?us-ascii?Q?JaCytJZCdVI+gHhhSfQOxK1sA?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 5:lSroPPI57PMAUHMpgY0MC3oIyGW42WGybaY4QVCiE3UrnYOzthXaHDEy28jMW1nb+s7N6faVi23g/OZzcWljItXb18Fg59HPg3NEMj+pWx4/Z5p1wx6XXBMX/3cBurxZyo/UQW6XH0CXn0ZFHJ9M4w==; 24:2C9kJWZSoN3JXb7gz1c0LfRSO3yR5D7tgm2Err7elzqKyQXZ2GmVYpxP7HVZQ5x0t7zcT6E8EdMpNocGl66oZEJ+p4biom0CrrWMFW3x1k4=; 20:uD+KODw+fbjKUyj3PqWOF+7RnixIq0sKEdA4/3LIOZWrmnx9YsBlyc+i8SkTbwjOjCEgQaTBPFbxAyM05l13Yw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2015 07:21:21.9413 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1252 Cc: alsa-devel@alsa-project.org, Zidan Wang , tiwai@suse.de, nicoleotsuka@gmail.com, broonie@kernel.org Subject: [alsa-devel] [PATCH v2 4/4] ASoC: fsl_spdif: Add driver suspend and resume to support MEGA Fast X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP For i.MX6 SoloX, there is a mode of the SoC to shutdown all power source of modules during system suspend and resume procedure. Thus, SPDIF needs to save all the values of registers before the system suspend and restore them after the system resume. The SRPC register should be volatile, LOCK bit is set by the hardware. Signed-off-by: Zidan Wang --- sound/soc/fsl/fsl_spdif.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 8e93221..5c1d3bf 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -108,6 +108,8 @@ struct fsl_spdif_priv { struct clk *sysclk; struct snd_dmaengine_dai_dma_data dma_params_tx; struct snd_dmaengine_dai_dma_data dma_params_rx; + /* regcache for SRPC */ + u32 regcache_srpc; }; /* DPLL locked and lock loss interrupt handler */ @@ -300,6 +302,8 @@ static int spdif_softreset(struct fsl_spdif_priv *spdif_priv) struct regmap *regmap = spdif_priv->regmap; u32 val, cycle = 1000; + regcache_cache_bypass(regmap, true); + regmap_write(regmap, REG_SPDIF_SCR, SCR_SOFT_RESET); /* @@ -310,6 +314,10 @@ static int spdif_softreset(struct fsl_spdif_priv *spdif_priv) regmap_read(regmap, REG_SPDIF_SCR, &val); } while ((val & SCR_SOFT_RESET) && cycle--); + regcache_cache_bypass(regmap, false); + regcache_mark_dirty(regmap); + regcache_sync(regmap); + if (cycle) return 0; else @@ -1013,6 +1021,27 @@ static bool fsl_spdif_readable_reg(struct device *dev, unsigned int reg) } } +static bool fsl_spdif_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case REG_SPDIF_SRPC: + case REG_SPDIF_SIS: + case REG_SPDIF_SRL: + case REG_SPDIF_SRR: + case REG_SPDIF_SRCSH: + case REG_SPDIF_SRCSL: + case REG_SPDIF_SRU: + case REG_SPDIF_SRQ: + case REG_SPDIF_STL: + case REG_SPDIF_STR: + case REG_SPDIF_SRFM: + return true; + default: + return false; + } + +} + static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -1039,7 +1068,9 @@ static const struct regmap_config fsl_spdif_regmap_config = { .max_register = REG_SPDIF_STC, .readable_reg = fsl_spdif_readable_reg, + .volatile_reg = fsl_spdif_volatile_reg, .writeable_reg = fsl_spdif_writeable_reg, + .cache_type = REGCACHE_RBTREE, }; static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv, @@ -1262,6 +1293,38 @@ static int fsl_spdif_probe(struct platform_device *pdev) return ret; } +#ifdef CONFIG_PM_SLEEP +static int fsl_spdif_suspend(struct device *dev) +{ + struct fsl_spdif_priv *spdif_priv = dev_get_drvdata(dev); + + regmap_read(spdif_priv->regmap, REG_SPDIF_SRPC, + &spdif_priv->regcache_srpc); + + regcache_cache_only(spdif_priv->regmap, true); + regcache_mark_dirty(spdif_priv->regmap); + + return 0; +} + +static int fsl_spdif_resume(struct device *dev) +{ + struct fsl_spdif_priv *spdif_priv = dev_get_drvdata(dev); + + regcache_cache_only(spdif_priv->regmap, false); + + regmap_update_bits(spdif_priv->regmap, REG_SPDIF_SRPC, + SRPC_CLKSRC_SEL_MASK | SRPC_GAINSEL_MASK, + spdif_priv->regcache_srpc); + + return regcache_sync(spdif_priv->regmap); +} +#endif /* CONFIG_PM_SLEEP */ + +static const struct dev_pm_ops fsl_spdif_pm = { + SET_SYSTEM_SLEEP_PM_OPS(fsl_spdif_suspend, fsl_spdif_resume) +}; + static const struct of_device_id fsl_spdif_dt_ids[] = { { .compatible = "fsl,imx35-spdif", }, { .compatible = "fsl,vf610-spdif", }, @@ -1273,6 +1336,7 @@ static struct platform_driver fsl_spdif_driver = { .driver = { .name = "fsl-spdif-dai", .of_match_table = fsl_spdif_dt_ids, + .pm = &fsl_spdif_pm, }, .probe = fsl_spdif_probe, };