From patchwork Fri May 20 10:09:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129147 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 2DC9460467 for ; Fri, 20 May 2016 10:09:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B9731FFC9 for ; Fri, 20 May 2016 10:09:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 107EF27A84; Fri, 20 May 2016 10:09:42 +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 7CF671FFC9 for ; Fri, 20 May 2016 10:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755465AbcETKJk (ORCPT ); Fri, 20 May 2016 06:09:40 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:7684 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753080AbcETKJi (ORCPT ); Fri, 20 May 2016 06:09:38 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 20 May 2016 19:09:36 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id ED0BD48641; Fri, 20 May 2016 19:09:35 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id EABA2480A4; Fri, 20 May 2016 19:09:35 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id E4021480A3; Fri, 20 May 2016 19:09:35 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id VAB13769; Fri, 20 May 2016 19:09:35 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211717569" Received: from mail-pu1apc01lp0019.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.19]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 19:09:34 +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=YghpXE6bpYSFGyuNS1KCiEOkeRSfWtpB7Nz7bwd355Y=; b=NcgNGUeZ34es1maSXP51ZSQtf3qNh2c8IYpg6y9oEnFkmbO9nz4cQstCg9qrQ2UYOxl4wGqxNwqYdtcUFJLsKhH4Fun4rDlTdjmCIonpwxoPPYXQkDftgtWJmtBYyaPP0QZdy0n5HAqvk+LnOCOD92UGwvw9r/cQ4zipD4UxoRo= 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.497.12; Fri, 20 May 2016 10:09:31 +0000 Message-ID: <87lh35oxlh.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 49/49] 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: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> References: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 20 May 2016 10:09:31 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR01CA0014.jpnprd01.prod.outlook.com (10.168.40.24) To SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) X-MS-Office365-Filtering-Correlation-Id: 3a490896-22eb-45fd-a247-08d38096d6b4 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 2:k5tlL/y0AhjatVWYuXw3mZ9zrGuQ31wnTnYNkMa9gyufEIksq+YKTvCy8/YeaC4i185JczRnj7c9Ba3pRkSJCnXeuyqFT/dLQfiKPj5eybM2SDDBL3TFzXX8CnKehM1RHaS8WJlcxTke3APoZhB0GYzEaFfwmyAFynXmaFvc6HNTwMTp4KauOKsGGVSUdX7P; 3:ERla1RmcicWVPVNqFzj3a5/az8mBAAsxKtVIAQlPujM9qe4SF5/reNY4yw2TW3NmFe2MRUZOHnc8KBa/undjUZSY+x2Htrt3i1RQj35gT8Nga3H53/mkmIHPV+XfFhSa; 25:0/4KS+iyft3YsQTcWuxZU8XCJb1m1IL2BK59bF8Jx6POnp4Z0YqdUTkO3suuWDrkYmT090dSavmj7RztfkXdLZrKObzu9F/T8FmRFo2uPsMCLNdjvKYU7hSrFasNyUJS7IBTmxg91WMr8MqwE/VgFelbPYHBse8QXBX15qI6ElR8ehOt8OMgZJptR/c3nOFTdfEgyhE+dCsmIBNwJPvWkgVOEYgu9oR49A3jl+6bFu+0+iC7VDa0wAB5hnBHX12Y7rPKmDfAYy3Pysed0h5NZp3L3syHaR4Nu6mD0is22N+tjFBuu7Y/+mVpJy5c7+D/SKwhwQlO1mwHXxmDIEakSFVcM5kgXhDhjA7y5mfkMvX72At1EuXmYQ2efwInjD2ShcfCqIxayl/d1loR2uaMaeUFbkPrO5ZdlGIftk38djM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1712; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 20:vpai2Li2T4+JRRHdcqVDQv+s3lKjUN4l60Oj59QeIguJBSho2fnewWyNFLZbEOCCj5fKKGi2Jn3MWvgqMcfPBDdzty47aKZ+o2rBk2q6DJWWjbDwSed5EeZJqdX9moWtowx0403NJdByIXvuKWwxU3KkhPJtBOVvPQ9MPDRYY1hChui2GLq/O6f+wsVj0hPI1RLcZZV83UwvLu7oKIXr3QKtQnTzhx/5AvjSH1nRJf4aYoVdngQvSB2squceWSlXvCqNxxIckcw36Zk8UkDr9u6y4H/NthMSg0wiyR60pT6bJLxrY73eDQnYUENUyjOnmUUkltqS8oFXFhZ69+uM8z9MFETxEMSBJ/C/MJkg+QRkZI4U3VRsR98N6AhcVBDJBPTsprK4f3+dcyGwxcG0o+dr0SVV0fvMg+Z2sC7BKxI72DgUP0UvUXqlVhs5e6Whk5o/xvtmazaZGvXTKhS6QKd1OZlVCJEId2eHcxeUzPQbkejGOrFuXa8LfGPH2rTs; 4:eUcygNdp+TNMhI+P1vIkWvmkvj/EI9m+qPpEtI0xqE3jEfO5mjBVgEi2DC3p6Fr8KiDsVShLU7+5SxxraWNBseJJRvptorftvCaQ08voJMJHduTwX2IlxRPuuMEoeW3zNi/vRjK4pg/Q9WNxaWbVyGnDBIiNQkqN7DhqutMOBIIUBxPXgX4f4d7TNaCMXUYNBg/jJruM9EZVfnTHB33hNh/Gz4Gmh0BAiJLJ7bluVY8+XxInk5snDzEyPHV1MynNYtZ/Qt6KR2PW8AYl4lsg7GOWlCscL+gmfgWn2Oq215Au+1R6rbT1t1yTmiYzIo2+Ev4flTVUyUzml1Pn2Q4G7z3GJHB4tQBgim+M3nBNSGU/5f7kiusyNM4/fmDynYXwYM0UJTUHoAjEOUTcwWDPeg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:SG2PR06MB1712; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1712; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(979002)(6009001)(92566002)(189998001)(5004730100002)(5008740100001)(47776003)(83506001)(81166006)(50986999)(586003)(46406003)(36756003)(110136002)(4001350100001)(8676002)(2950100001)(77096005)(2906002)(4326007)(86362001)(575784001)(229853001)(76176999)(54356999)(42186005)(50466002)(33646002)(53416004)(3846002)(6116002)(19580405001)(23726003)(19580395003)(230783001)(66066001)(16060500001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1712; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:ovrnspm; PTR:InfoNoRecords; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1712; 23:djOnWdf0ojrC4c6g3yofuAceRi5WJvMWDJX5vNVTz?= =?us-ascii?Q?r+qrgpdoZOO2Cyal2gUDHcm5MIZKVXV0G2r5JKcNZBF2o2VMFw9/itEzKf1C?= =?us-ascii?Q?Pk46ELEKiWD6Vnst+DFX8qcDOHpWCXoliLfaBIFqCdlF8gJ59/543Kvr4td2?= =?us-ascii?Q?2vrT9jn6ovX3qLDR6kmLIUPPt8ORpYheO5gIV2VSRIl9ZWG2DibZGUL5QyKS?= =?us-ascii?Q?l10/m2MCljMd4a7AXe09qzU53YWCuD5QnptuHJFQVvT59o0BP1Nsmmy9qWce?= =?us-ascii?Q?O64B8O4+BfIinDY5Kd/4NB9OKWfK77p6wAcepc/R65+KTAFTRj3luk0drOGa?= =?us-ascii?Q?eUB03rsPofk1R6WFsH/7t0PUSvRvTqjikiuMZHdp3kcqiF86m5ndopZdm19j?= =?us-ascii?Q?kacuwlFyaKSaf2i6+/3n3/Y5fWiSTiRiYmNy/nEu+4c8kqg5aqqSujPhiYXj?= =?us-ascii?Q?Knm1Fw1Rq0KT9IwK2ogG0UDOfNpSIW5Q9cvClyFWXdQeUj8O/4TZKAqxaG+c?= =?us-ascii?Q?O4BfDaB3YQppYRwlTbUELJNGFhOTkI7f6aY8xjNdI0Ivb/EOZOFA9kuIUiu6?= =?us-ascii?Q?A78ctKZgWouxWPdAXBVUUnl1I2SRdDcbMCknOJ1fs58mqSuRoIxfCQKf6LJL?= =?us-ascii?Q?TQs/esQamFUURUas5FPa04iiWRXgBWQLlCqolTAo0DI/1N+up9eJ3HrIpOrz?= =?us-ascii?Q?ay7VGlCxvTyfXMdMLjgZY5vbty7toycBCvYDpujtY11QkwfnLBJqjRdx7iQc?= =?us-ascii?Q?w278sBXsNc5tTYQmuL8rA3vL9um1LqBBPulL5mZjqQC98H9gMPTHCK6tBNPZ?= =?us-ascii?Q?/WOraqkv8on1syDyvHkYYCNw9maXHCalKm9Esw/NhJXSyJyE9QzuAwNEeePg?= =?us-ascii?Q?BcyuR0WSArt0T3xtVedG7bpvECGZ4B9Sve4aEtsSkBblAzcuarjp7UssDUWB?= =?us-ascii?Q?WWtyB8jiuxdfYR8V3chI5nvmoJHfChP5h3id1AMnCwxK6mon0y21LDGxZs4t?= =?us-ascii?Q?svu4uk+lGdlNnSZSBJyls4XMcd7HrOdpfzasIwULx9WJQd15H/WObsReYlL3?= =?us-ascii?Q?oiDBXiVE4vuYwVpOoLpkQBTDmnfu1h1eeMtpKnEEMkTbjbEew=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 5:K7i2TrtsvExONDJWKZrLnSGQnexElqpqWh8Zt6JWj3LhKpD1QzOdOh0JIc0FOOKhxzDhJCx1ZmhiZzTKCChW0adPZNoQt/DsmqeqB9aGsp1jPt5zH0N13Pe27kn2gu0lCMUt9l2PlGr7txuUCpbQnA==; 24:H3yeS+ZcrXhZnSlaU0oKVvt+nu71OhSXD0wjhDVL9sWiGajlCvBZQTos7n+K0bMtqRDjwO75cHrwq2uLNf1fNLIm/jzX1pPFOP9I5H+kJ10=; 7:wr3HkwXpf+EMLyrydNZtOxuMMCs4VPYtPBbnHcXuggRdz2HknYUfUdQRO+/wKQeRoVBPpHD3LzXrcBqkG1qWlttb3rJQA1U1ecJDIs7g8ycB0Zswgpn5cZ4M8Sxnt/DJ/dVozIVUsmclWdeyJQsJh+p8oUds49IsPDyKP46fbSmpuAi3ppjQHW9s1gZrLLQk; 20:dZg1miZIrKn3MtIUsdOcvgaj0jACxNFVFGZ49b2VitficNk5yjk7QeU+f9XJA4lHiqk5fHPV2xy80CQ8H/2xHA6XGh+5w2VTEY7rbo3Zd8dsy4lCIFj7QtAnET2NvAVzsP/lN02pD1tYbLpOvi0laJ75eY4+y7lwiF2wmnDipDc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 10:09:31.9358 (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 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 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 441fc9f..fbba1e6 100644 --- a/sound/soc/generic/Kconfig +++ b/sound/soc/generic/Kconfig @@ -6,3 +6,9 @@ config SND_SIMPLE_CARD select SND_SIMPLE_CARD_CORE 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_CORE + help + This option enables generic simple DPCM sound card support diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile index d8a982d..a5f0e4d 100644 --- a/sound/soc/generic/Makefile +++ b/sound/soc/generic/Makefile @@ -1,5 +1,7 @@ obj-$(CONFIG_SND_SIMPLE_CARD_CORE) := simple-card-core.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 d34d5ed..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_CORE - 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