[ARM] pxa: make mainstone use the generic PWM backlight driver

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index b7a3281c420eb7c1d4b65e702b4d5b74cdfb82c5..2d711308076f00bc829e3886ed32ed556b5c405d 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -41,6 +41,7 @@ config MACH_LOGICPD_PXA270
 config MACH_MAINSTONE
        bool "Intel HCDDBBVA0 Development Platform"
        select PXA27x
+       select HAVE_PWM
 
 config ARCH_PXA_IDP
        bool "Accelent Xscale IDP"

diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 7399fb34da4e8edc3edfa72532276ca05f20005c..266594426e8bb0049057510005ad8942a5823d1c 100644 (file)
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -23,9 +23,9 @@
 #include <linux/ioport.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/backlight.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
+#include <linux/pwm_backlight.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -349,56 +349,27 @@ static struct platform_device mst_flash_device[2] = {
        },
 };
 
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-static int mainstone_backlight_update_status(struct backlight_device *bl)
-{
-       int brightness = bl->props.brightness;
-
-       if (bl->props.power != FB_BLANK_UNBLANK ||
-           bl->props.fb_blank != FB_BLANK_UNBLANK)
-               brightness = 0;
-
-       if (brightness != 0)
-               pxa_set_cken(CKEN_PWM0, 1);
-
-       PWM_CTRL0 = 0;
-       PWM_PWDUTY0 = brightness;
-       PWM_PERVAL0 = bl->props.max_brightness;
-
-       if (brightness == 0)
-               pxa_set_cken(CKEN_PWM0, 0);
-       return 0; /* pointless return value */
-}
-
-static int mainstone_backlight_get_brightness(struct backlight_device *bl)
-{
-       return PWM_PWDUTY0;
-}
+#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
+static struct platform_pwm_backlight_data mainstone_backlight_data = {
+       .pwm_id         = 0,
+       .max_brightness = 1023,
+       .dft_brightness = 1023,
+       .pwm_period_ns  = 78770,
+};
 
-static /*const*/ struct backlight_ops mainstone_backlight_ops = {
-       .update_status  = mainstone_backlight_update_status,
-       .get_brightness = mainstone_backlight_get_brightness,
+static struct platform_device mainstone_backlight_device = {
+       .name           = "pwm-backlight",
+       .dev            = {
+               .parent = &pxa27x_device_pwm0.dev,
+               .platform_data = &mainstone_backlight_data,
+       },
 };
 
 static void __init mainstone_backlight_register(void)
 {
-       struct backlight_device *bl;
-
-       bl = backlight_device_register("mainstone-bl", &pxa_device_fb.dev,
-                                      NULL, &mainstone_backlight_ops);
-       if (IS_ERR(bl)) {
-               printk(KERN_ERR "mainstone: unable to register backlight: %ld\n",
-                      PTR_ERR(bl));
-               return;
-       }
-
-       /*
-        * broken design - register-then-setup interfaces are
-        * utterly broken by definition.
-        */
-       bl->props.max_brightness = 1023;
-       bl->props.brightness = 1023;
-       backlight_update_status(bl);
+       int ret = platform_device_register(&mainstone_backlight_device);
+       if (ret)
+               printk(KERN_ERR "mainstone: failed to register backlight device: %d\n", ret);
 }
 #else
 #define mainstone_backlight_register() do { } while (0)