Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  backlight: Add driver for Tabletkiosk Sahara TouchIT-213 Tablet PC
  backlight: da903x: Add backlight driver for DA9030/DA9034
  tosa: add support for bl/lcd driver
  backlight: add support for Sharp SL-6000 LCD and backlight drivers

8 files changed, 942 insertions, 1 deletions

diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h
index 8bce6d8615b9..4df2d38507dc 100644
--- a/arch/arm/mach-pxa/include/mach/tosa.h
+++ b/arch/arm/mach-pxa/include/mach/tosa.h
@@ -193,4 +193,7 @@
 #define TOSA_KEY_MAIL           KEY_MAIL
 #endif
 
+struct spi_device;
+extern int tosa_bl_enable(struct spi_device *spi, int enable);
+
 #endif /* _ASM_ARCH_TOSA_H_ */
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index a6c4694359ca..224897a67d15 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -31,6 +31,7 @@
 #include <linux/gpio.h>
 #include <linux/pda_power.h>
 #include <linux/rfkill.h>
+#include <linux/spi/spi.h>
 
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -42,6 +43,7 @@
 #include <mach/mmc.h>
 #include <mach/udc.h>
 #include <mach/tosa_bt.h>
+#include <mach/pxa2xx_spi.h>
 
 #include <asm/mach/arch.h>
 #include <mach/tosa.h>
@@ -612,7 +614,7 @@ static int tosa_tc6393xb_enable(struct platform_device *dev)
         rc = gpio_request(TOSA_GPIO_TC6393XB_SUSPEND, "tc6393xb #suspend");
         if (rc)
                 goto err_req_suspend;
-        rc = gpio_request(TOSA_GPIO_TC6393XB_L3V_ON, "l3v");
+        rc = gpio_request(TOSA_GPIO_TC6393XB_L3V_ON, "tc6393xb l3v");
         if (rc)
                 goto err_req_l3v;
         rc = gpio_direction_output(TOSA_GPIO_TC6393XB_L3V_ON, 0);
@@ -772,6 +774,20 @@ static struct platform_device tosa_bt_device = {
         .dev.platform_data = &tosa_bt_data,
 };
 
+static struct pxa2xx_spi_master pxa_ssp_master_info = {
+        .num_chipselect = 1,
+};
+
+static struct spi_board_info spi_board_info[] __initdata = {
+        {
+                .modalias       = "tosa-lcd",
+                // .platform_data
+                .max_speed_hz   = 28750,
+                .bus_num        = 2,
+                .chip_select    = 0,
+                .mode           = SPI_MODE_0,
+        },
+};
 
 static struct platform_device *devices[] __initdata = {
         &tosascoop_device,
@@ -826,6 +842,9 @@ static void __init tosa_init(void)
         pxa_set_i2c_info(NULL);
         platform_scoop_config = &tosa_pcmcia_config;
 
+        pxa2xx_set_spi_info(2, &pxa_ssp_master_info);
+        spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
+
         clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL);
 
         platform_add_devices(devices, ARRAY_SIZE(devices));
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index c72a13562954..51c94a5971b4 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -75,6 +75,15 @@ config LCD_PLATFORM
           This driver provides a platform-device registered LCD power
           control interface.
 
+config LCD_TOSA
+        tristate "Sharp SL-6000 LCD Driver"
+        depends on LCD_CLASS_DEVICE && SPI
+        depends on MACH_TOSA
+        default n
+        help
+          If you have an Sharp SL-6000 Zaurus say Y to enable a driver
+          for its LCD.
+
 #
 # Backlight
 #
@@ -171,6 +180,13 @@ config BACKLIGHT_PWM
           If you have a LCD backlight adjustable by PWM, say Y to enable
           this driver.
 
+config BACKLIGHT_DA903X
+        tristate "Backlight Driver for DA9030/DA9034 using WLED"
+        depends on BACKLIGHT_CLASS_DEVICE && PMIC_DA903X
+        help
+          If you have a LCD backlight connected to the WLED output of DA9030
+          or DA9034 WLED output, say Y here to enable this driver.
+
 config BACKLIGHT_MBP_NVIDIA
        tristate "MacBook Pro Nvidia Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE && X86
