From patchwork Thu Feb 5 07:11:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 5782261 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 8259F9F30C for ; Thu, 5 Feb 2015 07:12:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FD1B20138 for ; Thu, 5 Feb 2015 07:12:39 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5ABBE200F2 for ; Thu, 5 Feb 2015 07:12:34 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3620B2625CF; Thu, 5 Feb 2015 08:12:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.4 required=5.0 tests=AXB_X_FF_SEZ_S,BAYES_00, NO_DNS_FOR_FROM,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id D9AB6261ADA; Thu, 5 Feb 2015 08:12:15 +0100 (CET) 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 6BBBF261B03; Thu, 5 Feb 2015 08:12:15 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 134DD261ADA for ; Thu, 5 Feb 2015 08:11:47 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 05 Feb 2015 16:11:46 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 93BB14B692; Thu, 5 Feb 2015 16:11:46 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 915E32806E; Thu, 5 Feb 2015 16:11:46 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 8B27F2806D; Thu, 5 Feb 2015 16:11:46 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id SAW30226; Thu, 5 Feb 2015 16:11:46 +0900 X-IronPort-AV: E=Sophos;i="5.09,522,1418050800"; d="scan'208";a="179180413" Received: from mail-hk1lp0121.outbound.protection.outlook.com (HELO APAC01-HK1-obe.outbound.protection.outlook.com) ([207.46.51.121]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 05 Feb 2015 16:11:45 +0900 Received: from remon.renesas.com (211.11.155.132) by HKXPR06MB166.apcprd06.prod.outlook.com (10.242.124.18) with Microsoft SMTP Server (TLS) id 15.1.75.20; Thu, 5 Feb 2015 07:11:44 +0000 Message-ID: <877fvwj0gh.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Mark Brown , Mark Brown In-Reply-To: <87a90sj0hy.wl%kuninori.morimoto.gx@renesas.com> References: <87egq7774l.wl%kuninori.morimoto.gx@renesas.com> <87a90sj0hy.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Date: Thu, 5 Feb 2015 07:11:44 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: HKXPR03CA0022.apcprd03.prod.outlook.com (10.141.129.12) To HKXPR06MB166.apcprd06.prod.outlook.com (10.242.124.18) Authentication-Results: linaro.org; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB166; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:HKXPR06MB166; X-Forefront-PRVS: 0478C23FE0 X-Forefront-Antispam-Report: SFV:SPM; SFS:(10019020)(6009001)(97736003)(42186005)(62966003)(46406003)(77156002)(86362001)(229853001)(40100003)(50466002)(122386002)(77096005)(53416004)(76176999)(54356999)(68736005)(50986999)(92566002)(83506001)(36756003)(33646002)(46102003)(66066001)(19580395003)(69596002)(2950100001)(23726002)(81156004)(106356001)(47776003)(19580405001)(87976001)(14759085003); DIR:OUT; SFP:1501; SCL:5; SRVR:HKXPR06MB166; H:remon.renesas.com; FPR:; SPF:None; MLV:ovrnspm; PTR:InfoNoRecords; LANG:en; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB166; X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2015 07:11:44.0064 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB166 Cc: Linux-ALSA , Simon , Magnus , Liam Girdwood , Linux-SH Subject: [alsa-devel] [PATCH 2/6] ASoC: sh: discontinue support of sh7760-ac97 driver 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 In upstream kernel, no one is using SND_SH7760_AC97. This patch discontinue support of sh7760-ac97 driver to reducing maintenance cost. Thank you and good bye sh7760-ac97 driver. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/Kconfig | 13 -------- sound/soc/sh/Makefile | 5 --- sound/soc/sh/sh7760-ac97.c | 73 -------------------------------------------- 3 files changed, 91 deletions(-) delete mode 100644 sound/soc/sh/sh7760-ac97.c diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 8b8409c..a931c96 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -41,17 +41,4 @@ config SND_SOC_RCAR help This option enables R-Car SUR/SCU/SSIU/SSI sound support -## -## Boards -## - -config SND_SH7760_AC97 - tristate "SH7760 AC97 sound support" - depends on CPU_SUBTYPE_SH7760 && SND_SOC_PCM_SH7760 - select SND_SOC_SH4_HAC - select SND_SOC_AC97_CODEC - help - This option enables generic sound support for the first - AC97 unit of the SH7760. - endmenu diff --git a/sound/soc/sh/Makefile b/sound/soc/sh/Makefile index a462960..20f50ea 100644 --- a/sound/soc/sh/Makefile +++ b/sound/soc/sh/Makefile @@ -14,8 +14,3 @@ obj-$(CONFIG_SND_SOC_SH4_SIU) += snd-soc-siu.o ## audio units for R-Car obj-$(CONFIG_SND_SOC_RCAR) += rcar/ - -## boards -snd-soc-sh7760-ac97-objs := sh7760-ac97.o - -obj-$(CONFIG_SND_SH7760_AC97) += snd-soc-sh7760-ac97.o diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c deleted file mode 100644 index 4a3568a..0000000 --- a/sound/soc/sh/sh7760-ac97.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Generic AC97 sound support for SH7760 - * - * (c) 2007 Manuel Lauss - * - * Licensed under the GPLv2. - */ - -#include -#include -#include -#include -#include -#include -#include - -#define IPSEL 0xFE400034 - -static struct snd_soc_dai_link sh7760_ac97_dai = { - .name = "AC97", - .stream_name = "AC97 HiFi", - .cpu_dai_name = "hac-dai.0", /* HAC0 */ - .codec_dai_name = "ac97-hifi", - .platform_name = "sh7760-pcm-audio", - .codec_name = "ac97-codec", - .ops = NULL, -}; - -static struct snd_soc_card sh7760_ac97_soc_machine = { - .name = "SH7760 AC97", - .owner = THIS_MODULE, - .dai_link = &sh7760_ac97_dai, - .num_links = 1, -}; - -static struct platform_device *sh7760_ac97_snd_device; - -static int __init sh7760_ac97_init(void) -{ - int ret; - unsigned short ipsel; - - /* enable both AC97 controllers in pinmux reg */ - ipsel = __raw_readw(IPSEL); - __raw_writew(ipsel | (3 << 10), IPSEL); - - ret = -ENOMEM; - sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1); - if (!sh7760_ac97_snd_device) - goto out; - - platform_set_drvdata(sh7760_ac97_snd_device, - &sh7760_ac97_soc_machine); - ret = platform_device_add(sh7760_ac97_snd_device); - - if (ret) - platform_device_put(sh7760_ac97_snd_device); - -out: - return ret; -} - -static void __exit sh7760_ac97_exit(void) -{ - platform_device_unregister(sh7760_ac97_snd_device); -} - -module_init(sh7760_ac97_init); -module_exit(sh7760_ac97_exit); - -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("Generic SH7760 AC97 sound machine"); -MODULE_AUTHOR("Manuel Lauss ");