From patchwork Wed Jul 15 07:14:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6793781 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6B09C9F2E8 for ; Wed, 15 Jul 2015 07:23:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DBA6205B5 for ; Wed, 15 Jul 2015 07:23:21 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 3BD1920585 for ; Wed, 15 Jul 2015 07:23:20 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 23E99265DB9; Wed, 15 Jul 2015 09:23:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=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 266D326588E; Wed, 15 Jul 2015 09:17:46 +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 9DD532659EF; Wed, 15 Jul 2015 09:17:44 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 51FEA2658E7 for ; Wed, 15 Jul 2015 09:14:10 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 15 Jul 2015 16:14:08 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id E977550D19; Wed, 15 Jul 2015 16:14:08 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id E620918070; Wed, 15 Jul 2015 16:14:08 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id DC7991800A; Wed, 15 Jul 2015 16:14:08 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id SAA00695; Wed, 15 Jul 2015 16:14:08 +0900 X-IronPort-AV: E=Sophos;i="5.15,477,1432566000"; d="scan'";a="190394948" Received: from mail-pu1apc01lp0019.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.19]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Jul 2015 16:14:07 +0900 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from morimoto-PC.renesas.com (211.11.155.144) by HK2PR06MB0596.apcprd06.prod.outlook.com (10.161.187.147) with Microsoft SMTP Server (TLS) id 15.1.213.14; Wed, 15 Jul 2015 07:14:05 +0000 Message-ID: <87k2u1vqsx.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: <87d1ztx5pb.wl%kuninori.morimoto.gx@renesas.com> References: <87d1ztx5pb.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 15 Jul 2015 07:14:05 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0057.jpnprd01.prod.outlook.com (25.164.162.167) To HK2PR06MB0596.apcprd06.prod.outlook.com (25.161.187.147) X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0596; 2:x5c0WX2U+qe+auetM4NZcocWbNCaMUmwlce4QlebaAkgwqQkhmmEfFeeOV3d8pyB; 3:DEsPFCXaQg+tuSAZLed0kivNMJWxAETsPpxKx1VKa2O+yEb6x6/WGTRHx+4pIZdi4XASzb/jTO7yMCmjnAUeyLGkXTd5Di71LAAyu6YLh2GdXsLIDt1Fx9DnYe8tWAbByYzO2nys6Tat288+E+U1vw==; 25:yuwi0n6IFx15gEoPldb4+1m3ltJcEAdihfw/o2XRmUqCQRiaEEG56lRzXByG9zQSfASdHOlsREklFcPzH3FEDvjne/B+PrJGc3b2ca5fi5vd8q30Oa/qWpoAGucoEGtB8AAomOj5RRCiszd1akkFco0/XfbIXgmBl7I2eNNLL3t33aDRzpW386YVFvu+fmu+Gooh9upxTi6+15lwsZ4BOEvNKVqiTcz/LgkaelWOqM7EAOw6f23chzSQeiK++6Jh X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB0596; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0596; 20:nmlCVgCWCw+OAuKDISJqk5NZ2+YITiZkO0M9uGpDxjxS69Jz1sMr/tYqcpizL6Wlbvu7icny0qu36IdFpeV/ZL8R8H2/0IEHz2UZUG2TJP4B91kDaM3YHAFpvtF0fYC8g9jsErlDP/XOulhPGv5E0SsCoEon8Qx15i+EhCl6Q7hb/KQq1Gn9eYeOS31j9TtqLQM167ypEBnwOEb36awGz8XGs05esPzw1ZTMKwowcujfmyqQd+MJprVm4tZgKux4w+PPmWEjOQF8Ynt6G90UYLsPjOe8O1kwSBdtyk7b9imenVw2elkqpIU9QZjj27aTBjhQGqTwzXJxjG6k09aNdDT9pjKFubfcF1gEAJDqMroPEpFWAjpNtLpidCIcpARhksplVBwApU8D/ujOM2vqvrzPMpN7oxEfHZVFwhktitF8d3N5NhHBJdTY4S4qa8QPfSN5+s8YLJWPF/kPFg5woiH0JQLoA4i+bufpMZ61BA9VrcFgTES3MhBG3haMtDMe; 4:Y2LB9SiGKXTddwPmEhO2OXgkW9Qu/6y+tZMR6sOTo0wE9FLUup6d/wrxNxwWZl8Le7FXVLsbZc5/LQwkp/qkCC+mig5oU8HyBZUklLf0S7p7if9ZUew7Kcjwzzi8y6KCM4bLwjz76y8T4CbmU4LwphOGe1BgFXXUooaKdUwjLH1eUg2GGbMBsBPjUvsGInFgFmF9j15y6C/SNu8HwdqAJcfUI4dDvczqo7Vk5kTcqI+EOVzHicgnAG0Th0Id9ctvn/PgqGq8H6n0VbAeLpzT7ZZti/7YSCzsJqLlptG1W2k= HK2PR06MB0596: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:HK2PR06MB0596; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB0596; X-Forefront-PRVS: 0638FD5066 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(36756003)(86362001)(53416004)(107886002)(2950100001)(5001960100002)(110136002)(46102003)(62966003)(83506001)(122386002)(40100003)(23726002)(77156002)(42186005)(87976001)(229853001)(50466002)(19580405001)(46406003)(92566002)(76176999)(19580395003)(189998001)(4001350100001)(50986999)(54356999)(33646002)(77096005)(47776003)(66066001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB0596; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0596; 23:hH2yyqraaiYn9gq1PnD8IHdMwThNZpnvrq9yAvO6yAyDfIEvMKxCLhGwJhuGzjB/rNL/k7+Lf+SSqv5cIA6IXLq5ubGnYfbbdtvEEGXq+Niw43H3LbDAECXHeSiNb6sRlTdAU6ze7DZlc7AYLfMnTzRikIRNuKqyGG+y8FhxJNuz06pW0grhqBzVTYrFox1JGV+LBs9NPWEcw35xEsaXuKjSG8oZA8TYzNQKttVznq/UVnQkqL3IwEbYv0h8V9Zlg5wo7bFMmdv8RAPfVLCrDF8//ebcqBk3Ex8aAeItm+FFbMcLF1zibbvtVMjFQaxPbgs13adwnddOU1VKjkFi4GVvMSKzZKh9ontkdon7mxqXNdLMPBn8Ool6GC4tWKwBcn51WFeT4QA26P9NJ2v4qduHO+RBtCKFqLpXuy+LdracxxJYZ7cTVQVQU1fQciZByR9nKqkxWFmrL/AMr4zjBM20uSnY8VT5/9FaRCeK5Fe4V8T9AkMLb/RGXZ/R0l73r2w9UDjCKeBhML/+Ut8BwL5whlLiQTYXwC1ogd+OPKBQrdqC0vBMR4YfYm0tBTHEv1WNoSTDFvb6d2GM+EXn6z6rlUepBQlTrHtN1txdK41KWIN6CDmRvJw9Y9xTQz1z+4YfGIg0g8CqSp4pDRsHrDF4dpImQxbtGfT2VA9Wbt7EvF17JLEik3N8+AzUDKIy8ORwhdzAzougqCOe2Hnmns4+qA2Aqna8YDxM3Fd2eXcjMhC7Fg52MFCKnEPWw4RWfeKlHNWDeyZMUAn4JUN5Npwb9OGTm97953YbMBOHFu2veP2HXAikCaK7Z6h7RTzfYOjp23rYu21zbx3WUx6UJcjggvXjKrwwkR9eWRitcChoOfPEqSZrDdgWrLkb+FSdz9Il0WQ4cjCCGZyLKtvuzg== X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0596; 5:J+9zN4R06wzQzKDi33QCgfqFC6iw6GOl9H0cXRciB5QZtW1ysIkSUHOPaLhO2ActRdoaDieEtQXGNOq4+lmzTAo3Si5+BHiPySCmNGEfGsKrCl541CfhT4fLJsHPvSUoDT28iwGKskalOtfpG3XqYA==; 24:AOo9R7FUhyfjy3cBbRFyRzpCdJFNmhT58dV6wBFoq1WuxbpZZDXY5sTL112n1fBePWs5GFvEeUU8+T/vNNDWZ8MFFCNSkWHnummmB6TMbb4=; 20:FKbRQZN79i8KB3/Vqn4OQZj+BLQZKkyANT/Gt2hEvSCR++eyVrNtW2H7+mtBgUAwz5oC/XK3AQC2n5HP1Nj9KNTpQh46wzSiKtLtQv0GdDhNA3FyF4ss04pAD/dPcwlXlY+M3OMHzF4RrDAj8tbXStrWaxRwSBbwqriRpWnJF+g= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 07:14:05.7134 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB0596 Cc: Linux-ALSA , shiiba , Liam Girdwood , komatsu , kobayashi , Simon Subject: [alsa-devel] [PATCH 20/35] ASoC: rsnd: tidyup ADINR function name 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 IP (= SSIU/SRC/CTU/MIX/DVC) have ADINR (= Audio Information Register), but some of them (= SSIU/SRC/DVC) are for audio data bits, some of them (= CTU/MIX) are for audio data channels. Current rsnd driver is supporting SSIU/SRC/DVC, and these ADINR were for bits. This patch rename rsnd_get_adinr() to rsnd_get_adinr_bit(), and we will have rsnd_get_adinr_chan() for CTU/MIX. Signed-off-by: Kuninori Morimoto Tested-by: Keita Kobayashi --- sound/soc/sh/rcar/core.c | 4 ++-- sound/soc/sh/rcar/dvc.c | 2 +- sound/soc/sh/rcar/rsnd.h | 2 +- sound/soc/sh/rcar/src.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index cb82067..0ca6d02 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -203,9 +203,9 @@ int rsnd_io_is_working(struct rsnd_dai_stream *io) } /* - * settting function + * ADINR function */ -u32 rsnd_get_adinr(struct rsnd_mod *mod, struct rsnd_dai_stream *io) +u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io) { struct rsnd_priv *priv = rsnd_mod_to_priv(mod); struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index 343d446..d06e4ee 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c @@ -161,7 +161,7 @@ static int rsnd_dvc_init(struct rsnd_mod *mod, rsnd_path_parse(priv, io); - rsnd_mod_write(mod, DVC_ADINR, rsnd_get_adinr(mod, io)); + rsnd_mod_write(mod, DVC_ADINR, rsnd_get_adinr_bit(mod, io)); /* ch0/ch1 Volume */ rsnd_dvc_volume_update(io, mod); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 6a87757..224a4a9 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -169,7 +169,7 @@ void rsnd_force_write(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg, u32 data); void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg, u32 mask, u32 data); -u32 rsnd_get_adinr(struct rsnd_mod *mod, struct rsnd_dai_stream *io); +u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io); void rsnd_path_parse(struct rsnd_priv *priv, struct rsnd_dai_stream *io); diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index b3d965e..c45da61 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -189,7 +189,7 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod, u32 mask = ~0; rsnd_mod_write(ssi_mod, SSI_BUSIF_ADINR, - rsnd_get_adinr(ssi_mod, io)); + rsnd_get_adinr_bit(ssi_mod, io)); rsnd_mod_write(ssi_mod, SSI_BUSIF_MODE, 1); rsnd_mod_write(ssi_mod, SSI_CTRL, 0x1); @@ -309,7 +309,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod, fsrate = 0x0400000 / convert_rate * runtime->rate; /* Set channel number and output bit length */ - rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr(mod, io)); + rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr_bit(mod, io)); /* Enable the initial value of IFS */ if (fsrate) {