diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2012-09-13 02:52:08 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-09-13 02:52:08 -0400 |
commit | 4d8cc596dd9f8dcc909ad405742099239aaa48c0 (patch) | |
tree | 85fd9fe4eb358b084c3873ab6ece67fe4f23254a /arch/arm/mach-exynos | |
parent | 162b172ddd7aacc754253f97b1b1ee75344bc22c (diff) |
ARM: EXYNOS: Use generic pwm driver in Origen board
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: <thierry.reding@avionic-design.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index b5b4c8c9db11..4d198d487fc4 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -348,6 +348,7 @@ config MACH_ORIGEN | |||
348 | select EXYNOS4_SETUP_FIMD0 | 348 | select EXYNOS4_SETUP_FIMD0 |
349 | select EXYNOS4_SETUP_SDHCI | 349 | select EXYNOS4_SETUP_SDHCI |
350 | select EXYNOS4_SETUP_USB_PHY | 350 | select EXYNOS4_SETUP_USB_PHY |
351 | select S3C24XX_PWM | ||
351 | help | 352 | help |
352 | Machine support for ORIGEN based on Samsung EXYNOS4210 | 353 | Machine support for ORIGEN based on Samsung EXYNOS4210 |
353 | 354 | ||
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 5ca80307d6d7..2203664fb0c4 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
17 | #include <linux/input.h> | 17 | #include <linux/input.h> |
18 | #include <linux/pwm.h> | ||
18 | #include <linux/pwm_backlight.h> | 19 | #include <linux/pwm_backlight.h> |
19 | #include <linux/gpio_keys.h> | 20 | #include <linux/gpio_keys.h> |
20 | #include <linux/i2c.h> | 21 | #include <linux/i2c.h> |
@@ -613,6 +614,10 @@ static struct platform_device origen_lcd_hv070wsa = { | |||
613 | .dev.platform_data = &origen_lcd_hv070wsa_data, | 614 | .dev.platform_data = &origen_lcd_hv070wsa_data, |
614 | }; | 615 | }; |
615 | 616 | ||
617 | static struct pwm_lookup origen_pwm_lookup[] = { | ||
618 | PWM_LOOKUP("s3c24xx-pwm.0", 0, "pwm-backlight.0", NULL), | ||
619 | }; | ||
620 | |||
616 | #ifdef CONFIG_DRM_EXYNOS | 621 | #ifdef CONFIG_DRM_EXYNOS |
617 | static struct exynos_drm_fimd_pdata drm_fimd_pdata = { | 622 | static struct exynos_drm_fimd_pdata drm_fimd_pdata = { |
618 | .panel = { | 623 | .panel = { |
@@ -791,6 +796,7 @@ static void __init origen_machine_init(void) | |||
791 | 796 | ||
792 | platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); | 797 | platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); |
793 | 798 | ||
799 | pwm_add_table(origen_pwm_lookup, ARRAY_SIZE(origen_pwm_lookup)); | ||
794 | samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data); | 800 | samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data); |
795 | 801 | ||
796 | origen_bt_setup(); | 802 | origen_bt_setup(); |