From patchwork Tue Aug 23 01:34:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9294867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 02C9B607F0 for ; Tue, 23 Aug 2016 01:35:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7DAA28ACF for ; Tue, 23 Aug 2016 01:35:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA26E28B32; Tue, 23 Aug 2016 01:35:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C97F728ACF for ; Tue, 23 Aug 2016 01:35:23 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 094F4266C76; Tue, 23 Aug 2016 03:35:23 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3089D266A79; Tue, 23 Aug 2016 03:34:49 +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 6D770266A79; Tue, 23 Aug 2016 03:34:47 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 6DF97266A4F for ; Tue, 23 Aug 2016 03:34:23 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 23 Aug 2016 10:34:21 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 6096C4E59A; Tue, 23 Aug 2016 10:34:21 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 50536480A4; Tue, 23 Aug 2016 10:34:21 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 49149480A3; Tue, 23 Aug 2016 10:34:21 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id LAF20984; Tue, 23 Aug 2016 10:34:21 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="218390608" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 23 Aug 2016 10:34:20 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=DUo0zOfbFgVgxwICY03snPIqcIsmVsloazO4jBkjcYs=; b=ACHvOwMiLChmuRqMDfmz0wZME9WGe+S6kAgS4Zs7ldlf8OVThYbNkuweDxkX6hWpsGRv0t71KaDUkisTHD3EDinriAtUkLjaAnwu6cTlVVXblWHdoerVoI5YTKgjW4vlN0zgKzz2IA8BqwT0wGgDr15wq6fKqdN9ETrMs9/Mjkc= 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 SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15; Tue, 23 Aug 2016 01:34:17 +0000 Message-ID: <87bn0ki8d0.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Mark Brown In-Reply-To: <87eg5gi8f4.wl%kuninori.morimoto.gx@renesas.com> References: <87eg5gi8f4.wl%kuninori.morimoto.gx@renesas.com> Date: Tue, 23 Aug 2016 01:34:17 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0040.jpnprd01.prod.outlook.com (10.168.40.178) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 59136402-b195-48f3-3a88-08d3caf59966 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:ym/4CFlRNikzu5C+z4LyLGgScvT1VTG8wF95iUcPqoB9ayLzRBP+ljtBLXnDfs+Sfs8lpZTwBlvQDR3LXBYVhRLAk5kGnZuWklDSrSsgJqUDgniAdrz7osJgnLz47pDi0g72XeNNnOJR1dVSvpuulkj7Ghkh59ZUkYt1xgGDD9/6YYfvKhL/J4/lw8FvlspZ; 3:m4MqxAAp2Frv2umawazXUzwr7zpshSFVrZ5K2to4yX/TebzkH6a9AoIcjWO7sC7R9kH+Elpo8Ei+mAe7gp/Uehvz8JhStEnfMtsJ9VY1kJFzP3ayrs43XKc5lei5UVkG X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:Rt0VCCnR3ojs6MayJbgQ0L5tjykZr3k3nAxxvI8CU/ICYr2i5p/0RiIgYMpCxKGjHO5mFt47d2mPRfENqfxuAMh/FTrjW3SXC/RCpF0auQ3ppeB5R4tqPlrT5VyqZyFHUpQ/3nr61Rlle5QPNN0DLDxHU6ptAYpUp9g5SkelRVDzayQ6ssCUizpWPeiJzHebWlIWpC7Vf6ew6AP3fqwxNAp/QglWq0Ymgr98CB5NPuaTrAwLI+MsJ6kOtoejut6TEzFofEE/pFQS+t+/GY4gDq9JLqDgmGH8oBraxJPzJcCf7STyk5HVb5YFzqrTTBm/UAvJ0ADcsJFe5KXm38Fd0C32ytd4opRrCNCi9WNnXTx6uAzCgiZf3QNGz6jovJRamHAn2QzklgmBFjaP8c7qmKnG7wsxqTpeIK0KUjghPCr1Fvz2tUiajABLh9qRiUEtFYRJ34xVMQjAq/HeCrHJgMgM4pYw7JWRgwKyTw2RZf32mUJpgeHGrhxrS1QDHMna7o0vWZjgpC4TyVzuv9QnyL/8RN/wuuyJ2nHJYwO2ZMGWcRh4JUdya4r/L7Vlu6Hj2sRlGAz4J2H9Pf0hIdOvDXMDWJAo2JhjLu711qJGntrKjsYqCPoW4+7KuLdca2dpmtReUO+yX9vCQi1gybl3gbD53etft44jNzTR/sh8R5AWYnjvXsEVK/t6iQ1WTb1E+hOJ06miML6/Vy407jOOWn+pIpPpAGgaJTIEx4cpnDA= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 31:sNciLnANKNtgkJ6P+L3wAoav4/K3iHjhNcAyWfqI+BJPCBansMZoynHD4kvI/ZJtVO3tzmMZmmVeIGoMiHt45EgmpoPWh1R0/Pm7bZnSagDs98ssIlU1mPmKO3oXWr6ryBJ3cv0cnBPcyzHBBEMgtvC22gOKmc3HUJGBrMFtFEPSjsFqCz3W1dMzR07FN8/nswbkACQoeyZvdkUU9gyVeL79NTawrgEEx/TZPK2LDKo=; 20:mzStcY158D/Vu3wYPhbmR8vmUpJu/0WcGN5BTNHbQnpqBuOqD3S6FzuwxFmSCu10yHudftqrixerHeGji4bMJHVCYZneiyUpAagutgQOo9fXQjddHhel9MnuboDbeVH48k/1ie/1cchfepKVSaLVB1JDmNLPU0ACHZzMI3hlKEmUACIoOfLSJelVwqyPLYhWhnuL/4VfyS1oCYONiKZVPhiu6tbSP3Zv8G+cOR2y5VJdWOUObNlsqX6qthnBE5w27javHyYgF9MbN+yqfKP7OCmgnrd6SgGnYjXEE1Z76azXc9kDCI3tPWXVmIxB4ycN0zEv6LtlMDMbampF3femtKMaT4L456XA3JKojS5HQ4PQU5ggdeBMX4mxvlXh241XCKDkMUD0Sbuc67GBtjv6QaEf0xvL5GgnbSFkFJ9iUW/X1D3CFo+HVTvg2gixaaKtNKwBaXPK7/jOKwF1NlukIiTO95Fq8rKg9PBrb45X6jOySiIyMrLEaVDO/U+NVliV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:SG2PR0601MB1453; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 4:z+DIGnNZgxEtA1VgP7jlqqibuP2R3BDVVyIjA4xr3O+i8SWoPKyl70g3oALixOaRzCiEHzrEB1gKTaojuSCb+aT6ddDjwnG4LkhHC/48cqBQ48ppkEjqkcs5zkNSUtLHFV0fGbzsRx7SV4PsJnW8J5+HgEM+AUJv8OKkJsLbq38jrYe/3tkhL5jacc/HDb3k0zk0m5oj2oxHeECrHxtf8ASrhagW/l+zySKtJCbfM9LPtKDih9vC/WH3ATYmA6t42RLOzPzGzuyScM+Otjhnk9qjD2Qw+tjIF932AKOQxV8KqzJrhee/xOaCkPNngoP1qrrn7u46OHSxIqO/YCuA7jgT3ss8HGECidJ61HrhzrZ3pdu7FhwRXnFNDKRBY3S1wtQcBviufd6J/ONggwC1Fmjij53v0NkUZhkBZ0ETIQM= X-Forefront-PRVS: 004395A01C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(83506001)(68736007)(19580395003)(19580405001)(33646002)(69596002)(229853001)(77096005)(189998001)(50466002)(106356001)(110136002)(3846002)(5660300001)(86362001)(6116002)(81156014)(81166006)(101416001)(575784001)(46406003)(8676002)(2950100001)(66066001)(47776003)(23726003)(97736004)(4326007)(2906002)(4001350100001)(36756003)(54356999)(42186005)(50986999)(92566002)(53416004)(76176999)(7846002)(305945005)(105586002)(586003)(7736002)(230783001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:F0Li6N2a4EtVv5iLZo0tuMFQr6lveKaR2TJB9uM?= =?us-ascii?Q?9d9o67BAN9QOfuoNDXJOAzzHWZZC9UrSFZKKUyl6vlXDqs35DCMIHwXe6OKZ?= =?us-ascii?Q?A0NYPL145qI9VArqa8GHvD4ChRdX+uL67ZP3eYCn/sFM7eiJgZGNfpBklV8U?= =?us-ascii?Q?rAEkOdUUYkjVa918NB7mtx0DVFi+LVhIF6kpcpkRGEnfV9f5k82c/Z9uAxpD?= =?us-ascii?Q?S2HkFqnbcUa1Cjz2M2lxQGdhKQgy2iPZoM/ymWdsgrtcVvZpiKJDKkCwCCal?= =?us-ascii?Q?nk5t87DxxOcvbXIc8bKbX04KfNdYUGs/6nW8CPeNE1+1Ae0LqjdX5CBO/4+f?= =?us-ascii?Q?gQC6j0GrxG2Cyu/m/+X04h4sz3ADJGpZk2H4/IY0Olxq0P61MytKZv/2g9e9?= =?us-ascii?Q?Ea6/GMF6MhC+Q/M0SCMZoJHbLa5KyVj51uBKL+d4yk91hqD7thdxFLAzTi5x?= =?us-ascii?Q?KNF1Z7oxvldw0Mi+o3K0X/26McLM2KBn4eS9B3p0kVvibqWHJV4eWV1GAYrJ?= =?us-ascii?Q?DMoWstvUQn9hHh+XQhQ/c63jSbRcjp0yAy4qM/6Ffef+1q9h7Z23rnAwBp9M?= =?us-ascii?Q?V2iOpStitQk80PbW+FuWC5qPC9wpQ+EURCx3MNJ7nLMrDTLeWdHkmqPx21Zv?= =?us-ascii?Q?BjXd8RK0T1YA99Dz1qX+oi8lJS18ZxTzlxcbL7+mOphjvpvLiXYg+rB0iRh1?= =?us-ascii?Q?SOHeGMCnQ9Adru0lTHbgYtIUqWFdLLeaAbLnR2vtpsJGzTOArfuaHsiNYYvI?= =?us-ascii?Q?TKh1enxCZaB4sljhhXA4B3M8g0CEd2OQvIx7x9DRkHpQ03YWZZWEgX2eR2xq?= =?us-ascii?Q?LvKKvXte7xBcW/u8c7hmViOEWmLV8EaW/qZecQcBoA4B4kY/Yk31nLo4wa4N?= =?us-ascii?Q?JJnuk+O9Nv7oqtXBIOzehveUUNXB9jR/Qvfr6UDwFeMKxUiw0rrJTuMLPhYz?= =?us-ascii?Q?28A9A+4OlmdkezN8v01SnBRJ8doHrX9UETNHPcIqZ8lYjzX1qN5efTgUSzT+?= =?us-ascii?Q?iZmGnDL0/5+JZhEq1T1c6d//O+rudMMHAqJ0TJ49y+TtyBxt2vcyOyf17uDc?= =?us-ascii?Q?b79NDwlm5mHTp1uYSXG394uO/DDDCi90YW6JUxi4LfAmXkpbaLttuAtG3ur8?= =?us-ascii?Q?DZU1vBFCQImhuOmkRuEdsLD9azBZxrxRL9uV143l7bTuz6SPTtPjLTxl6ckb?= =?us-ascii?Q?alzd8k1111Z0eu6Z+ybOb6KZg1Gzb9b1LXTg3vdyMErGl2AjDrTGs345aTg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:V/uY6PJeIA/KBtDasGSGmdoasYDDnW16OnpzFPbmH+90p481FaNM7QH9muwn/cosTHEQKl2IM7+QZC154WM75Bmy2Xs0vu3iiTTmqZamWJ2pDdCk6ReaZIbZ8XhZBpzMebpc6XZtauAB2UYK5slDga79HRSxwea0XlYBlbb+ogCjmiqDsS72rspnyNnHOjK8OjdcPu32jCFMYR7rUcigIIkgWUeOHNJzxIb7WpGoAMUkrQVOPqX6+6c15WQhsVGAFTJNq2338MV3C3rgK2J9pf3IdX+B2O/KZNxyUC6GTjAGL0gBhjfRzgH2cUfGJOnmVYyfz/o+nPeqdLY/PTJbLg==; 5:swx9YujHN54owMLrhj4Veha7yOczjiqheq4omXLgj8pvWvTRkaU0gWTHU6MEuHVaGG855rdsZ53xxzTCA/XWAqf3XqAz/fpWV72ITvTWb1ozLomMq5VL+bg2NmRd1Qmda5gvlA8FrSE7l7WDs99exg==; 24:N+hlmLUhYdrszsRpp7uSgjeUAJZWIfU/BDqZuPLEmrsUV6P54OvgL7+qVCWDdkL9kQHrArqCGF/pjls9KH1abOsg8ybawZnwsrs4nZH9zgo=; 7:WOD4G5rq6OjYEflRMBv8g5SUYYiZyBXxhhWJ1XeWegoNqHDYktsEK5+QAziI/MgtbML9nEjVDGbLZ1Qf0EyD60SmMaSHK8iDgYnq+d0A6OhMyVHvDD+rXLL3/jhq3yiPhT1Ch4br0C/JkYKo1wPT3x1fA6uycmHt0gpV7X3sx6GLOvdVZ5p07cSAwV1o5bTdmpP0CfZPgqIkxtmohk1ZKpmd0XXdnckiJ7qWDDfDoDFn+y3/n+m7mJ9llv4i/OvJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:H5mF0I3QrNvrmLMtvR8sLnXJJfXALWmE1uaXIOxGo7TSPjEtq94yFSPsHHeQFJZYxhFD+HssmjdAtREidtaR4XBqbkREjgxqrbfnGvjCEUvA8/nafoQitUsXh98zphzhNWn8ScSssw9xX+6SjoXpzoeHuaVimJhL2EYLFHFsJ2M= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 01:34:17.4000 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1453 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH v2 2/4] ASoC: rsrc-card: rename rsrc-card to simple-scu-card phase1 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 rsrc-card which is using DPCM feature was created for Renesas sound. But not only Renesas, but many SoC can use this driver, because it is based on simple-card driver. To use it as more open driver, rsrc-card will be renamed to simple-scu-card. In order to easy patch review, as 1st step, this patch renames "rsrc" function prefix to "asoc_simple". Signed-off-by: Kuninori Morimoto --- v1 -> v2 - dpcm-card -> scu-card sound/soc/sh/rcar/rsrc-card.c | 108 +++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index ce9f911..a0d0f36 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -1,5 +1,5 @@ /* - * Renesas Sampling Rate Convert Sound Card for DPCM + * ASoC simple SCU sound card support * * Copyright (C) 2015 Renesas Solutions Corp. * Kuninori Morimoto @@ -22,21 +22,21 @@ #include #include -struct rsrc_card_of_data { +struct asoc_simple_card_of_data { const char *prefix; const struct snd_soc_dapm_route *routes; int num_routes; }; -static const struct of_device_id rsrc_card_of_match[] = { +static const struct of_device_id asoc_simple_card_of_match[] = { { .compatible = "renesas,rsrc-card", }, {}, }; -MODULE_DEVICE_TABLE(of, rsrc_card_of_match); +MODULE_DEVICE_TABLE(of, asoc_simple_card_of_match); #define IDX_CPU 0 #define IDX_CODEC 1 -struct rsrc_card_priv { +struct asoc_simple_card_priv { struct snd_soc_card snd_card; struct snd_soc_codec_conf codec_conf; struct asoc_simple_dai *dai_props; @@ -45,48 +45,48 @@ struct rsrc_card_priv { u32 convert_channels; }; -#define rsrc_priv_to_dev(priv) ((priv)->snd_card.dev) -#define rsrc_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i)) -#define rsrc_priv_to_props(priv, i) ((priv)->dai_props + (i)) +#define simple_priv_to_dev(priv) ((priv)->snd_card.dev) +#define simple_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i)) +#define simple_priv_to_props(priv, i) ((priv)->dai_props + (i)) #define DAI "sound-dai" #define CELL "#sound-dai-cells" -static int rsrc_card_startup(struct snd_pcm_substream *substream) +static int asoc_simple_card_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct rsrc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct asoc_simple_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct asoc_simple_dai *dai_props = - rsrc_priv_to_props(priv, rtd->num); + simple_priv_to_props(priv, rtd->num); return clk_prepare_enable(dai_props->clk); } -static void rsrc_card_shutdown(struct snd_pcm_substream *substream) +static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct rsrc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct asoc_simple_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct asoc_simple_dai *dai_props = - rsrc_priv_to_props(priv, rtd->num); + simple_priv_to_props(priv, rtd->num); clk_disable_unprepare(dai_props->clk); } -static struct snd_soc_ops rsrc_card_ops = { - .startup = rsrc_card_startup, - .shutdown = rsrc_card_shutdown, +static struct snd_soc_ops asoc_simple_card_ops = { + .startup = asoc_simple_card_startup, + .shutdown = asoc_simple_card_shutdown, }; -static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd) +static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) { - struct rsrc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct asoc_simple_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *dai; struct snd_soc_dai_link *dai_link; struct asoc_simple_dai *dai_props; int num = rtd->num; - dai_link = rsrc_priv_to_link(priv, num); - dai_props = rsrc_priv_to_props(priv, num); + dai_link = simple_priv_to_link(priv, num); + dai_props = simple_priv_to_props(priv, num); dai = dai_link->dynamic ? rtd->cpu_dai : rtd->codec_dai; @@ -94,10 +94,10 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd) return asoc_simple_card_init_dai(dai, dai_props); } -static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, +static int asoc_simple_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { - struct rsrc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct asoc_simple_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *channels = hw_param_interval(params, @@ -114,13 +114,13 @@ static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } -static int rsrc_card_parse_links(struct device_node *np, - struct rsrc_card_priv *priv, - int idx, bool is_fe) +static int asoc_simple_card_parse_links(struct device_node *np, + struct asoc_simple_card_priv *priv, + int idx, bool is_fe) { - struct device *dev = rsrc_priv_to_dev(priv); - struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx); - struct asoc_simple_dai *dai_props = rsrc_priv_to_props(priv, idx); + struct device *dev = simple_priv_to_dev(priv); + struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, idx); + struct asoc_simple_dai *dai_props = simple_priv_to_props(priv, idx); int ret; /* Parse TDM slot */ @@ -161,7 +161,7 @@ static int rsrc_card_parse_links(struct device_node *np, asoc_simple_card_canonicalize_cpu(dai_link, is_single_links); } else { - const struct rsrc_card_of_data *of_data; + const struct asoc_simple_card_of_data *of_data; of_data = of_device_get_match_data(dev); @@ -172,7 +172,7 @@ static int rsrc_card_parse_links(struct device_node *np, /* BE settings */ dai_link->no_pcm = 1; - dai_link->be_hw_params_fixup = rsrc_card_be_hw_params_fixup; + dai_link->be_hw_params_fixup = asoc_simple_card_be_hw_params_fixup; ret = asoc_simple_card_parse_codec(np, dai_link, DAI, CELL); if (ret < 0) @@ -206,8 +206,8 @@ static int rsrc_card_parse_links(struct device_node *np, dai_link->dpcm_playback = 1; dai_link->dpcm_capture = 1; - dai_link->ops = &rsrc_card_ops; - dai_link->init = rsrc_card_dai_init; + dai_link->ops = &asoc_simple_card_ops; + dai_link->init = asoc_simple_card_dai_init; dev_dbg(dev, "\t%s / %04x / %d\n", dai_link->name, @@ -217,10 +217,10 @@ static int rsrc_card_parse_links(struct device_node *np, return 0; } -static int rsrc_card_dai_link_of(struct device_node *node, - struct rsrc_card_priv *priv) +static int asoc_simple_card_dai_link_of(struct device_node *node, + struct asoc_simple_card_priv *priv) { - struct device *dev = rsrc_priv_to_dev(priv); + struct device *dev = simple_priv_to_dev(priv); struct snd_soc_dai_link *dai_link; struct device_node *np; unsigned int daifmt = 0; @@ -230,7 +230,7 @@ static int rsrc_card_dai_link_of(struct device_node *node, /* find 1st codec */ i = 0; for_each_child_of_node(node, np) { - dai_link = rsrc_priv_to_link(priv, i); + dai_link = simple_priv_to_link(priv, i); if (strcmp(np->name, "codec") == 0) { ret = asoc_simple_card_parse_daifmt(dev, node, np, @@ -244,14 +244,14 @@ static int rsrc_card_dai_link_of(struct device_node *node, i = 0; for_each_child_of_node(node, np) { - dai_link = rsrc_priv_to_link(priv, i); + dai_link = simple_priv_to_link(priv, i); dai_link->dai_fmt = daifmt; is_fe = false; if (strcmp(np->name, "cpu") == 0) is_fe = true; - ret = rsrc_card_parse_links(np, priv, i, is_fe); + ret = asoc_simple_card_parse_links(np, priv, i, is_fe); if (ret < 0) return ret; i++; @@ -260,11 +260,11 @@ static int rsrc_card_dai_link_of(struct device_node *node, return 0; } -static int rsrc_card_parse_of(struct device_node *node, - struct rsrc_card_priv *priv, +static int asoc_simple_card_parse_of(struct device_node *node, + struct asoc_simple_card_priv *priv, struct device *dev) { - const struct rsrc_card_of_data *of_data = of_device_get_match_data(dev); + const struct asoc_simple_card_of_data *of_data = of_device_get_match_data(dev); struct asoc_simple_dai *props; struct snd_soc_dai_link *links; int ret; @@ -309,7 +309,7 @@ static int rsrc_card_parse_of(struct device_node *node, dev_dbg(dev, "SRC : convert_rate %d\n", priv->convert_rate); dev_dbg(dev, "CTU : convert_channels %d\n", priv->convert_channels); - ret = rsrc_card_dai_link_of(node, priv); + ret = asoc_simple_card_dai_link_of(node, priv); if (ret < 0) return ret; @@ -320,9 +320,9 @@ static int rsrc_card_parse_of(struct device_node *node, return 0; } -static int rsrc_card_probe(struct platform_device *pdev) +static int asoc_simple_card_probe(struct platform_device *pdev) { - struct rsrc_card_priv *priv; + struct asoc_simple_card_priv *priv; struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev; int ret; @@ -332,7 +332,7 @@ static int rsrc_card_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - ret = rsrc_card_parse_of(np, priv, dev); + ret = asoc_simple_card_parse_of(np, priv, dev); if (ret < 0) { if (ret != -EPROBE_DEFER) dev_err(dev, "parse error %d\n", ret); @@ -350,25 +350,25 @@ err: return ret; } -static int rsrc_card_remove(struct platform_device *pdev) +static int asoc_simple_card_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); return asoc_simple_card_clean_reference(card); } -static struct platform_driver rsrc_card = { +static struct platform_driver asoc_simple_card = { .driver = { .name = "renesas-src-audio-card", - .of_match_table = rsrc_card_of_match, + .of_match_table = asoc_simple_card_of_match, }, - .probe = rsrc_card_probe, - .remove = rsrc_card_remove, + .probe = asoc_simple_card_probe, + .remove = asoc_simple_card_remove, }; -module_platform_driver(rsrc_card); +module_platform_driver(asoc_simple_card); -MODULE_ALIAS("platform:renesas-src-audio-card"); +MODULE_ALIAS("platform:asoc-simple-scu-card"); MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("Renesas Sampling Rate Convert Sound Card"); +MODULE_DESCRIPTION("ASoC Simple SCU Sound Card"); MODULE_AUTHOR("Kuninori Morimoto ");