From patchwork Tue May 31 09:14:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143975 X-Patchwork-Delegate: geert@linux-m68k.org 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 64E0160777 for ; Tue, 31 May 2016 09:14:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5717728185 for ; Tue, 31 May 2016 09:14:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BD722821C; Tue, 31 May 2016 09:14:56 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F36028187 for ; Tue, 31 May 2016 09:14:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757007AbcEaJOs (ORCPT ); Tue, 31 May 2016 05:14:48 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:54825 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756988AbcEaJOm (ORCPT ); Tue, 31 May 2016 05:14:42 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 31 May 2016 18:14:41 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 513DD50902; Tue, 31 May 2016 18:14:41 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 4B8178002E; Tue, 31 May 2016 18:14:41 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 45B198002D; Tue, 31 May 2016 18:14:41 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id UBM06302; Tue, 31 May 2016 18:14:41 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="212432771" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:14:40 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=94G4lJqfZa23ccMK1paFE8pYhu/anZdLED61+xP7nxg=; b=dqeLbmHbIOOIyBlruuKhLqHYWhKFpCGCZkxrDhqpsIX1JHq1z0R/JW/eLo/HPYrC6zPeP2oBErv0XKJAbz1kE+IwpV4+AaWd/Up0I+PHcVoMb/M2p7g0CrIjuYYNOfWocWZXowx2nokBLb+3yGkXduFRCD1EzVW0EQKxF9uFx0s= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:14:37 +0000 Message-ID: <87vb1uppc0.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 39/39 v2] ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase3 User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> References: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 31 May 2016 09:14:37 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0009.jpnprd01.prod.outlook.com (10.161.24.19) To SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) X-MS-Office365-Filtering-Correlation-Id: fd8d7405-4e08-4624-89e5-08d38933fde4 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 2:IeN5lClJeNIoP/+9/6eBjhQA7mnTX3iMpJKrfRzzjDl4IPxQizMcr4j2ruEDlBxI+U2mCF5Js6SxescGavw06qOnkPgyyE6mZVQA+GOY8D/07ILt8Ip+0fEblyBpEvn8sXqIHp9vdIp6Xxs0KSVZgkWTvYKyLj8TWeyFLYr0yFFNgPg6scwy/SCnd3k7E32C; 3:W0uOitmqeJ42zalMtxfZDaLuDGz9kdv6iO4oaGOQVxTtkB5UhMx2cBtFIuF9cfsibEwz3fGWZjHHO5EVRZQ/JV0Lc4cf924My6JivP7G7srub1NQLpm7mM8motNy9kXh X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1712; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 25:Os3ndZvQmMpCUcyIzgGekHwkfl2VvLiNRBJTPWGkLCbHsJN5lDs8+vVLnLkv+vnDRngc+ce3l0jHFY/tKzw33KuqcWHtn1iK8Na4UC54CGjQiOhtj838q9rlZtrCZdNVsWpLDasgas/rWLTRoBFJ7h/yUGGB+kXEdjINM+CCf91hURAd99B6Z73BaDN4+fqY6rUzz2EaMzvdcyMKDqMZ8/1mWUFqe5iHNK4cqtKUxdc2Jmy7EahgYBkurEbb51U9Ehp+YG898Un4pT7YeFYPPFDigQLMSHXh6JUh0qheHd5BPQOaVCRm4wAZuCiKyavS8X0I/0x6+9cmxcnQW2b0WwxkNZbtcvza1HztcVRUxYgV9cLV7xrhj25l2utmSXT1F5hHilQjCEq4SOMZJCCzxclhCxuBXpIfAWXw8aoBOKQT9Wl8beMx8A1R0atji/spKf/vC5BbtFD9b1ye8TQynVDR7WDvPBDDKIQPWOIpmiXGaJmthhrXzM3+5kyEgkpXq++mpUn8zz2rUEgK41zVSfzf1xiVyvsLUJXz5+1WQRZV91MyKGKWOqf13pLjLnG4xJJ1IZUNNGOFaNMGiTXNUiqXdue64byBvmapf3mq42x5BlFriuVD1rzZVppuvqOVv1CzUV3BYCocEPc3taWBpBtgUBK7xggk2G3fJmAN9Wa8Yv7gGke5bJxhzx8GzPwgfHeDgiZ16F/Mjq+Vke/MgQ== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 20:ZPYOatNIrR52cQLO5CqIz5AirutLKKaHWbxi4beORyRTFhawt+7haXzq//vZCLChuV3fIxmPdKwSIGj0sBHHMfJn7OS/+HDHGIkPvNqbeATOVGvTAzv/RSyTGOZEqY5AAifV3sFAYSD09AmJd6CEoSiiuPD326kBFaPFpAzhrTqWzXRLBr6NKuCDJ3rD/iCJTuUSP92v7963sStHKSJ0gfRnNlISpZU5wO5UFt/rhF22RKHdmVqfJR07r/PUbisKZk6LnXytL0YuAYLMrzxxZ8p0F5cG2WckI9JYU4yNLXTbPNZSR6qpo3oAkIg75qg5dOolOF4/zZxgLrzmiQFOJIK+nkmGmhpp+JY3BXPmgdb2JLP0eBoMK7ZnT5zzVAKPNsgtz5tE5axggx0YqX1TdiJXzf7QtpRCLw2Gy/Fk8Gcqfzk8tINFusBQHtTqTKPPkMVdCielfdoJ6Qu2kK2ZdjPefR3nIKEKkMXuy1nUEXfA9A1PI6kW7Zn4r2hnsKsr; 4:zsyF3Xof4mJYd1tgzQ40tlqdPH6OVMDgmv7o2AJFOGIOX47c1CE929QYpx9QyQL7LwuCO0WU3B3qkaJo0IICfJ/LNM7A7L0qpNsF6t0GgGIqYeroSCxgOWvpTsi5jLbzcCOH7KXozKsBJh1VMuWmam63Y85d3I9QLM+cXQKWmTNUjVtobf6FJ6ELP7rFyNNCaIPkgnoE+kM7WrTc42r33GKuN9Hi9M+eq3T4vFUK+6FhmaGc29T57CcagDIzTvXiV5bQpyz/CXOPAaDtWnpbej57h/1NCC7XK1n+LIlE3emRwLyo2Ox696Qc0/GO8e2NSy3vqb+vv3y5Ce5nPpW3n71/2fIL/QdHXkxNecbTUpEaCqHghPzgD2oiQ38Gj05n/9pKuhoMU8gcdKJ6+gB5Yg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:SG2PR06MB1712; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1712; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(66066001)(47776003)(50466002)(3846002)(4001350100001)(76176999)(6116002)(50986999)(586003)(2906002)(92566002)(54356999)(4326007)(23726003)(110136002)(36756003)(46406003)(189998001)(77096005)(8676002)(229853001)(53416004)(19580405001)(86362001)(19580395003)(230783001)(81166006)(2950100001)(5004730100002)(83506001)(33646002)(5008740100001)(42186005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1712; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1712; 23:ZLZ2+pWF95uPHR/KpUGHqK0FHmXPDdHS5pbzfRfEu?= =?us-ascii?Q?kb9SBokJa4qzexlteqFvJiDBAmEcg4OZ2rrcR9Em7VvY/VJkFc6AyiFuAkIP?= =?us-ascii?Q?x/yysSWgWppPsdCO1cVz3FbRP2+83dDag9nNoDvJQUIbqHgmjdc21XSm1pv3?= =?us-ascii?Q?XaR+1m++V7QRYpn1tr4+Jjf/X+PQwECadZiGsdPOZjcK+ETNHJOXnNR52DBd?= =?us-ascii?Q?sKyFmkmr2vQFm48nCM2qpcHlaT+df6TcZlzIxuKkcHjmB2ei8cMlFuCOYpAN?= =?us-ascii?Q?l2Sd08aGCAJ1m8qIgpbQ2lrI5QcMsn+DflX0DPW9Bl20lzopLfjTspYDJtDO?= =?us-ascii?Q?+hGnUy8duOpXykJnCC2PJsKS+ynDALxH05mYiBjkWmeWJ1k5ijjZrkiIAovF?= =?us-ascii?Q?bhDWoxaM/2elhysJF+e55Ry18xZhbotQSwQSqLEODjGJ/o3FAdqHGD/sRAGW?= =?us-ascii?Q?6No/ug6PlkiZVnF2LeihNZMlgg7wT66QTALtD9MfmtIgA6FOB3wRZffo2ejO?= =?us-ascii?Q?yEwVashP9tqLebHxt2h7/FsPA2VDHOBLwQNvaIK2bBISqusXNGcfi8OKCH+M?= =?us-ascii?Q?gQrjbwpVgLG+oIYKvPtot28aavKW8qbjj07nhML4b4105v1hGgmxo5wcdbqY?= =?us-ascii?Q?LlKLnGRR7cTKWkt5JdeDHOG35BjUAhpaidU1rATp+FoSQs0oe7hjeAXW/ZT2?= =?us-ascii?Q?Wj4qT8FYqJprk49fYkJyg1Dwa5nQi26Xe/duiJvzXFb03Uk1KrpMQOL6Q+uy?= =?us-ascii?Q?hqPzuGjrhp4/xujyFHU2LBYsfIvrifn2NhLPvOclhFNMzyHK3a9YDOG5ER6O?= =?us-ascii?Q?bf/i8dSi8hSoWfzooIZk+Nd2LyqjT05ppzn28LYrLr/XfVhl6cVGrs2r9BXg?= =?us-ascii?Q?vkuuc/xqCul9qvYKAKxumXESRzyHJW0macvq7/Dra4jdH68w/udKwr3Lj2Pw?= =?us-ascii?Q?Q223+y6qweDG9dIyDF1vH3r2c8boqlqalT7WQHtwMH4vyKAspB7dMyBU6FJl?= =?us-ascii?Q?G8=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 5:5Y3IDf6pSwKT75mDyJveAJIO0qD++xMJ2kKWl6/H6xQj2ZKIV0v/jxjB0sw117MeSDgf2xdrLjs8+G+0G2ueVcaha7yE3iBjc9uCFrLXTIw82A6L9qu17MDx8sUmcomtsK0ZPJUrySc2JdiM17Uqkg==; 24:PdTrZmFR4ZWhbqoKA2cNmcwu24ZFsqSFbyBbYyzfxUCy+hWXbUYtzAuXuikRqHMlAnFqotjYPJe4IzcAWxWSlFpASGvZchwoLoDvq3vneS4=; 7:9WdYHtr0lFb+fuw51QwBOyUj854rYTJ0ZfJtcId5DAS41PtLReu+kGuQDLY5bSBWeBoNTJspdbN1tvUeqBuooGKr82kwLQXJ0jbq0pCRxrwNYcG5s84pB0LWkfNYyG9DOvTz1WjZDG60jSfD1X7gnJJ5uW/ghxK2cBmp3AOHei6PKE4/xaFbRqxdjk2TlgOi; 20:W4OJa7avl7b2Uh78WpXw+1wCerwQRt+fusM9GV82vucMXMYEfZFvDRan7pUGcUoJ6AvDdU18BNogDNAKQrdc5N32huHzRQoCGwRY4ZDXisKMSOiHt3lm06aBAo6w0XHyPwR6LqIN8lllC0Lm0mCZeh3yAZ/ve7tWm/HhEXAFgkk= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:14:37.9541 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1712 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 should be renamed to simple-dpcm-card. In order to easy patch review, as 3rd step, this patch moves rsrc-card driver to generic folder. Signed-off-by: Kuninori Morimoto --- .../bindings/sound/{renesas,rsrc-card.txt => simple-dpcm-card.txt} | 0 sound/soc/generic/Kconfig | 6 ++++++ sound/soc/generic/Makefile | 2 ++ sound/soc/{sh/rcar/rsrc-card.c => generic/simple-dpcm-card.c} | 0 sound/soc/sh/Kconfig | 6 ------ sound/soc/sh/rcar/Makefile | 3 --- 6 files changed, 8 insertions(+), 9 deletions(-) rename Documentation/devicetree/bindings/sound/{renesas,rsrc-card.txt => simple-dpcm-card.txt} (100%) rename sound/soc/{sh/rcar/rsrc-card.c => generic/simple-dpcm-card.c} (100%) diff --git a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt b/Documentation/devicetree/bindings/sound/simple-dpcm-card.txt similarity index 100% rename from Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt rename to Documentation/devicetree/bindings/sound/simple-dpcm-card.txt diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig index c01c5dd..bb35494 100644 --- a/sound/soc/generic/Kconfig +++ b/sound/soc/generic/Kconfig @@ -6,3 +6,9 @@ config SND_SIMPLE_CARD select SND_SIMPLE_CARD_UTILS help This option enables generic simple sound card support + +config SND_SIMPLE_DPCM_CARD + tristate "ASoC Simple DPCM sound card support" + select SND_SIMPLE_CARD_UTILS + help + This option enables generic simple DPCM sound card support diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile index 45602ca..b82640a 100644 --- a/sound/soc/generic/Makefile +++ b/sound/soc/generic/Makefile @@ -1,5 +1,7 @@ obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) := simple-card-utils.o snd-soc-simple-card-objs := simple-card.o +snd-soc-simple-dpcm-card-objs := simple-dpcm-card.o obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o +obj-$(CONFIG_SND_SIMPLE_DPCM_CARD) += snd-soc-simple-dpcm-card.o diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/generic/simple-dpcm-card.c similarity index 100% rename from sound/soc/sh/rcar/rsrc-card.c rename to sound/soc/generic/simple-dpcm-card.c diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 9311f11..6db6405 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -42,12 +42,6 @@ config SND_SOC_RCAR help This option enables R-Car SRU/SCU/SSIU/SSI sound support -config SND_SOC_RSRC_CARD - tristate "Renesas Sampling Rate Convert Sound Card" - select SND_SIMPLE_CARD_UTILS - help - This option enables simple sound if you need sampling rate convert - ## ## Boards ## diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/sh/rcar/Makefile index a89ddf7..9c3d5ae 100644 --- a/sound/soc/sh/rcar/Makefile +++ b/sound/soc/sh/rcar/Makefile @@ -1,5 +1,2 @@ snd-soc-rcar-objs := core.o gen.o dma.o adg.o ssi.o ssiu.o src.o ctu.o mix.o dvc.o cmd.o obj-$(CONFIG_SND_SOC_RCAR) += snd-soc-rcar.o - -snd-soc-rsrc-card-objs := rsrc-card.o -obj-$(CONFIG_SND_SOC_RSRC_CARD) += snd-soc-rsrc-card.o