From patchwork Sun Jul 8 17:12:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Borleis X-Patchwork-Id: 1169881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 168493FD4F for ; Sun, 8 Jul 2012 17:23:44 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Snv7k-0002j7-Bh; Sun, 08 Jul 2012 17:18:20 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Snv2A-0001oU-87 for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 17:12:45 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Snv23-0006yM-My for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 19:12:27 +0200 Received: from jbe by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1Snv22-0004Z5-R2 for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 19:12:26 +0200 From: Juergen Beisert To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/10] MACH/Samsung/Mini2440: enable buzzer Date: Sun, 8 Jul 2012 19:12:23 +0200 Message-Id: <1341767544-17447-10-git-send-email-jbe@pengutronix.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1341767544-17447-1-git-send-email-jbe@pengutronix.de> References: <1341767544-17447-1-git-send-email-jbe@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: jbe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Juergen Beisert --- arch/arm/mach-s3c24xx/mach-mini2440.c | 14 ++++++++++++++ sound/soc/samsung/Kconfig | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c index ad1d89e..8a41f03 100644 --- a/arch/arm/mach-s3c24xx/mach-mini2440.c +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c @@ -592,6 +592,15 @@ static struct s3c_hwmon_pdata mini2440_adc __initdata = { .in[7] = &mini2440_adc_chcfg[7], }; +static struct platform_device mini2440_buzzer_device = { + .name = "pwm-beeper", + .id = -1, + .dev = { + .parent = &s3c_device_timer[0].dev, + .platform_data = (void *)0, /* channel 0 */ + }, +}; + static struct platform_device *mini2440_devices[] __initdata = { &s3c_device_ohci, &s3c_device_wdt, @@ -609,6 +618,8 @@ static struct platform_device *mini2440_devices[] __initdata = { &samsung_asoc_dma, &s3c_device_adc, &s3c_device_hwmon, + &s3c_device_timer[0], + &mini2440_buzzer_device, }; static void __init mini2440_map_io(void) @@ -771,6 +782,9 @@ static void __init mini2440_init(void) i2c_register_board_info(0, mini2440_i2c_devs, ARRAY_SIZE(mini2440_i2c_devs)); + /* PWM to the buzzer */ + s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPB0_TOUT0); + platform_add_devices(mini2440_devices, ARRAY_SIZE(mini2440_devices)); if (features.count) /* the optional features */ diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 18a555a..1cb5abd 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -2,7 +2,7 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_EXYNOS4 select S3C64XX_DMA if ARCH_S3C64XX - select S3C24Xx_DMA if ARCH_S3C24XX + select S3C24XX_DMA if ARCH_S3C24XX help Say Y or M if you want to add support for codecs attached to the Samsung SoCs' Audio interfaces. You will also need to