From patchwork Fri Aug 7 06:21:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zidan Wang X-Patchwork-Id: 6965111 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 95A9CC05AC for ; Fri, 7 Aug 2015 06:21:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25C4720651 for ; Fri, 7 Aug 2015 06:21:04 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D3C5220634 for ; Fri, 7 Aug 2015 06:21:02 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C5D112608C7; Fri, 7 Aug 2015 08:21:01 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, NO_DNS_FOR_FROM, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 98738260708; Fri, 7 Aug 2015 08:20:41 +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 1F3DD26070E; Fri, 7 Aug 2015 08:20:41 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0143.outbound.protection.outlook.com [157.56.110.143]) by alsa0.perex.cz (Postfix) with ESMTP id EEA5E2606FD for ; Fri, 7 Aug 2015 08:20:00 +0200 (CEST) Received: from BY2PR03CA064.namprd03.prod.outlook.com (10.141.249.37) by CY1PR0301MB1260.namprd03.prod.outlook.com (10.161.213.12) with Microsoft SMTP Server (TLS) id 15.1.225.19; Fri, 7 Aug 2015 06:19:58 +0000 Received: from BN1AFFO11FD038.protection.gbl (2a01:111:f400:7c10::131) by BY2PR03CA064.outlook.office365.com (2a01:111:e400:2c5d::37) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Fri, 7 Aug 2015 06:19:58 +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 BN1AFFO11FD038.mail.protection.outlook.com (10.58.52.242) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Fri, 7 Aug 2015 06:19:57 +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 t776JeIk029536; Thu, 6 Aug 2015 23:19:54 -0700 From: Zidan Wang To: Date: Fri, 7 Aug 2015 14:21:06 +0800 Message-ID: X-Mailer: git-send-email 1.9.1 In-Reply-To: <6fa4e6ebf1f34f5d637324c9f62e68b03037568c.1438928296.git.zidan.wang@freescale.com> References: <6fa4e6ebf1f34f5d637324c9f62e68b03037568c.1438928296.git.zidan.wang@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD038; 1:L4swjyjqU1zrmWvsPvlEU+5WwWzPdydNOvfk620/2ZYZyt2e59UcO8ZEllYUNxA6RJ6n/czsxC0cYfENwBUK3icj+emhcx7DDtRzwLs6fu176VZYvFJarBTNgSAICOMdb0y6QI4en8wCqfrw2LPDCxYcpJ5vORW9k9RKSTTpRWCaB+48opBfqheeM+5Tr8hBVIUAfgNKbPWHilOzh+Hw20rDxScRTFzf6dDGa3tOsdF/uFGNd17387RWIXXu+IASZOY5fGiQxQv+bxVtR4J45dePj/nhz028iqxCXYYGLtyXQrOB8R68WtP6cUyJnJe5J8LIP5HM1TnHSIhcKdU3dfTeOjAJXhYP06J5VTg5Goc= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1060300003)(339900001)(199003)(189002)(104016003)(87936001)(62966003)(105606002)(110436001)(77156002)(50986999)(77096005)(69596002)(19580405001)(6806004)(68736005)(2950100001)(33646002)(48376002)(229853001)(47776003)(2351001)(76176999)(85426001)(19580395003)(64706001)(50226001)(5001860100001)(118296001)(5001830100001)(97736004)(4290100001)(4001540100001)(110136002)(50466002)(107886002)(5001960100002)(5003940100001)(5001920100001)(106466001)(36756003)(81156007)(46102003)(92566002)(86362001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1260; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1260; 2:X2ExSAQnh7lqkGMyqIjTZrcphU48kpfPxzNZ5zBjLaDadJGqnIK97kAQMX6RWTvBmUdUC6Fh+NpBodT3XQJwXLrFxrJSdBUstKCVWiv+CxA99Z/sqYElvaJu/lZP78k5j+psGU8Yn2XJ/n5ZkszKP3tt9Vsu12j0xEKRMKZy8Ek=; 3:eV/40krs5jQ90S3Y9ZfgEveITH9EG/7a84gaxfqt8YAxysnYSOIqPFxpLlhX84905eR6Uhv4vZ/yFWxuNyKqyHAT5yXP/LHbXYfcP9k0+3u1vI4iduEeJvX+aZpOIwkIcOlq5hi8nQ1LVkT6DZPgSEjOKuTHU2Icaa7g00f3uVGRCOPkBpKeg/DY0867K8rhWv0AQGRXi1yIzH6ialh4K59QPvrHRO9q3NkfxHMKZp8=; 25:9dD/U3LecwZEdWHNpHXNwosAYs5bEq5y8pI14OYX/lvcFuoZTlL8fC2KvZOvgFKvkT+QEZpm5kJnDlCN4W3+K5r88YE2sK53u5vhJ+TyBOjya4BrVuzLKFL9sbLTVWSCbff2KdVdSICT/TslPcbqRJnZpaOyMDA53R0aR15Crr+i4gBgvUM+XDRj6dlLjyH+Lpu3lgR7i8tJIY4p56FMEyzfonLIhb6RpJmbsWq1m7bm2uFTFCq+2JLMZkQnVCq4IeAmNvVCd3knTSfCezPmaA== X-Microsoft-Antispam: UriScan:;BCL:1;PCL:0;RULEID:;SRVR:CY1PR0301MB1260; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1260; 20:+tUCmjvg8LCIg8etIaBUO7x/0CE81xlzto4xlglFJHMgE9lD0DIpOZ8Z/oU0Ng0X06wapiSGwHDzhvqMAGZlZUAbk5gsf0mvLyuk6UbOlLEeeJcQeZ6LOoE/4dRJTTXFKY5yP4B7llg1LQD7wuClPLWXl9noy6wCFP+sY3gvivNu9G1GYUSp3bXtTleGMiUcmH9ZjXF+MiLDiyP04147U6oQxvVp8Th0jR3gEtV0X4aXpgu53HGqO6ww5tWzhpKHjn4ewxbTqxHAG4xugP6vC+umMS320hrfuZ83BR69VQiV7wJeYjqxz7zYFFjjB4yUpaIz7m/u10gQVJzgjaMf9v7nmrW0pRHGNvixknI5VfE=; 4:0+iRmuMp5NnPEu7Sun1SBQc5fIjfiNQBUR7F2Ldk0FfZ8jjuMKlQ6ce4XZcbIcpv7rmCizFwyt1ijraxjRqiPaDekBp3G+XcZT5YfRo4U68ewnHlpRjV+oiyfCvwUc7YWRY5G+M6olDBTFY+DBp99wbCugTyYRIt4cdMwLOWqqAe7gJW7P7g7rUwp+wDYLCXjy5Cgf5CR1QfzHayi/qgWZqi51yP7B84HDUKAOTWY5EqgODJ4sLOqLjSAJUpMCqtRVBfo4Up9SGUUjwK9VHJZ7ieJoqvYBX1nlzENMV2xvU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:1; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR0301MB1260; BCL:1; PCL:0; RULEID:; SRVR:CY1PR0301MB1260; X-Forefront-PRVS: 066153096A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1260; 23:zk+WMhgJ6c2p1/VDoMY6y9dYXju0BhhM1+LEDA+?= =?us-ascii?Q?3oi/vtLlhWWmi/WCngKQ+GG6F0tWGYle3uHI8In08noy8lOifSImzEHU43Va?= =?us-ascii?Q?X5owNh2HmoHISMoCXLxXNNPDYxgPzqf+8c5nJtWe/iB1h45qDErppaowdYGi?= =?us-ascii?Q?mRW1cnHqfgrezqxYd1Gi67eFOztiNV50ok2zv0E2uX/sEYYoVRsS/VTFlkDb?= =?us-ascii?Q?5q+AXKQca1AZMR1rHA4IGEum+7R5nBHxYLCZbygTT33XwqOFugYjm4/NB+KA?= =?us-ascii?Q?NwJCOIi94m7qIGGWQvJUMLgKKODFGmA0b+ehTQ7RGDC14gI4M7R8+1uN6LGB?= =?us-ascii?Q?Lauze7Ea9VzsJShdlcIj6+owmK8wpOAnva5uVXCLdrs+RKLt5qMf1I4lV3H+?= =?us-ascii?Q?TACQlNFGCvyhBm90hlDBoZA0BNDSHPE7V/X3pyYQFbM5qHVUCcgTj4k8srYL?= =?us-ascii?Q?t9eSAAzX5BMsBCskVLCGODHym3QMGO9A3guDKsaqoDgHEpr5DONpfwZfXxjq?= =?us-ascii?Q?juYm4F2ZB0ndTLJceUMRxW4/1vy0HHbA6Lhsd/AdE5EmgPQFm2oPMjodjleN?= =?us-ascii?Q?8irtl61xx3H6Y5xBXsd5IEvfEIVm0ShVPS8wAfdbyYtKZ9xuVXhrzF7G2Tk6?= =?us-ascii?Q?i32DetwxcS+wAYsYaRFHIvc6d3WuMcXnM/CQig/4lunUUOesIHtm7w7YdLnX?= =?us-ascii?Q?OG4IKZWjTjmquI0PgTw+2M5oyiDNXnuTe3nHRBE2BtfINEq0uweujDd+JgHa?= =?us-ascii?Q?1felEbZGA1HgDnxk7u2aQTE3G5v+WOiaCFNV6gvVcuj9r7VzQgfMyCGXrne/?= =?us-ascii?Q?bydjKcLF84Dvk8umq4ba10D1Cpd9OcVpkspujP2ekUvT4AHhLKOmCNr4ukJ6?= =?us-ascii?Q?Fobvtt52pejUnaNOafaStFobVYkIrmjRxlLa0E8gAEPb2r0gj7fWLM8Aj9iw?= =?us-ascii?Q?qCsg3wkDfDwdxc+IQUSbA64MTTeeROaAmwVLk93QcIwSrIfwQ+PU1w6QvwjS?= =?us-ascii?Q?W0E3kQ0SEW6OabFb0pRm7ghKj/ek6ELs//D51/EEi6sHF/dXUFoW5GKUBb4Y?= =?us-ascii?Q?dO0/7urZu8fzHOegd+9LZ9I9fMkKF5smaI2PlNyrDQ2h76ZShVYanE0Y0Aak?= =?us-ascii?Q?bvd0xSqY3frmO+sxqJy9n/MHeqIsbW9t3SnaYKI90zBRQX4pr10GtLpDsKoJ?= =?us-ascii?Q?Z8aFNSfs3UryMC+dsvSOpbpsWEoKxu08TRpLeuiwMCqCdzpi/V1S+UXHE2ut?= =?us-ascii?Q?iNSuzNFRzML7gpp3SpX+3FLLh5kb9Xk/pkAT1r9Ek?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1260; 5:PwDjLlZnjZd6SnbBcfSQ7NtTv4sFjLpVLYnnTFF/P3Wqvxp6kh3kmcFzX8PtxJyLnyETPcwo69aTShbM6RUdGGJLN80/7G/4a0ElT82fiXaoGRWxaQzAbj7EpKGZeS1DfpKZUkN3bIluA0JEvfO++Q==; 24:Dl1ruzJd3xloJwD7gKVk3D1mJzgS1kwW9oRXEJ/FxNZAWX9zb3TxHhGdftuDCyT0BZfEkglDD/66OwN4kfIlCJuESm1XBYJW6j+g+Yt+sew=; 20:pzxkni0Sq78hLCvfP2X+fq1Nr3XsCAc4zIfMezP1j1pGdk16B9kG2XS17Atq68XLozn3/5yzwfORFGSmwH5K6Q== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2015 06:19:57.3041 (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: CY1PR0301MB1260 Cc: alsa-devel@alsa-project.org, timur@tabi.org, Zidan Wang , Xiubo.Lee@gmail.com, tiwai@suse.com, lgirdwood@gmail.com, broonie@kernel.org Subject: [alsa-devel] [PATCH v3 2/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 | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 7a92f30..98c64a9 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 @@ -997,6 +1005,14 @@ static const struct snd_soc_component_driver fsl_spdif_component = { }; /* FSL SPDIF REGMAP */ +static const struct reg_default fsl_spdif_reg_defaults[] = { + {0x0, 0x00000400}, + {0x4, 0x00000000}, + {0xc, 0x00000000}, + {0x34, 0x00000000}, + {0x38, 0x00000000}, + {0x50, 0x00020f00}, +}; static bool fsl_spdif_readable_reg(struct device *dev, unsigned int reg) { @@ -1022,6 +1038,26 @@ 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) { @@ -1047,8 +1083,12 @@ static const struct regmap_config fsl_spdif_regmap_config = { .val_bits = 32, .max_register = REG_SPDIF_STC, + .reg_defaults = fsl_spdif_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(fsl_spdif_reg_defaults), .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, @@ -1271,6 +1311,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", }, @@ -1282,6 +1354,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, };