diff mbox

[09/10] MACH/Samsung/Mini2440: enable buzzer

Message ID 1341767544-17447-10-git-send-email-jbe@pengutronix.de (mailing list archive)
State New, archived
Headers show

Commit Message

Juergen Borleis July 8, 2012, 5:12 p.m. UTC 
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(-)

Comments

Juergen Borleis July 8, 2012, 6:10 p.m. UTC | #1 
Juergen Beisert wrote:
> [...]
> 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

Ups, something went wrong with my very last 'git rebase'. This one should be
part of the [PATCH 01/10] :(

Will resend.

jbe
diff mbox

Patch

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