From patchwork Fri Sep 18 03:09:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zidan Wang X-Patchwork-Id: 7212701 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 5870CBEEC1 for ; Fri, 18 Sep 2015 03:08:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 54E32207DD for ; Fri, 18 Sep 2015 03:08:34 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 00ED9207D4 for ; Fri, 18 Sep 2015 03:08:33 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 10DC7265A3C; Fri, 18 Sep 2015 05:08:32 +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, 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 8E9C0265898; Fri, 18 Sep 2015 05:07:55 +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 BC33D2659B6; Fri, 18 Sep 2015 05:07:54 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0111.outbound.protection.outlook.com [157.56.110.111]) by alsa0.perex.cz (Postfix) with ESMTP id BB48A265898 for ; Fri, 18 Sep 2015 05:07:47 +0200 (CEST) Received: from BN3PR0301CA0015.namprd03.prod.outlook.com (10.160.180.153) by BN3PR0301MB1252.namprd03.prod.outlook.com (10.161.207.28) with Microsoft SMTP Server (TLS) id 15.1.268.17; Fri, 18 Sep 2015 03:07:45 +0000 Received: from BY2FFO11FD038.protection.gbl (2a01:111:f400:7c0c::183) by BN3PR0301CA0015.outlook.office365.com (2a01:111:e400:4000::25) with Microsoft SMTP Server (TLS) id 15.1.274.16 via Frontend Transport; Fri, 18 Sep 2015 03:07:44 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD038.mail.protection.outlook.com (10.1.14.223) with Microsoft SMTP Server (TLS) id 15.1.274.4 via Frontend Transport; Fri, 18 Sep 2015 03:07:44 +0000 Received: from b50113.ap.freescale.net (b50113.ap.freescale.net [10.192.241.89]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t8I37aev018409; Thu, 17 Sep 2015 20:07:42 -0700 From: Zidan Wang To: Date: Fri, 18 Sep 2015 11:09:11 +0800 Message-ID: <077f421a8dee2e1026cc1fea310600d046490b76.1442543331.git.zidan.wang@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <612136e8272099d9bb5058f0293bb14d1c86e53e.1442543331.git.zidan.wang@freescale.com> References: <612136e8272099d9bb5058f0293bb14d1c86e53e.1442543331.git.zidan.wang@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD038; 1:w90VtvmwgyQFc//ZgA8VYiAAcILongEaVmI0Zloi1Y2jfk9vmDuts+NfI4EjvTgbnrnb/k2XHPojh7G6MWmKoZHfSzHR6XPyf9R7GUFHm4q78xOW2Ld0fkeT58TIN2/RRJplz2/vYsXBJnSERQX0sU5PYUD44JtXaXNKyx3Mpbe/B7yr6zCDRPYBri+8pP2kT1K+FGQ26xanpCQSEUuTieyS5jDFj9K4zlJVD5MVl5Oy3KZC4V/V0HjFMqjHb8EF2MIKNqxMj738Ee1Eoq0R7Wl1qHHFee8NLWTAeHL1a3fuzN3I6VjuivDp3h2OxJf0W8xqafA/0Iqa/JvstOekaE1NXCLU9gmbpPpCVS6xuWPXyFPgUFlmmBzGb41NUmtSEqYiKJzixTqZbgk7YmTrzA== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(229853001)(104016003)(85426001)(2351001)(106466001)(50986999)(50226001)(64706001)(5003940100001)(76176999)(86362001)(2950100001)(47776003)(87936001)(110136002)(107886002)(33646002)(81156007)(5001860100001)(68736005)(48376002)(19580405001)(36756003)(4001540100001)(92566002)(46102003)(77156002)(77096005)(5001960100002)(105606002)(6806004)(19580395003)(11100500001)(97736004)(118296001)(50466002)(5001830100001)(5007970100001)(62966003)(189998001)(5001920100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0301MB1252; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 2:LhzYdCzPHpfijbZ//SzwPOQIQuCU/IcYVZ+m3Tc9X1ipyz8zH+op7qp9XZjclbq5/HOi/uWHaT2CzX1Idy7GcbbekWEcZZnOEZJw9Plaqe9qZARiB+JwdYoPiDDiN4tbbl3+4WN1aM25f8tA20vPejDhWMRCuBE935KIFt9MejM=; 3:rg3sAg4FnoZ6rw+L3wpSL6NldLgIVqIgX3ZN6+HqRNdRR1z5u7Y52plEj55qqsZJGLOcYWclANV2LkbpopgzRA8W4w5YDapRN9VgMGFkMr9Mc9gvvH/bIK9laY4zoQC8fx4PnHHEPiF1ag0/0B35QzCBQiFxa20oBGfDqWPZN5w2NuF7PHGA04LRcKIMfKinbHeIPazFuKa28tZbj88WB0k+74kT5XuMvxRICEpBybo=; 25:cMEvWWozlNGuD8eKzYl255gXY/ppCRizD5s7ioa+xUpZ1WjP3H+i57W9KsDG9QvfuZirU0EQbCx77WKNUa+KfVRrXYCgknhUqb1e+ZEG7Qm2rIuZLbNMhagYSs1bRWMLC5C2DZGTJr5ptvPl1lBf9Wyu1mRCLDXTOjZlUWmnETeRNcZhlqj3ESzijoVBjawZljYwscZ0z5XvE0xmA6RAKkTHUqrXFavhB6lDh+nLEEXjT4NcsSwzJGsyurTmdIDUlnJ+P90LkxU77VG9dfPCrw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1252; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 20:vOHzDgIeWXE84hPHOgvflM2xQSv9e3u3jvCgaAUUTJbzJxia500aoaXN67tNHLYGRkm42OX1cHWisqhiaQi0QaJ+JTHT15dV4L0O6kmacN17IVwENOq8/ha7GOW/LtM18DC5cYhDx0p9bT7OAbsLyuscTevfwaKT593NKAsrrlLqsqEOKLRvfVBB7vHMD2/1SOdHdnP81DDQokk8apwEHEMyu3ct1Dd4vBMGymEGpZdRgFM1vDBHOWxzsiEpkE4U9ZGvDZ3lb48LnlCk6YrRYboi0DN+tjoe2funSNccnfNYv8/OD03zKPHgD3E8X335SZnUsjZIjgTMS0i9wb8uhzpGUDc90j+TmDg9wfPU0Ag=; 4:fmybMmpPdkFo+DzJbblywE+l9E6o6jr+Qs6kmRIdorvP/6Bxd/KlUcyIysFeSOdCmWSuDmnUj14/XjqO58uvXZssFWP6/fQHvQyEyXwpLep6W986scpvh46EH8umUc8lW1cGqHqfFsZJT+gHwf1OOl2HpElZUfGt0mxZHtIdFfsus6ed7Tx2YHsVAfRnRyzMhnk0WvaGrZW7/LBFImMnn/dvYtmJJ/jFGU2jNPPlj77PGEJdC3ieRgVS+PhLmfRgt8QvR13FTZEw5X+/KOXWw4Yg9kKUZUYQohCgq4Zwk8805XHDSI9BSqF1ny9WLNf6i6g/+vdTQZ/tQB+hsuFszC0EtAXzrwWsgDv/1U+9Qpo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520075)(520078)(8121501046)(3002001); SRVR:BN3PR0301MB1252; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0301MB1252; X-Forefront-PRVS: 0703B549E4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB1252; 23:Niz/FwkfEAs4JVPzByuBAZqRGC/9wepKsgji8Xu?= =?us-ascii?Q?htKeoTJkws7qw48A6HSuggPW8pCVRNvW4TmvQqReuZ2D0OONNcvyMVSehTRH?= =?us-ascii?Q?vHJfTS+nhzugb9r2slXZq9Gy3mtsA2VBi443nr51gnibf1nlQnquhja/uOAN?= =?us-ascii?Q?n5/JgIOHEFvNals38Blm/qvwMsyU7hO3UcsLn4PdC0XOQRWSl/Nu8v63Q90F?= =?us-ascii?Q?fYbeUzDNTfXWdeBJixIGbUJ6gt5VfSU7yXb6iAYJf1Pooigbka80Hxf3Gazk?= =?us-ascii?Q?gmEYw7hDf1BOE2t3MJPQHi4Zs3l8sItALOukjr/9fNv7SSU4XzhpdgmVXZms?= =?us-ascii?Q?TRl57qUCABqrIl0bPllPm5iUzARFwKRgo/v9I+68/jDmsi3yDI1Yeo54iJJX?= =?us-ascii?Q?XC1drSIi5MSEaXKFBZ3YpNyLCZ3H0A9C44mpsTJrgcTbHCyUixBy15Uvp+G6?= =?us-ascii?Q?PiI5sxyStYbyuJKCtOdqSxTNBNKmxobWT1g52vOH7DKkBzuDtUmBL/l7pWTc?= =?us-ascii?Q?IBczJUqycw0VpZPay2Zzc9wulIbUnZv9kxx6fmJPs9rTl0xMrwN7LvFEWQCk?= =?us-ascii?Q?HzqDBuHpjFywKU/+Ls/sSGbynyZ2sETOCJzds+KsSQ5rKOA+SLU7iY8VzAWO?= =?us-ascii?Q?nF3c048hvftOq/C6scfuurQygvF7y+N3Uq5W/PDl5Zmen+bkVpmbFU0Vpa5t?= =?us-ascii?Q?DHslDUFXcYYCMaF68MskREXBkVe/qjvngI7l6AtTPWvAlOEqgsUHJrlR4HmU?= =?us-ascii?Q?qRxm5BYK4P9ISxv4wJObulUQLrfcnLPBR4zqXAxmd4x8A2of559X2nPsL5LN?= =?us-ascii?Q?lf1KdcuxMBR7+bJg6klKgdvfruJUr7/fGDydzhWpNdrtQ7U1dS+wsD1Lkrtr?= =?us-ascii?Q?UTyIoNAMWIFoi6SI5LiKoSVn1biUzjRcfn7D4LBF8SfBXRAz8Hb3WFmL5AsT?= =?us-ascii?Q?M4SPulcr7nA6A99EVgTbb7qXj3KPlsUG+efJD75vCJH3N6DAqd9lN2qLWvoZ?= =?us-ascii?Q?f0BeOQzZV5J2RIrE6Gwif8uuGPQJg8oObYk/WkN+k5L95FWqHMQBKQ994xBI?= =?us-ascii?Q?kBw0/yL3Y/A8EoF5ga3J1iKzoi4qUm0HxevCrICwghZbUwrODxe87Vfd69jQ?= =?us-ascii?Q?jJRP8ZR2i0uqGaEa0P8b9CrPGBqHGJwpUXAQMJaXJnB5SUGI24pGkIZErqnA?= =?us-ascii?Q?9QYqIS99jNTNIOhMxD9rgYJvDafYyvSFockoxxcR3a0SCj+1bbfWLFtkeJb1?= =?us-ascii?Q?jdn1D+6z4F3cPWgLMSGwsc6ARXK4KKnlZ7KyaI40L8qxXnrzeYRH8v/vsnAb?= =?us-ascii?Q?Nq/yyE4ZjTfeWFkxJGIFau6s=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1252; 5:CdPTS/g84EY/biZTE9UrgnH+bCs35HSo0y9Ar+0XLX9A8mh/wQbWBhS6upZPvRl+rYpvrIcG7Hx9Oo5YqDNzggX11cavjQFry7A6injgsrrGLcNQ4FNEj5dJpCEohCe/IJkUDcbUaq7mLaXVoDH66w==; 24:TyNg4oBus1Br69LLMYBs5JRLgGiZfCY4D5XQXRveE54NHoEt01gae3L6mdaiXsLVkaUa678KcQG6PxDVx2xu1S8tCp7rxc/0f6UsA8+cRoQ=; 20:eBkmoLgezS7jXPVxkQ849QwcAw4DT0TxTLNCqmi5h75jmR0k2vB9uf/yu2+jZTwrS2RiGhkb+gldoY0TIUiTyw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2015 03:07:44.1433 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1252 Cc: alsa-devel@alsa-project.org, broonie@kernel.org, timur@tabi.org, Zidan Wang Subject: [alsa-devel] [PATCH 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 Acked-by: Nicolin Chen --- 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 ab729f2..3d59bb6 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, };