From patchwork Wed Jul 15 07:16:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6793891 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 CE1D79F2F0 for ; Wed, 15 Jul 2015 07:36:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E838B205E6 for ; Wed, 15 Jul 2015 07:36:04 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 893CC2057F for ; Wed, 15 Jul 2015 07:36:03 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 7559C26585D; Wed, 15 Jul 2015 09:36:02 +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 C8F4226587B; Wed, 15 Jul 2015 09:30:24 +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 5E6AE265891; Wed, 15 Jul 2015 09:30:23 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 458382658DB for ; Wed, 15 Jul 2015 09:22:42 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 15 Jul 2015 16:16:41 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 4B43650EFB; Wed, 15 Jul 2015 16:16:41 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 47D0E1806F; Wed, 15 Jul 2015 16:16:41 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 40AD71800A; Wed, 15 Jul 2015 16:16:41 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id SAB01862; Wed, 15 Jul 2015 16:16:41 +0900 X-IronPort-AV: E=Sophos;i="5.15,477,1432566000"; d="scan'";a="191576517" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Jul 2015 16:16:39 +0900 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from morimoto-PC.renesas.com (211.11.155.144) by SIXPR06MB0605.apcprd06.prod.outlook.com (10.160.237.147) with Microsoft SMTP Server (TLS) id 15.1.219.17; Wed, 15 Jul 2015 07:16:37 +0000 Message-ID: <878uahvqop.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:16:37 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0026.jpnprd01.prod.outlook.com (25.164.162.10) To SIXPR06MB0605.apcprd06.prod.outlook.com (25.160.237.147) X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 2:eV/Fm5CJsLAydTwZHtfAREpiurx2og7ukvtWIjhMv9peqPVwUdijCQig5vfF4j/U; 3:f1/zP9XKLZnOAdkuS3Wr79YvaMVIq2lLj0F0bq9TSn1rFhT6YKoEerboj0PxfZcM+5fCarXbSqM9A3ZwYZ7nQKGqEnq8G/QQ71NUWK218tZ/JuG/F8Q5Qek0UxREz1i/bwE9eR+MkULXV6cLFHovZA==; 25:2LPgF0fgg3I4kwqwNpyBbM+YdmavGQUiQnkU7SwThpAHnekZiw4hgeoh7IWL3OHJloRgS3HpDp0X022gL+IOlpHcGeKedrdkIys6SSbgJm60efq6SJ5jRL/CWqR7fcKuYp7ZUDmaBn6L9PivLO5xW9HqKKuOm/JFipY4mapAjP7AEhB8iRP1p09QePEsShzMtjJOzr+5X8Pea1fA0GoY4Y8vRAo3zcG/oiFMzBZKTxK081iD0OICm6qah+q5ExT1 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0605; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 20:VhUlBv/X+euPcCyaYUBFFXGWiTUlx5Oon0/mfJkY/w7gwNgl1iFLhYPcQ4VLMqDM2NTUJqNr+ey4Mby8lhkJDs38ENRN2wUBvOPH81QpQ3V99qykHcOoEJyKuD19l15K8cmdNvaJacgE6LCgqbbX2N56S0GkWxKmAhnGGjtqme3Ib1Es4PK4WDqxPPT06k6L9d4FyDvTGsaMjYU/GyoUFK60ZxIaqHaXRMgn2S2STiEcxQpGv2hy0ur6A7Of1zoxpn72mtvtQA2ukKLi6/oBMSqJ7kDXol9Prby7J0gpn2DunRVaPrABZZQH5NzJBqLAAbj4FptEB14dvudTZbwDJ5ZG0bI3N6q4yPCvgGXZ5fLIVhZa0xjLJ5qyNFNg1OQ89i2j+vhwqCZ0gE49l28wbKMukrnfmjKXYaUbyn0KvexbzgwEFizJl7s/U7EjVKW6D34ykFrhGU1QE/2G3j8jNmLnOyPXM7tH+Ft9NXMs05hRC8qwWdafojQDrsetqPn8; 4:QQj352+pOuxR/4qhE5tuLaZVCY9tCSe6owExvGMs6ua3umSLE7YqO0hJvR+SI5kPKvSaf1KkErkn+iBQkdvSBOXjn7uYkHVdMIS6hmiwpQD4kgWKQuAE6famXuOoLxzxZ9GV18LEBSEokr/KnPg/hIQtI5/a7c08SLzmDLcfCs1bc8Q3dtHeCczfZkl2gjfXTapaRBHnT0H0k9IKwugPKJyU/QOWJSKaI7SHjaqJpURKJLAXKX97j/kyFU3zOEJY7JZ8Fj446zzRsgkPZPsadwd38RzZUaYd35Od1g7i7Kc= SIXPR06MB0605: 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:SIXPR06MB0605; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0605; X-Forefront-PRVS: 0638FD5066 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(110136002)(47776003)(189998001)(5001960100002)(107886002)(5001920100001)(66066001)(4001350100001)(42186005)(36756003)(53416004)(50466002)(77096005)(19580405001)(50986999)(19580395003)(54356999)(76176999)(33646002)(2950100001)(46102003)(40100003)(229853001)(122386002)(92566002)(62966003)(46406003)(86362001)(23726002)(87976001)(83506001)(77156002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0605; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 23:OH5dRVEGNBRVQ2oKf25qDNNFekXb4/OntyNxcxBtBFVyXHyScUOVZjq/RAA8ZOljpb3vkyzzuoQMp35S7IquyYztEDUFHHWg+pQEo5fYGO3HQGF85yJHssEcvyu7/k45NSkbIfcdTq5zkMQSjSbf4c1zTiinTd//M8S8F74X6LSMARFatJLFlignwH4HNTNBMMvX2l2iA+dQzA06Sk/3UFGR3jTWW/Cw97ZcRJNx11inoIY+gx8Jkrx0ZUDTllfU0uMi4lThVPwU90+1S+OT2DxtKokwlhCFVofIb0ySiStjwuL6yfEDkO7NPNAojTbHNfayluYdxuT5ZzeX08kI6ZAzKtOgIrJ/V/oZEjdNqvJ2W+j6oBIGfWQSjzXLUmpoyZwJ6uefJmTMd9m7Nt+60m83ThxrJzLsfiIt8jj00IVjJm+vW0WIlTQCO25J4KbLn0C07nJ16Y8swmChgtcpjEPUdo+suFz4cueyF1uUUGAaRz5rF4bAfys23fO5bBFJmdFLKNUZ1GfULtuXunBDiLUy/EbEpiCnN4DUrGsoOxG+ex2Yr5iYhCl1ZdWJGXRTDw/wZe7nCCqZXk+FSEdunR1thqJfvGdvyduyl6t439Ve2Ae7bBHzqhWCuU/4owpCyFNlWSKZCSIwYWSYqiPmsHkoNK0MBnFdnt+7UBwiQQahcoOo/YasaTnZvNaUoY3yohPv5VYj0sUxP3PvQRhyd9cslM+ObnkzltcrkmZ0UT3N1CCuVfLom0RtUOfDnL17q3sV+GKXCpZcZJQMYgq6AYKvY/jZJ/hXnbsQb/9/AK1nNx7rGKDNF6VXNdM46MWmttMO/4gxpHkFwo4075hl0To6dF41YrjxGIwZikxiDalHwCMBoCxJe7m6PTWgji/gh5DyXp2+8WzzX3MhBbDXKQEdQR+agiBE2uT4pFZKAB5dNV3Q9jTsZNIq/ED5nJQF X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 5:YvwazgT+hV0NEronUKW2CAgw2xuqZxUjEt9nd6kj3pTFhV/kvwBdxCgahWVNdByIX7vj54GJkrRIw1fbahBWQgToqewxCYFU8pswBBd7WlVObQLOCuCShXKbSxAeosks8pZjXjg2IeCkILfaeWlvSA==; 24:I3G3lExvF+/amekMEOCjM6D9GOxOqPHB9iqEgtQ3Y6iSlwWXybHQyOLvJbcuqumxOXWPc4jstjeQWigbE+x256gHyS/hlVoFC3uspq/c2fg=; 20:IcgaHXOu/1QMaW5m7n3DimAidfEoPiFBRMZbilbbBUiX4LYOERPN57UBxzYCKlCs5elt/XgGG+zXNJBOmIyRfjPW+N5garCC9Hp1cBmDUAAGjklEiCu7E7NHs9I+KNxCwNFChqKgZwebz5hUHiZFo10jSRv+TwG667OS3peTHn4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 07:16:37.4545 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0605 Cc: Linux-ALSA , shiiba , Liam Girdwood , komatsu , kobayashi , Simon Subject: [alsa-devel] [PATCH 28/35] ASoC: rsnd: tidyup SRC position on each code 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 This is cleanup for CTU/MIX support Signed-off-by: Kuninori Morimoto Tested-by: Keita Kobayashi --- sound/soc/sh/rcar/Makefile | 2 +- sound/soc/sh/rcar/core.c | 8 ++++---- sound/soc/sh/rcar/rsnd.h | 38 +++++++++++++++++++------------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/sh/rcar/Makefile index f1b4451..3a274fd 100644 --- a/sound/soc/sh/rcar/Makefile +++ b/sound/soc/sh/rcar/Makefile @@ -1,4 +1,4 @@ -snd-soc-rcar-objs := core.o gen.o dma.o src.o adg.o ssi.o dvc.o +snd-soc-rcar-objs := core.o gen.o dma.o adg.o ssi.o src.o dvc.o obj-$(CONFIG_SND_SOC_RCAR) += snd-soc-rcar.o snd-soc-rsrc-card-objs := rsrc-card.o diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 8919afa..e20d8ea 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -641,13 +641,13 @@ static int rsnd_path_init(struct rsnd_priv *priv, * using fixed path. */ - /* SRC */ - ret = rsnd_path_add(priv, io, src); + /* SSI */ + ret = rsnd_path_add(priv, io, ssi); if (ret < 0) return ret; - /* SSI */ - ret = rsnd_path_add(priv, io, ssi); + /* SRC */ + ret = rsnd_path_add(priv, io, src); if (ret < 0) return ret; diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 5f5b8b1..7fee207 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -441,12 +441,6 @@ struct rsnd_priv { void *gen; /* - * below value will be filled on rsnd_src_probe() - */ - void *src; - int src_nr; - - /* * below value will be filled on rsnd_adg_probe() */ void *adg; @@ -463,6 +457,12 @@ struct rsnd_priv { int ssi_nr; /* + * below value will be filled on rsnd_src_probe() + */ + void *src; + int src_nr; + + /* * below value will be filled on rsnd_dvc_probe() */ void *dvc; @@ -535,6 +535,19 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod, u32 max); /* + * R-Car SSI + */ +int rsnd_ssi_probe(struct platform_device *pdev, + const struct rsnd_of_data *of_data, + struct rsnd_priv *priv); +void rsnd_ssi_remove(struct platform_device *pdev, + struct rsnd_priv *priv); +struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id); +int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod); +int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod); +int rsnd_ssi_use_busif(struct rsnd_dai_stream *io, struct rsnd_mod *mod); + +/* * R-Car SRC */ int rsnd_src_probe(struct platform_device *pdev, @@ -555,19 +568,6 @@ int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod); int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod); /* - * R-Car SSI - */ -int rsnd_ssi_probe(struct platform_device *pdev, - const struct rsnd_of_data *of_data, - struct rsnd_priv *priv); -void rsnd_ssi_remove(struct platform_device *pdev, - struct rsnd_priv *priv); -struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id); -int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod); -int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod); -int rsnd_ssi_use_busif(struct rsnd_dai_stream *io, struct rsnd_mod *mod); - -/* * R-Car DVC */ int rsnd_dvc_probe(struct platform_device *pdev,