@@ -179,3 +195,19 @@ config BACKLIGHT_MBP_NVIDIA
          If you have an Apple Macbook Pro with Nvidia graphics hardware say Y
          to enable a driver for its backlight
 
+config BACKLIGHT_TOSA
+        tristate "Sharp SL-6000 Backlight Driver"
+        depends on BACKLIGHT_CLASS_DEVICE && I2C
+        depends on MACH_TOSA && LCD_TOSA
+        default n
+        help
+          If you have an Sharp SL-6000 Zaurus say Y to enable a driver
+          for its backlight
+
+config BACKLIGHT_SAHARA
+        tristate "Tabletkiosk Sahara Touch-iT Backlight Driver"
+        depends on BACKLIGHT_CLASS_DEVICE && X86
+        default n
+        help
+          If you have a Tabletkiosk Sahara Touch-iT, say y to enable the
+          backlight driver.
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 3ec551eb472c..103427de6703 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_LCD_ILI9320)	   += ili9320.o
 obj-$(CONFIG_LCD_PLATFORM)         += platform_lcd.o
 obj-$(CONFIG_LCD_VGG2432A4)        += vgg2432a4.o
 obj-$(CONFIG_LCD_TDO24M)           += tdo24m.o
+obj-$(CONFIG_LCD_TOSA)             += tosa_lcd.o
 
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o
@@ -17,5 +18,8 @@ obj-$(CONFIG_BACKLIGHT_OMAP1)	+= omap1_bl.o
 obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
+obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x.o
 obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
+obj-$(CONFIG_BACKLIGHT_TOSA)    += tosa_bl.o
+obj-$(CONFIG_BACKLIGHT_SAHARA)  += kb3886_bl.o
 
