linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: jbe@pengutronix.de (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	[thread overview]
Message-ID: <1341767544-17447-10-git-send-email-jbe@pengutronix.de> (raw)
In-Reply-To: <1341767544-17447-1-git-send-email-jbe@pengutronix.de>

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 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
-- 
1.7.10

  parent reply	other threads:[~2012-07-08 17:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-08 17:12 [PATCH] Make the Samsung S3C2440 based FriendlyARM Mini2440 feature complete Juergen Beisert
2012-07-08 17:12 ` [PATCH 01/10] Sound/ARM/Samsung: replace wrong dependency Juergen Beisert
2012-07-08 18:19   ` Juergen Beisert
2012-07-08 17:12 ` [PATCH 02/10] PLAT/Samsung/PWM: avoid division by zero Juergen Beisert
2012-07-08 17:12 ` [PATCH 03/10] MACH/Samsung/Mini2440: add support for new LCD panels Juergen Beisert
2012-07-08 17:12 ` [PATCH 04/10] MACH/Samsung/Mini2440: add touchscreen support for mini2440 Juergen Beisert
2012-07-08 17:12 ` [PATCH 05/10] MACH/Samsung/Mini2440: select touchscreen by default Juergen Beisert
2012-07-08 17:12 ` [PATCH 06/10] MACH/Samsung/Mini2440: use leds-gpio driver for board leds Juergen Beisert
2012-07-08 17:12 ` [PATCH 07/10] MACH/Samsung/Mini2440: add hwmon capabilities to mini2440 Juergen Beisert
2012-07-08 17:12 ` [PATCH 08/10] MACH/Samsung/Mini2440: enable button 6 as one of the GPIO keys Juergen Beisert
2012-07-08 17:12 ` Juergen Beisert [this message]
2012-07-08 18:10   ` [PATCH 09/10] MACH/Samsung/Mini2440: enable buzzer Juergen Beisert
2012-07-08 18:20   ` Juergen Beisert
2012-07-08 17:12 ` [PATCH 10/10] MACH/Samsung/Mini2440: update the default config Juergen Beisert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1341767544-17447-10-git-send-email-jbe@pengutronix.de \
    --to=jbe@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).