From patchwork Thu Sep 10 07:04:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7151251 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 DC84ABEEC1 for ; Thu, 10 Sep 2015 07:09:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC2B5208A1 for ; Thu, 10 Sep 2015 07:09:11 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 80FD520903 for ; Thu, 10 Sep 2015 07:09:10 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id B0D6226590A; Thu, 10 Sep 2015 09:09:09 +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 BEA44265821; Thu, 10 Sep 2015 09:06:36 +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 ABA8F265821; Thu, 10 Sep 2015 09:06:34 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id AB5952658ED for ; Thu, 10 Sep 2015 09:04:50 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 10 Sep 2015 16:04:49 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 3F70C49974; Thu, 10 Sep 2015 16:04:49 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 3FAA68002F; Thu, 10 Sep 2015 16:04:49 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 3AFF98002D; Thu, 10 Sep 2015 16:04:49 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id SAE28155; Thu, 10 Sep 2015 16:04:49 +0900 X-IronPort-AV: E=Sophos;i="5.17,502,1437404400"; d="scan'";a="195341382" Received: from mail-sg2apc01lp0239.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.239]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 10 Sep 2015 16:04:48 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SIXPR06MB0607.apcprd06.prod.outlook.com (10.160.237.149) with Microsoft SMTP Server (TLS) id 15.1.262.15; Thu, 10 Sep 2015 07:04:45 +0000 Message-ID: <87twr2n4h5.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <878u8eoj7x.wl%kuninori.morimoto.gx@renesas.com> References: <878u8eoj7x.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 10 Sep 2015 07:04:45 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0028.apcprd02.prod.outlook.com (25.164.90.166) To SIXPR06MB0607.apcprd06.prod.outlook.com (25.160.237.149) X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0607; 2:lZYniY+y6tT+CyAMUJAXcFTl0Qi0NbS5KOjERQ2jEJVaO5trDcBM2NJoBEGnsMML5F6U67vA7Vk0xMUtnue7fGXTX5Ie6It+im6DMZnBmyggTNw70wUGKN6CvN974gMJdMAgZwe2/rhgdth+fwRG/XnjIDoFA2M+TS9fkg9V2jw=; 3:JoB+7xKzabLkQfNJ4GWie4Tf2EXUymlqPRBHDhFe1dWeVwHf0K5kcJi7SWdTT3e2EBmJh1+MQQhSetuTm7FAuA+LCYedll4peGBTy3y8x2yNXpIA5w+PXcxxsQODVYJW8/m6WYY3ANwcWPlwQsMFTQ==; 25:TabdcYuXqSiwBB3CT9Iw8jiuexcXNTNrjiA5knXPZzMok4UEtwDswMIOilE3gQjoyu7dKeseVk4z5V/NrN7kCB9YfI7EOapNt/xdmDWaUkfK7XYyvlAOlkRbzGilKD5SjAX/aVcTtkh389ZqwMztILXTYKhNVNvgBILrAUqxyRAwfL7uIQE4w0McpAv4IyrLfus04EdHNTmSQj+X0aAbsnMlh/46ecaqPk6gVk2lInyw7610Mkk/2w6pS/9OPSh064kEzbB8LedRv8xaUQ6LfQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0607; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0607; 20:JVY9wWueoBCtsNb1ENh68ebe9s05v2D2z3puLzZHn8S00JX4SoCtyaQi093ye85gYWrZrTH+Ytl6CRPZTjlLMQLi1DOYpqh3tMPTHj9UznJdCMutezXpGxojr8AHPIiaX6vP7ocBKGC210K4tQTS0rxZLL/CvSWLUG3mSrLiKsRb/ZWlskrszo0nnHY7w26fP1KJlyYb82DvTNZeJUCiamT3/B7C7j7GKCSjmLKHQyY14SzAJtR8W4gMcnSFp51m8jCwyrnUe1+/6M5wLKcrrHq7cV0FDR8yDFKRMYqRXDlxgc/hNImly+1Pt/i4ZfsFx20MsCZHM/Ou6NhbTEEHuzPgXk4ZAJdXB4LQteAg/YUFMN4U2QeqSa3stvYj14YqXb7zr/gjYHuecPOygFXN5NdAhPgOMHo2rQfHORxVZbZtyAAiCDAeS0O50R4OgKmHVNJbhKG5O17NHkxxGPIR5CZQfeU0NXOShFRdvMyd8ONQkC6gWzKVTx+tvc7yb4TX; 4:CH0LnS96B7AlHggFRQKWpFPLeatQPCyoolGt0e71VAHBKhHzfgUcT+EmEwU5jy+6UCslLtuJPFVvyvHRi6BIxKuqjFMQgvYPMxSx2ChEpgexCAftE5/YRAPrp/k02bQIwBcaLSJU8h0AOg+XqAyVxVsngFjMVJeSEyCXtMm9p3QQOPTH6HzWL1HR8Im0lnblvmfJtFZH+KWB201SrH7P5IXRc0LQe8BhuNR9t5m3qsiJFQ/fT4KUYPCrs4F66g4B8OWxCG5lKQKgbee/kX3TvO1YGqQYlcnR9QOOu3FFdEKU29dAdYkfhPAmF63Xq9Z5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:SIXPR06MB0607; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0607; X-Forefront-PRVS: 06952FC175 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(5001860100001)(5001830100001)(76176999)(69596002)(122386002)(83506001)(66066001)(106356001)(2950100001)(229853001)(87976001)(64706001)(4001540100001)(97736004)(47776003)(33646002)(86362001)(19580395003)(19580405001)(4001350100001)(50466002)(5001960100002)(92566002)(101416001)(23726002)(81156007)(189998001)(105586002)(54356999)(36756003)(46406003)(77156002)(42186005)(50986999)(62966003)(5007970100001)(53416004)(77096005)(46102003)(40100003)(68736005)(110136002)(5004730100002); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0607; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB0607; 23:mVl5/8/m1j0BnZoeRpQGLn1SAdhcVgxSiSMR1TmcO?= =?us-ascii?Q?LliHyly8+B234EYoJ3YW/DwNifFRNY0UdxyrOG4bcL1m7eTpqoNYiYj0RbfZ?= =?us-ascii?Q?qGlpF4gjlVrZ3iAgMUFUM8k2lgxJEy3/KIY6/GJ8UbzhfK6a9LWkCeh+nUrg?= =?us-ascii?Q?QcjmAUG8viBwsVNfpVnh7cRLlBr0UJOHnXNavzrLlzAqsetuZCGRcRf9NntO?= =?us-ascii?Q?xtZFu8x3e4l4d7dnc7t36iGLlZ25Ux6wjUZw1RuxCL95i5Jte3j4w+QUmrPr?= =?us-ascii?Q?WjlxcPX6nqV00fhIMWfcsQo79Z0T+pRdfhONKk/jNbfmFs5vVPRlOB0Cl8/H?= =?us-ascii?Q?aQ1I86xJm1/xf93tPcV9czGPWqjXHk74BWMraDY2y33bHr+obTzecEMcihxr?= =?us-ascii?Q?uQe4KFBIC9R+SC/DbQFGsQct7SN/8r7EYJtiMqNDRfgaxrIQtclmpx40IquO?= =?us-ascii?Q?Yy8C34Q4JYvScO8q3lIFjRDYYAo217V68pANP7e9BV9vPCjNsoNJ/limwZ/6?= =?us-ascii?Q?kOhyoThKtOzQn/lLT35mg0ehIifsIH4Y9TA3iOB2ON7f+qUDMj3lH0TI6lrI?= =?us-ascii?Q?jPhq76VkBpgpaza7fVitqh6GMz/aeaLgpvyCkwEuK+PIm2/10KGkrSraimpm?= =?us-ascii?Q?hFhSIe2A6zd5f9tk/ZOkJf684WZZJQ1DcmDlWmsVdvck9Y0pfA0v70/4Ay0V?= =?us-ascii?Q?x933MPe3KzFRU5zMQYM+wl+clz/l/9xpR/pvApvRvoGTat08THJvom6YCnx5?= =?us-ascii?Q?Ewll6EvTRSLtvymt2MCFw197CTmZkLkU/UpMYy6+iVPpWVPIhbqNmQ0XWuh5?= =?us-ascii?Q?KmOBfIexK8rqrLIyWl9ZGIj0ZV28WrCe8hItsIrAwx3CNrAznxXALmWu09yo?= =?us-ascii?Q?c4sX36rJbEpmBflZoQqdW76GpX4XeYhkVj3HFAjKG85EsEpamxtZG10nJs0I?= =?us-ascii?Q?WAWdqGKhH8d8fPAXT5HZeduJEOV3BQ0NR5EW/xehQyxQMCiLfeuw09/Tlyv8?= =?us-ascii?Q?+JrJtota7d0Ssk8taZtyhxJu2r+E/HwanhFJmBI2dbQDOwMhbpfQdfWfWlnG?= =?us-ascii?Q?UtAV/W1V4RHta7ol/XWcDP978pmok6AgiOx1WIUxdlPs4TXrsS55sT0NquP8?= =?us-ascii?Q?gE4t65iL7AXd+M2+CP2YB7gNTMstvBlf1UxXnmP6bV+JXDbELi4xFbJbmuLC?= =?us-ascii?Q?O1M2hCj5vYk7jJFdmDbi455RBwOB5Ox8hBLxWgi+VYhqVDL0CFvev5f4UVoZ?= =?us-ascii?Q?1Q2kJizrVRc+uSHCog=3D?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0607; 5:CVxzo4q6dhQAxZ4OsU6TNiEOG+ZlkJYN+QVzbdof75wXmwloLS+e5DgGfgHlMZjNIsFp0e3xCbVgXgffa7exC8SFczQ5bjrVbbxQBbYZE+kTi2Rpm49c1nwWVjbNRPlcdgY2tCjahoZIbtsEniCLTg==; 24:DfJg37fIBjfnvU2lWyeqWiFNt2TqdXQVkPZgMlk821IzfeuEhRiwXFC6knoEtu5kqYg9C8il4CU9oVfLLsrNQuOorK2/Fz9nUbG3+h5jS08=; 20:NfSJ/V/xbS6gEM5ce+WZ4NyH7FUuUTDx+YhD3ux/6ODLmSa5+kKKhEZtN27tEWTVfJnZEphMxzCUejB4T0sH3WNVsb5U3PJfOr0N+cDSM92hawCNALnxrd/96RseSyLo8HTLpxEuak0D6IdHDE1qigfqD92RZeYmvdkl920uCko= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2015 07:04:45.4270 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0607 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 9/9] ASoC: rsnd: add AUDIO_CLKOUT support 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 From: Kuninori Morimoto Renesas sound has AUDIO_CLKOUT (in Gen1/Gen2) AUDIO_CLKOUT1/2/3 (in Gen3) This patch support these patches as clock provider. Signed-off-by: Kuninori Morimoto --- .../devicetree/bindings/sound/renesas,rsnd.txt | 3 + sound/soc/sh/rcar/adg.c | 98 +++++++++++++++++++++- 2 files changed, 97 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index bf6fd1a..c57cbd6 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -34,6 +34,9 @@ Required properties: see below for detail. - #sound-dai-cells : it must be 0 if your system is using single DAI it must be 1 if your system is using multi DAI +- #clock-cells : it must be 0 if your system has audio_clkout + it must be 1 if your system has audio_clkout0/1/2/3 +- clock-frequency : for all audio_clkout0/1/2/3 SSI subnode properties: - interrupts : Should contain SSI interrupt for PIO transfer diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index d4fb11a..3fecb87 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -7,6 +7,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. */ +#include #include "rsnd.h" #define CLKA 0 @@ -15,6 +16,12 @@ #define CLKI 3 #define CLKMAX 4 +#define CLKOUT 0 +#define CLKOUT1 1 +#define CLKOUT2 2 +#define CLKOUT3 3 +#define CLKOUTMAX 4 + #define BRRx_MASK(x) (0x3FF & x) static struct rsnd_mod_ops adg_ops = { @@ -23,6 +30,8 @@ static struct rsnd_mod_ops adg_ops = { struct rsnd_adg { struct clk *clk[CLKMAX]; + struct clk *clkout[CLKOUTMAX]; + struct clk_onecell_data onecell; struct rsnd_mod mod; int rbga_rate_for_441khz; /* RBGA */ @@ -34,6 +43,11 @@ struct rsnd_adg { (i < CLKMAX) && \ ((pos) = adg->clk[i]); \ i++) +#define for_each_rsnd_clkout(pos, adg, i) \ + for (i = 0; \ + (i < CLKOUTMAX) && \ + ((pos) = adg->clkout[i]); \ + i++) #define rsnd_priv_to_adg(priv) ((struct rsnd_adg *)(priv)->adg) static u32 rsnd_adg_calculate_rbgx(unsigned long div) @@ -416,14 +430,25 @@ static void rsnd_adg_get_clkin(struct rsnd_priv *priv, dev_dbg(dev, "clk %d : %p : %ld\n", i, clk, clk_get_rate(clk)); } -static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg) +static void rsnd_adg_get_clkout(struct rsnd_priv *priv, + struct rsnd_adg *adg) { struct clk *clk; struct rsnd_mod *adg_mod = rsnd_mod_get(adg); struct device *dev = rsnd_priv_to_dev(priv); - unsigned long rate, div; + struct device_node *np = dev->of_node; u32 ckr, rbgx, rbga, rbgb; + u32 rate, req_rate, div; + uint32_t count = 0; + unsigned long req_48kHz_rate, req_441kHz_rate; int i; + const char *parent_clk_name = NULL; + static const char * const clkout_name[] = { + [CLKOUT] = "audio_clkout", + [CLKOUT1] = "audio_clkout1", + [CLKOUT2] = "audio_clkout2", + [CLKOUT3] = "audio_clkout3", + }; int brg_table[] = { [CLKA] = 0x0, [CLKB] = 0x1, @@ -431,6 +456,20 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg) [CLKI] = 0x2, }; + of_property_read_u32(np, "#clock-cells", &count); + + /* + * ADG supports BRRA/BRRB output only + * this means all clkout0/1/2/3 will be same rate + */ + of_property_read_u32(np, "clock-frequency", &req_rate); + req_48kHz_rate = 0; + req_441kHz_rate = 0; + if (0 == (req_rate % 44100)) + req_441kHz_rate = req_rate; + if (0 == (req_rate % 48000)) + req_48kHz_rate = req_rate; + /* * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC * have 44.1kHz or 48kHz base clocks for now. @@ -454,22 +493,72 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg) /* RBGA */ if (!adg->rbga_rate_for_441khz && (0 == rate % 44100)) { div = 6; + if (req_441kHz_rate) + div = rate / req_441kHz_rate; rbgx = rsnd_adg_calculate_rbgx(div); if (BRRx_MASK(rbgx) == rbgx) { rbga = rbgx; adg->rbga_rate_for_441khz = rate / div; ckr |= brg_table[i] << 20; + if (req_441kHz_rate) + parent_clk_name = __clk_get_name(clk); } } /* RBGB */ if (!adg->rbgb_rate_for_48khz && (0 == rate % 48000)) { div = 6; + if (req_48kHz_rate) + div = rate / req_48kHz_rate; rbgx = rsnd_adg_calculate_rbgx(div); if (BRRx_MASK(rbgx) == rbgx) { rbgb = rbgx; adg->rbgb_rate_for_48khz = rate / div; ckr |= brg_table[i] << 16; + if (req_48kHz_rate) { + parent_clk_name = __clk_get_name(clk); + ckr |= 0x80000000; + } + } + } + } + + /* + * ADG supports BRRA/BRRB output only. + * this means all clkout0/1/2/3 will be * same rate + */ + + /* + * for clkout + */ + if (!count) { + clk = clk_register_fixed_rate(dev, clkout_name[i], + parent_clk_name, + (parent_clk_name) ? + 0 : CLK_IS_ROOT, req_rate); + if (!IS_ERR(clk)) { + adg->clkout[CLKOUT] = clk; + of_clk_add_provider(np, of_clk_src_simple_get, clk); + } + } + /* + * for clkout0/1/2/3 + */ + else { + for (i = 0; i < CLKOUTMAX; i++) { + clk = clk_register_fixed_rate(dev, clkout_name[i], + parent_clk_name, + (parent_clk_name) ? + 0 : CLK_IS_ROOT, + req_rate); + if (!IS_ERR(clk)) { + adg->onecell.clks = adg->clkout; + adg->onecell.clk_num = CLKOUTMAX; + + adg->clkout[i] = clk; + + of_clk_add_provider(np, of_clk_src_onecell_get, + &adg->onecell); } } } @@ -478,6 +567,8 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg) rsnd_mod_write(adg_mod, BRRA, rbga); rsnd_mod_write(adg_mod, BRRB, rbgb); + for_each_rsnd_clkout(clk, adg, i) + dev_dbg(dev, "clkout %d : %p : %ld\n", i, clk, clk_get_rate(clk)); dev_dbg(dev, "SSICKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n", ckr, rbga, rbgb); } @@ -504,8 +595,7 @@ int rsnd_adg_probe(struct platform_device *pdev, adg->mod.priv = priv; rsnd_adg_get_clkin(priv, adg); - - rsnd_adg_ssi_clk_init(priv, adg); + rsnd_adg_get_clkout(priv, adg); priv->adg = adg;