diff --git a/drivers/video/backlight/da903x.c b/drivers/video/backlight/da903x.c
new file mode 100644
index 000000000000..242c38250166
--- /dev/null
+++ b/drivers/video/backlight/da903x.c
@@ -0,0 +1,201 @@
+/*
+ * Backlight driver for Dialog Semiconductor DA9030/DA9034
+ *
+ * Copyright (C) 2008 Compulab, Ltd.
+ *      Mike Rapoport <mike@compulab.co.il>
+ *
+ * Copyright (C) 2006-2008 Marvell International Ltd.
+ *      Eric Miao <eric.miao@marvell.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/mfd/da903x.h>
+
+#define DA9030_WLED_CONTROL     0x25
+#define DA9030_WLED_CP_EN       (1 << 6)
+#define DA9030_WLED_TRIM(x)     ((x) & 0x7)
+
+#define DA9034_WLED_CONTROL1    0x3C
+#define DA9034_WLED_CONTROL2    0x3D
+
+#define DA9034_WLED_BOOST_EN    (1 << 5)
+
+#define DA9030_MAX_BRIGHTNESS   7
+#define DA9034_MAX_BRIGHTNESS   0x7f
+
+struct da903x_backlight_data {
+        struct device *da903x_dev;
+        int id;
+        int current_brightness;
+};
+
+static int da903x_backlight_set(struct backlight_device *bl, int brightness)
+{
+        struct da903x_backlight_data *data = bl_get_data(bl);
+        struct device *dev = data->da903x_dev;
+        uint8_t val;
+        int ret = 0;
+
+        switch (data->id) {
+        case DA9034_ID_WLED:
+                ret = da903x_update(dev, DA9034_WLED_CONTROL1,
+                                brightness, 0x7f);
+                if (ret)
+                        return ret;
+
+                if (data->current_brightness && brightness == 0)
+                        ret = da903x_clr_bits(dev,
+                                        DA9034_WLED_CONTROL2,
+                                        DA9034_WLED_BOOST_EN);
+
+                if (data->current_brightness == 0 && brightness)
+                        ret = da903x_set_bits(dev,
+                                        DA9034_WLED_CONTROL2,
+                                        DA9034_WLED_BOOST_EN);
+                break;
+        case DA9030_ID_WLED:
+                val = DA9030_WLED_TRIM(brightness);
+                val |= brightness ? DA9030_WLED_CP_EN : 0;
+                ret = da903x_write(dev, DA9030_WLED_CONTROL, val);
+                break;
+        }
+
+        if (ret)
+                return ret;
+
+        data->current_brightness = brightness;
+        return 0;
+}
+
+static int da903x_backlight_update_status(struct backlight_device *bl)
+{
+        int brightness = bl->props.brightness;
+
+        if (bl->props.power != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        if (bl->props.fb_blank != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        return da903x_backlight_set(bl, brightness);
+}
+
+static int da903x_backlight_get_brightness(struct backlight_device *bl)
+{
+        struct da903x_backlight_data *data = bl_get_data(bl);
+        return data->current_brightness;
+}
+
+static struct backlight_ops da903x_backlight_ops = {
+        .update_status  = da903x_backlight_update_status,
+        .get_brightness = da903x_backlight_get_brightness,
+};
+
+static int da903x_backlight_probe(struct platform_device *pdev)
+{
+        struct da903x_backlight_data *data;
+        struct backlight_device *bl;
+        int max_brightness;
+
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (data == NULL)
+                return -ENOMEM;
+
+        switch (pdev->id) {
+        case DA9030_ID_WLED:
+                max_brightness = DA9030_MAX_BRIGHTNESS;
+                break;
+        case DA9034_ID_WLED:
+                max_brightness = DA9034_MAX_BRIGHTNESS;
+                break;
+        default:
+                dev_err(&pdev->dev, "invalid backlight device ID(%d)\n",
+                                pdev->id);
+                return -EINVAL;
+        }
+
+        data->id = pdev->id;
+        data->da903x_dev = pdev->dev.parent;
+        data->current_brightness = 0;
+
+        bl = backlight_device_register(pdev->name, data->da903x_dev,
+                        data, &da903x_backlight_ops);
+        if (IS_ERR(bl)) {
+                dev_err(&pdev->dev, "failed to register backlight\n");
+                return PTR_ERR(bl);
+        }
+
+        bl->props.max_brightness = max_brightness;
+        bl->props.brightness = max_brightness;
+
+        platform_set_drvdata(pdev, bl);
+        backlight_update_status(bl);
+        return 0;
+}
+
+static int da903x_backlight_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct da903x_backlight_data *data = bl_get_data(bl);
+
+        backlight_device_unregister(bl);
+        kfree(data);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int da903x_backlight_suspend(struct platform_device *pdev,
+                                 pm_message_t state)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        return da903x_backlight_set(bl, 0);
+}
+
+static int da903x_backlight_resume(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+
+        backlight_update_status(bl);
+        return 0;
+}
+#else
+#define da903x_backlight_suspend        NULL
+#define da903x_backlight_resume         NULL
+#endif
+
+static struct platform_driver da903x_backlight_driver = {
+        .driver         = {
+                .name   = "da903x-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = da903x_backlight_probe,
+        .remove         = da903x_backlight_remove,
+        .suspend        = da903x_backlight_suspend,
+        .resume         = da903x_backlight_resume,
+};
+
+static int __init da903x_backlight_init(void)
+{
+        return platform_driver_register(&da903x_backlight_driver);
+}
+module_init(da903x_backlight_init);
+
+static void __exit da903x_backlight_exit(void)
+{
+        platform_driver_unregister(&da903x_backlight_driver);
+}
+module_exit(da903x_backlight_exit);
+
+MODULE_DESCRIPTION("Backlight Driver for Dialog Semiconductor DA9030/DA9034");
+MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>"
+              "Mike Rapoport <mike@compulab.co.il>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:da903x-backlight");
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
new file mode 100644
index 000000000000..a38fda1742dd
--- /dev/null
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -0,0 +1,204 @@
+/*
+ *  Backlight Driver for the KB3886 Backlight
+ *
+ *  Copyright (c) 2007-2008 Claudio Nieder
+ *
+ *  Based on corgi_bl.c by Richard Purdie and kb3886 driver by Robert Woerle
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mutex.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/delay.h>
+#include <linux/dmi.h>
+
+#define KB3886_PARENT 0x64
+#define KB3886_IO 0x60
+#define KB3886_ADC_DAC_PWM 0xC4
+#define KB3886_PWM0_WRITE 0x81
+#define KB3886_PWM0_READ 0x41
+
+static DEFINE_MUTEX(bl_mutex);
+
+static void kb3886_bl_set_intensity(int intensity)
+{
+        mutex_lock(&bl_mutex);
+        intensity = intensity&0xff;
+        outb(KB3886_ADC_DAC_PWM, KB3886_PARENT);
+        msleep(10);
+        outb(KB3886_PWM0_WRITE, KB3886_IO);
+        msleep(10);
+        outb(intensity, KB3886_IO);
+        mutex_unlock(&bl_mutex);
+}
+
+struct kb3886bl_machinfo {
+        int max_intensity;
+        int default_intensity;
+        int limit_mask;
+        void (*set_bl_intensity)(int intensity);
+};
+
+static struct kb3886bl_machinfo kb3886_bl_machinfo = {
+        .max_intensity = 0xff,
+        .default_intensity = 0xa0,
+        .limit_mask = 0x7f,
+        .set_bl_intensity = kb3886_bl_set_intensity,
+};
+
+static struct platform_device kb3886bl_device = {
+        .name           = "kb3886-bl",
+        .dev            = {
+                .platform_data  = &kb3886_bl_machinfo,
+        },
+        .id             = -1,
+};
+
+static struct platform_device *devices[] __initdata = {
+        &kb3886bl_device,
+};
+
+/*
+ * Back to driver
+ */
+
+static int kb3886bl_intensity;
+static struct backlight_device *kb3886_backlight_device;
+static struct kb3886bl_machinfo *bl_machinfo;
+
+static unsigned long kb3886bl_flags;
+#define KB3886BL_SUSPENDED     0x01
+
+static struct dmi_system_id __initdata kb3886bl_device_table[] = {
+        {
+                .ident = "Sahara Touch-iT",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "SDV"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "iTouch T201"),
+                },
+        },
+        { }
+};
+
+static int kb3886bl_send_intensity(struct backlight_device *bd)
+{
+        int intensity = bd->props.brightness;
+
+        if (bd->props.power != FB_BLANK_UNBLANK)
+                intensity = 0;
+        if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+                intensity = 0;
+        if (kb3886bl_flags & KB3886BL_SUSPENDED)
+                intensity = 0;
+
+        bl_machinfo->set_bl_intensity(intensity);
+
+        kb3886bl_intensity = intensity;
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int kb3886bl_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct backlight_device *bd = platform_get_drvdata(pdev);
+
+        kb3886bl_flags |= KB3886BL_SUSPENDED;
+        backlight_update_status(bd);
+        return 0;
+}
+
+static int kb3886bl_resume(struct platform_device *pdev)
+{
+        struct backlight_device *bd = platform_get_drvdata(pdev);
+
+        kb3886bl_flags &= ~KB3886BL_SUSPENDED;
+        backlight_update_status(bd);
+        return 0;
+}
+#else
+#define kb3886bl_suspend        NULL
+#define kb3886bl_resume         NULL
+#endif
+
+static int kb3886bl_get_intensity(struct backlight_device *bd)
+{
+        return kb3886bl_intensity;
+}
+
+static struct backlight_ops kb3886bl_ops = {
+        .get_brightness = kb3886bl_get_intensity,
+        .update_status  = kb3886bl_send_intensity,
+};
+
+static int kb3886bl_probe(struct platform_device *pdev)
+{
+        struct kb3886bl_machinfo *machinfo = pdev->dev.platform_data;
+
+        bl_machinfo = machinfo;
+        if (!machinfo->limit_mask)
+                machinfo->limit_mask = -1;
+
+        kb3886_backlight_device = backlight_device_register("kb3886-bl",
+                &pdev->dev, NULL, &kb3886bl_ops);
+        if (IS_ERR(kb3886_backlight_device))
+                return PTR_ERR(kb3886_backlight_device);
+
+        platform_set_drvdata(pdev, kb3886_backlight_device);
+
+        kb3886_backlight_device->props.max_brightness = machinfo->max_intensity;
+        kb3886_backlight_device->props.power = FB_BLANK_UNBLANK;
+        kb3886_backlight_device->props.brightness = machinfo->default_intensity;
+        backlight_update_status(kb3886_backlight_device);
+
+        return 0;
+}
+
+static int kb3886bl_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bd = platform_get_drvdata(pdev);
+
+        backlight_device_unregister(bd);
+
+        return 0;
+}
+
+static struct platform_driver kb3886bl_driver = {
+        .probe          = kb3886bl_probe,
+        .remove         = kb3886bl_remove,
+        .suspend        = kb3886bl_suspend,
+        .resume         = kb3886bl_resume,
+        .driver         = {
+                .name   = "kb3886-bl",
+        },
+};
+
+static int __init kb3886_init(void)
+{
+        if (!dmi_check_system(kb3886bl_device_table))
+                return -ENODEV;
+
+        platform_add_devices(devices, ARRAY_SIZE(devices));
+        return platform_driver_register(&kb3886bl_driver);
+}
+
+static void __exit kb3886_exit(void)
+{
+        platform_driver_unregister(&kb3886bl_driver);
+}
+
+module_init(kb3886_init);
+module_exit(kb3886_exit);
+
+MODULE_AUTHOR("Claudio Nieder <private@claudio.ch>");
+MODULE_DESCRIPTION("Tabletkiosk Sahara Touch-iT Backlight Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("dmi:*:svnSDV:pniTouchT201:*");
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
new file mode 100644
index 000000000000..43edbada12d1
--- /dev/null
+++ b/drivers/video/backlight/tosa_bl.c
@@ -0,0 +1,198 @@
+/*
+ *  LCD / Backlight control code for Sharp SL-6000x (tosa)
+ *
+ *  Copyright (c) 2005          Dirk Opfer
+ *  Copyright (c) 2007,2008     Dmitry Baryshkov
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+
+#include <asm/mach/sharpsl_param.h>
+
+#include <mach/tosa.h>
+
+#define COMADJ_DEFAULT  97
+
+#define DAC_CH1         0
+#define DAC_CH2         1
+
+struct tosa_bl_data {
+        struct i2c_client *i2c;
+        struct backlight_device *bl;
+
+        int comadj;
+};
+
+static void tosa_bl_set_backlight(struct tosa_bl_data *data, int brightness)
+{
+        struct spi_device *spi = data->i2c->dev.platform_data;
+
+        i2c_smbus_write_byte_data(data->i2c, DAC_CH1, data->comadj);
+
+        /* SetBacklightDuty */
+        i2c_smbus_write_byte_data(data->i2c, DAC_CH2, (u8)(brightness & 0xff));
+
+        /* SetBacklightVR */
+        gpio_set_value(TOSA_GPIO_BL_C20MA, brightness & 0x100);
+
+        tosa_bl_enable(spi, brightness);
+}
+
+static int tosa_bl_update_status(struct backlight_device *dev)
+{
+        struct backlight_properties *props = &dev->props;
+        struct tosa_bl_data *data = dev_get_drvdata(&dev->dev);
+        int power = max(props->power, props->fb_blank);
+        int brightness = props->brightness;
+
+        if (power)
+                brightness = 0;
+
+        tosa_bl_set_backlight(data, brightness);
+
+        return 0;
+}
+
+static int tosa_bl_get_brightness(struct backlight_device *dev)
+{
+        struct backlight_properties *props = &dev->props;
+
+        return props->brightness;
+}
+
+static struct backlight_ops bl_ops = {
+        .get_brightness         = tosa_bl_get_brightness,
+        .update_status          = tosa_bl_update_status,
+};
+
+static int __devinit tosa_bl_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct tosa_bl_data *data = kzalloc(sizeof(struct tosa_bl_data), GFP_KERNEL);
+        int ret = 0;
+        if (!data)
+                return -ENOMEM;
+
+        data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj;
+
+        ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight");
+        if (ret) {
+                dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
+                goto err_gpio_bl;
+        }
+        ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
+        if (ret)
+                goto err_gpio_dir;
+
+        i2c_set_clientdata(client, data);
+        data->i2c = client;
+
+        data->bl = backlight_device_register("tosa-bl", &client->dev,
+                        data, &bl_ops);
+        if (IS_ERR(data->bl)) {
+                ret = PTR_ERR(data->bl);
+                goto err_reg;
+        }
+
+        data->bl->props.brightness = 69;
+        data->bl->props.max_brightness = 512 - 1;
+        data->bl->props.power = FB_BLANK_UNBLANK;
+
+        backlight_update_status(data->bl);
+
+        return 0;
+
+err_reg:
+        data->bl = NULL;
+        i2c_set_clientdata(client, NULL);
+err_gpio_dir:
+        gpio_free(TOSA_GPIO_BL_C20MA);
+err_gpio_bl:
+        kfree(data);
+        return ret;
+}
+
+static int __devexit tosa_bl_remove(struct i2c_client *client)
+{
+        struct tosa_bl_data *data = i2c_get_clientdata(client);
+
+        backlight_device_unregister(data->bl);
+        data->bl = NULL;
+        i2c_set_clientdata(client, NULL);
+
+        gpio_free(TOSA_GPIO_BL_C20MA);
+
+        kfree(data);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int tosa_bl_suspend(struct i2c_client *client, pm_message_t pm)
+{
+        struct tosa_bl_data *data = i2c_get_clientdata(client);
+
+        tosa_bl_set_backlight(data, 0);
+
+        return 0;
+}
+
+static int tosa_bl_resume(struct i2c_client *client)
+{
+        struct tosa_bl_data *data = i2c_get_clientdata(client);
+
+        backlight_update_status(data->bl);
+        return 0;
+}
+#else
+#define tosa_bl_suspend NULL
+#define tosa_bl_resume NULL
+#endif
+
+static const struct i2c_device_id tosa_bl_id[] = {
+        { "tosa-bl", 0 },
+        { },
+};
+
+
+static struct i2c_driver tosa_bl_driver = {
+        .driver = {
+                .name           = "tosa-bl",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = tosa_bl_probe,
+        .remove         = __devexit_p(tosa_bl_remove),
+        .suspend        = tosa_bl_suspend,
+        .resume         = tosa_bl_resume,
+        .id_table       = tosa_bl_id,
+};
+
+static int __init tosa_bl_init(void)
+{
+        return i2c_add_driver(&tosa_bl_driver);
+}
+
+static void __exit tosa_bl_exit(void)
+{
+        i2c_del_driver(&tosa_bl_driver);
+}
+
+module_init(tosa_bl_init);
+module_exit(tosa_bl_exit);
+
+MODULE_AUTHOR("Dmitry Baryshkov");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("LCD/Backlight control for Sharp SL-6000 PDA");
+
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
new file mode 100644
index 000000000000..57a26649f1a5
--- /dev/null
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -0,0 +1,280 @@
+/*
+ *  LCD / Backlight control code for Sharp SL-6000x (tosa)
+ *
+ *  Copyright (c) 2005          Dirk Opfer
+ *  Copyright (c) 2007,2008     Dmitry Baryshkov
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/spi/spi.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/lcd.h>
+#include <linux/fb.h>
+
+#include <asm/mach/sharpsl_param.h>
+
+#include <mach/tosa.h>
+
+#define POWER_IS_ON(pwr)        ((pwr) <= FB_BLANK_NORMAL)
+
+#define TG_REG0_VQV     0x0001
+#define TG_REG0_COLOR   0x0002
+#define TG_REG0_UD      0x0004
+#define TG_REG0_LR      0x0008
+
+#define DAC_BASE        0x4e
+
+struct tosa_lcd_data {
+        struct spi_device *spi;
+        struct lcd_device *lcd;
+        struct i2c_client *i2c;
+
+        int lcd_power;
+};
+
+static int tosa_tg_send(struct spi_device *spi, int adrs, uint8_t data)
+{
+        u8 buf[1];
+        struct spi_message msg;
+        struct spi_transfer xfer = {
+                .len            = 1,
+                .cs_change      = 1,
+                .tx_buf         = buf,
+        };
+
+        buf[0] = ((adrs & 0x07) << 5) | (data & 0x1f);
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+
+        return spi_sync(spi, &msg);
+}
+
+int tosa_bl_enable(struct spi_device *spi, int enable)
+{
+        /* bl_enable GP04=1 otherwise GP04=0*/
+        return tosa_tg_send(spi, TG_GPODR2, enable? 0x01 : 0x00);
+}
+EXPORT_SYMBOL(tosa_bl_enable);
+
+static void tosa_lcd_tg_init(struct tosa_lcd_data *data)
+{
+        /* TG on */
+        gpio_set_value(TOSA_GPIO_TG_ON, 0);
+
+        mdelay(60);
+
+        /* delayed 0clk TCTL signal for VGA */
+        tosa_tg_send(data->spi, TG_TPOSCTL, 0x00);
+        /* GPOS0=powercontrol, GPOS1=GPIO, GPOS2=TCTL */
+        tosa_tg_send(data->spi, TG_GPOSR, 0x02);
+}
+
+static void tosa_lcd_tg_on(struct tosa_lcd_data *data)
+{
+        struct spi_device *spi = data->spi;
+        const int value = TG_REG0_COLOR | TG_REG0_UD | TG_REG0_LR;
+        tosa_tg_send(spi, TG_PNLCTL, value | TG_REG0_VQV); /* this depends on mode */
+
+        /* TG LCD pannel power up */
+        tosa_tg_send(spi, TG_PINICTL,0x4);
+        mdelay(50);
+
+        /* TG LCD GVSS */
+        tosa_tg_send(spi, TG_PINICTL,0x0);
+
+        if (!data->i2c) {
+                /* after the pannel is powered up the first time, we can access the i2c bus */
+                /* so probe for the DAC */
+                struct i2c_adapter *adap = i2c_get_adapter(0);
+                struct i2c_board_info info = {
+                        .type   = "tosa-bl",
+                        .addr   = DAC_BASE,
+                        .platform_data = data->spi,
+                };
+                data->i2c = i2c_new_device(adap, &info);
+        }
+}
+
+static void tosa_lcd_tg_off(struct tosa_lcd_data *data)
+{
+        struct spi_device *spi = data->spi;
+
+        /* TG LCD VHSA off */
+        tosa_tg_send(spi, TG_PINICTL,0x4);
+        mdelay(50);
+
+        /* TG LCD signal off */
+        tosa_tg_send(spi, TG_PINICTL,0x6);
+        mdelay(50);
+
+        /* TG Off */
+        gpio_set_value(TOSA_GPIO_TG_ON, 1);
+        mdelay(100);
+}
+
+int tosa_lcd_set_power(struct lcd_device *lcd, int power)
+{
+        struct tosa_lcd_data *data = lcd_get_data(lcd);
+
+        if (POWER_IS_ON(power) && !POWER_IS_ON(data->lcd_power))
+                tosa_lcd_tg_on(data);
+
+        if (!POWER_IS_ON(power) && POWER_IS_ON(data->lcd_power))
+                tosa_lcd_tg_off(data);
+
+        data->lcd_power = power;
+        return 0;
+}
+
+static int tosa_lcd_get_power(struct lcd_device *lcd)
+{
+        struct tosa_lcd_data *data = lcd_get_data(lcd);
+
+        return data->lcd_power;
+}
+
+static struct lcd_ops tosa_lcd_ops = {
+        .set_power = tosa_lcd_set_power,
+        .get_power = tosa_lcd_get_power,
+};
+
+static int __devinit tosa_lcd_probe(struct spi_device *spi)
+{
+        int ret;
+        struct tosa_lcd_data *data;
+
+        data = kzalloc(sizeof(struct tosa_lcd_data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+
+        /*
+         * bits_per_word cannot be configured in platform data
+         */
+        spi->bits_per_word = 8;
+
+        ret = spi_setup(spi);
+        if (ret < 0)
+                goto err_spi;
+
+        data->spi = spi;
+        dev_set_drvdata(&spi->dev, data);
+
+        ret = gpio_request(TOSA_GPIO_TG_ON, "tg #pwr");
+        if (ret < 0)
+                goto err_gpio_tg;
+
+        mdelay(60);
+
+        ret = gpio_direction_output(TOSA_GPIO_TG_ON, 0);
+        if (ret < 0)
+                goto err_gpio_dir;
+
+        mdelay(60);
+        tosa_lcd_tg_init(data);
+
+        tosa_lcd_tg_on(data);
+
+        data->lcd = lcd_device_register("tosa-lcd", &spi->dev, data,
+                        &tosa_lcd_ops);
+
+        if (IS_ERR(data->lcd)) {
+                ret = PTR_ERR(data->lcd);
+                data->lcd = NULL;
+                goto err_register;
+        }
+
+        return 0;
+
+err_register:
+        tosa_lcd_tg_off(data);
+err_gpio_dir:
+        gpio_free(TOSA_GPIO_TG_ON);
+err_gpio_tg:
+        dev_set_drvdata(&spi->dev, NULL);
+err_spi:
+        kfree(data);
+        return ret;
+}
+
+static int __devexit tosa_lcd_remove(struct spi_device *spi)
+{
+        struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);
+
+        lcd_device_unregister(data->lcd);
+
+        if (data->i2c)
+                i2c_unregister_device(data->i2c);
+
+        tosa_lcd_tg_off(data);
+
+        gpio_free(TOSA_GPIO_TG_ON);
+        dev_set_drvdata(&spi->dev, NULL);
+        kfree(data);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int tosa_lcd_suspend(struct spi_device *spi, pm_message_t state)
+{
+        struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);
+
+        tosa_lcd_tg_off(data);
+
+        return 0;
+}
+
+static int tosa_lcd_resume(struct spi_device *spi)
+{
+        struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);
+
+        tosa_lcd_tg_init(data);
+        if (POWER_IS_ON(data->lcd_power))
+                tosa_lcd_tg_on(data);
+        else
+                tosa_lcd_tg_off(data);
+
+        return 0;
+}
+#else
+#define tosa_lcd_suspend        NULL
+#define tosa_lcd_reume NULL
+#endif
+
+static struct spi_driver tosa_lcd_driver = {
+        .driver = {
+                .name           = "tosa-lcd",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = tosa_lcd_probe,
+        .remove         = __devexit_p(tosa_lcd_remove),
+        .suspend        = tosa_lcd_suspend,
+        .resume         = tosa_lcd_resume,
+};
+
+static int __init tosa_lcd_init(void)
+{
+        return spi_register_driver(&tosa_lcd_driver);
+}
+
+static void __exit tosa_lcd_exit(void)
+{
+        spi_unregister_driver(&tosa_lcd_driver);
+}
+
+module_init(tosa_lcd_init);
+module_exit(tosa_lcd_exit);
+
+MODULE_AUTHOR("Dmitry Baryshkov");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("LCD/Backlight control for Sharp SL-6000 PDA");
+