From patchwork Thu Feb 11 15:13:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 78728 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1BFFFvV001633 for ; Thu, 11 Feb 2010 15:15:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756132Ab0BKPOt (ORCPT ); Thu, 11 Feb 2010 10:14:49 -0500 Received: from moutng.kundenserver.de ([212.227.126.186]:54425 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753428Ab0BKPOs (ORCPT ); Thu, 11 Feb 2010 10:14:48 -0500 Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MPZs9-1NbS1V33s9-004uGv; Thu, 11 Feb 2010 16:14:45 +0100 Received: from localhost.localdomain (unknown [192.168.0.2]) by corscience.de (Postfix) with ESMTP id 4126D51DB4; Thu, 11 Feb 2010 16:14:44 +0100 (CET) From: Thomas Weber Cc: Thomas Weber , jhnikula@gmail.com, lrg@slimlogic.co.uk, broonie@opensource.wolfsonmicro.com, perex@perex.cz, tiwai@suse.de, jkrzyszt@tis.icnet.pl, anuj.aggarwal@ti.com, x0052729@ti.com, peter.ujfalusi@nokia.com, tony@atomide.com, jy0922.shim@samsung.com, linux-omap@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [RESEND][PATCHv2 3/4] Add ASoC support for Devkit8000 Date: Thu, 11 Feb 2010 16:13:59 +0100 Message-Id: <1265901239-31285-1-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.6.6.1 X-Provags-ID: V01U2FsdGVkX18HX7b1d8byOGgeFhpD1uwXLBsrBkDy8d6Ecti TFPdI0x72Y306uu4r7KQOpZ7cakxFi4W8811zGQGTIshXYY2cr 7ZbI5pcSq4GAYnwauD/1Q== To: unlisted-recipients:; (no To-header on input) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 11 Feb 2010 15:15:16 +0000 (UTC) diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 61952aa..18ebdc7 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -94,12 +94,14 @@ config SND_OMAP_SOC_OMAP3_PANDORA Say Y if you want to add support for SoC audio on the OMAP3 Pandora. config SND_OMAP_SOC_OMAP3_BEAGLE - tristate "SoC Audio support for OMAP3 Beagle" - depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_BEAGLE + tristate "SoC Audio support for OMAP3 Beagle and Devkit8000" + depends on TWL4030_CORE && SND_OMAP_SOC + depends on (MACH_OMAP3_BEAGLE || MACH_DEVKIT8000) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help - Say Y if you want to add support for SoC audio on the Beagleboard. + Say Y if you want to add support for SoC audio on the Beagleboard or + the clone Devkit8000. config SND_OMAP_SOC_ZOOM2 tristate "SoC Audio support for Zoom2" diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c index d88ad5c..240e097 100644 --- a/sound/soc/omap/omap3beagle.c +++ b/sound/soc/omap/omap3beagle.c @@ -117,11 +117,11 @@ static int __init omap3beagle_soc_init(void) { int ret; - if (!machine_is_omap3_beagle()) { - pr_debug("Not OMAP3 Beagle!\n"); + if (!(machine_is_omap3_beagle() || machine_is_devkit8000())) { + pr_debug("Not OMAP3 Beagle or Devkit8000!\n"); return -ENODEV; } - pr_info("OMAP3 Beagle SoC init\n"); + pr_info("OMAP3 Beagle/Devkit8000 SoC init\n"); omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); if (!omap3beagle_snd_device) {