Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:49:42 +0000 (10:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:49:42 +0000 (10:49 -0700)
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  backlight: new driver for ADP5520/ADP5501 MFD PMICs
  backlight: extend event support to also support poll()
  backlight/eeepc-laptop: Update the backlight state when we change brightness
  backlight/acpi: Update the backlight state when we change brightness
  backlight: Allow drivers to update the core, and generate events on changes
  backlight: switch to da903x driver to dev_pm_ops
  backlight: Add support for the Avionic Design Xanthos backlight device.
  backlight: spi driver for LMS283GF05 LCD
  backlight: move hp680-bl's probe function to .devinit.text
  backlight: Add support for new Apple machines.
  backlight: mbp_nvidia_bl: add support for MacBookAir 1,1
  backlight: Add WM831x backlight driver

Trivial conflicts due to '#ifdef CONFIG_PM' differences in
drivers/video/backlight/da903x_bl.c

13 files changed:
drivers/acpi/video.c
drivers/platform/x86/eeepc-laptop.c
drivers/video/backlight/Kconfig
drivers/video/backlight/Makefile
drivers/video/backlight/adp5520_bl.c [new file with mode: 0644]
drivers/video/backlight/adx_bl.c [new file with mode: 0644]
drivers/video/backlight/backlight.c
drivers/video/backlight/hp680_bl.c
drivers/video/backlight/lms283gf05.c [new file with mode: 0644]
drivers/video/backlight/mbp_nvidia_bl.c
drivers/video/backlight/wm831x_bl.c [new file with mode: 0644]
include/linux/backlight.h
include/linux/spi/lms283gf05.h [new file with mode: 0644]

index 94b1a4c5abab26978503835e4b5a9bf965776c6d..a4fddb24476fdba0bc1ebbafd510aaa3544595d1 100644 (file)
@@ -1986,6 +1986,10 @@ acpi_video_switch_brightness(struct acpi_video_device *device, int event)
 
        result = acpi_video_device_lcd_set_level(device, level_next);
 
+       if (!result)
+               backlight_force_update(device->backlight,
+                                      BACKLIGHT_UPDATE_HOTKEY);
+
 out:
        if (result)
                printk(KERN_ERR PREFIX "Failed to switch the brightness\n");
index da3c08b3dcc1d719918e26718986a75817b76203..749e2102b2be7519b8f0835979d7b0e9320356de 100644 (file)
@@ -624,7 +624,7 @@ static int notify_brn(void)
        struct backlight_device *bd = eeepc_backlight_device;
        if (bd) {
                int old = bd->props.brightness;
-               bd->props.brightness = read_brightness(bd);
+               backlight_force_update(bd, BACKLIGHT_UPDATE_HOTKEY);
                return old;
        }
        return -1;
index 90861cd93165124461a2bcc18c57e603b86155df..09bfa9662e4d9fd8cf032e0f30d2cca19cc20b2b 100644 (file)
@@ -31,6 +31,13 @@ config LCD_CORGI
          Say y here to support the LCD panels usually found on SHARP
          corgi (C7x0) and spitz (Cxx00) models.
 
+config LCD_LMS283GF05
+       tristate "Samsung LMS283GF05 LCD"
+       depends on LCD_CLASS_DEVICE && SPI_MASTER && GENERIC_GPIO
+       help
+         SPI driver for Samsung LMS283GF05. This provides basic support
+         for powering the LCD up/down through a sysfs interface.
+
 config LCD_LTV350QV
        tristate "Samsung LTV350QV LCD Panel"
        depends on LCD_CLASS_DEVICE && SPI_MASTER
@@ -229,3 +236,29 @@ config BACKLIGHT_SAHARA
        help
          If you have a Tabletkiosk Sahara Touch-iT, say y to enable the
          backlight driver.
+
+config BACKLIGHT_WM831X
+       tristate "WM831x PMIC Backlight Driver"
+       depends on BACKLIGHT_CLASS_DEVICE && MFD_WM831X
+       help
+         If you have a backlight driven by the ISINK and DCDC of a
+         WM831x PMIC say y to enable the backlight driver for it.
+
+config BACKLIGHT_ADX
+       tristate "Avionic Design Xanthos Backlight Driver"
+       depends on BACKLIGHT_CLASS_DEVICE && ARCH_PXA_ADX
+       default y
+       help
+         Say Y to enable the backlight driver on Avionic Design Xanthos-based
+         boards.
+
+config BACKLIGHT_ADP5520
+       tristate "Backlight Driver for ADP5520/ADP5501 using WLED"
+       depends on BACKLIGHT_CLASS_DEVICE && PMIC_ADP5520
+       help
+         If you have a LCD backlight connected to the BST/BL_SNK output of
+         ADP5520 or ADP5501, say Y here to enable this driver.
+
+         To compile this driver as a module, choose M here: the module will
+         be called adp5520_bl.
+
index 4eb178c1d684a25850cff30bea530daeb6cd285b..9a405548874c74e5f7ede64283c4764fb3512758 100644 (file)
@@ -3,6 +3,7 @@
 obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 obj-$(CONFIG_LCD_CORGI)                   += corgi_lcd.o
 obj-$(CONFIG_LCD_HP700)                   += jornada720_lcd.o
+obj-$(CONFIG_LCD_LMS283GF05)      += lms283gf05.o
 obj-$(CONFIG_LCD_LTV350QV)        += ltv350qv.o
 obj-$(CONFIG_LCD_ILI9320)         += ili9320.o
 obj-$(CONFIG_LCD_PLATFORM)        += platform_lcd.o
@@ -24,4 +25,7 @@ obj-$(CONFIG_BACKLIGHT_DA903X)        += da903x_bl.o
 obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
 obj-$(CONFIG_BACKLIGHT_TOSA)   += tosa_bl.o
 obj-$(CONFIG_BACKLIGHT_SAHARA) += kb3886_bl.o
+obj-$(CONFIG_BACKLIGHT_WM831X) += wm831x_bl.o
+obj-$(CONFIG_BACKLIGHT_ADX)    += adx_bl.o
+obj-$(CONFIG_BACKLIGHT_ADP5520)        += adp5520_bl.o
 
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
new file mode 100644 (file)
index 0000000..ad05da5
--- /dev/null
@@ -0,0 +1,377 @@
+/*
+ * Backlight driver for Analog Devices ADP5520/ADP5501 MFD PMICs
+ *
+ * Copyright 2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/mfd/adp5520.h>
+
+struct adp5520_bl {
+       struct device *master;
+       struct adp5520_backlight_platfrom_data *pdata;
+       struct mutex lock;
+       unsigned long cached_daylight_max;
+       int id;
+       int current_brightness;
+};
+
+static int adp5520_bl_set(struct backlight_device *bl, int brightness)
+{
+       struct adp5520_bl *data = bl_get_data(bl);
+       struct device *master = data->master;
+       int ret = 0;
+
+       if (data->pdata->en_ambl_sens) {
+               if ((brightness > 0) && (brightness < ADP5020_MAX_BRIGHTNESS)) {
+                       /* Disable Ambient Light auto adjust */
+                       ret |= adp5520_clr_bits(master, BL_CONTROL,
+                                       BL_AUTO_ADJ);
+                       ret |= adp5520_write(master, DAYLIGHT_MAX, brightness);
+               } else {
+                       /*
+                        * MAX_BRIGHTNESS -> Enable Ambient Light auto adjust
+                        * restore daylight l3 sysfs brightness
+                        */
+                       ret |= adp5520_write(master, DAYLIGHT_MAX,
+                                        data->cached_daylight_max);
+                       ret |= adp5520_set_bits(master, BL_CONTROL,
+                                        BL_AUTO_ADJ);
+               }
+       } else {
+               ret |= adp5520_write(master, DAYLIGHT_MAX, brightness);
+       }
+
+       if (data->current_brightness && brightness == 0)
+               ret |= adp5520_set_bits(master,
+                               MODE_STATUS, DIM_EN);
+       else if (data->current_brightness == 0 && brightness)
+               ret |= adp5520_clr_bits(master,
+                               MODE_STATUS, DIM_EN);
+
+       if (!ret)
+               data->current_brightness = brightness;
+
+       return ret;
+}
+
+static int adp5520_bl_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 adp5520_bl_set(bl, brightness);
+}
+
+static int adp5520_bl_get_brightness(struct backlight_device *bl)
+{
+       struct adp5520_bl *data = bl_get_data(bl);
+       int error;
+       uint8_t reg_val;
+
+       error = adp5520_read(data->master, BL_VALUE, &reg_val);
+
+       return error ? data->current_brightness : reg_val;
+}
+
+static struct backlight_ops adp5520_bl_ops = {
+       .update_status  = adp5520_bl_update_status,
+       .get_brightness = adp5520_bl_get_brightness,
+};
+
+static int adp5520_bl_setup(struct backlight_device *bl)
+{
+       struct adp5520_bl *data = bl_get_data(bl);
+       struct device *master = data->master;
+       struct adp5520_backlight_platfrom_data *pdata = data->pdata;
+       int ret = 0;
+
+       ret |= adp5520_write(master, DAYLIGHT_MAX, pdata->l1_daylight_max);
+       ret |= adp5520_write(master, DAYLIGHT_DIM, pdata->l1_daylight_dim);
+
+       if (pdata->en_ambl_sens) {
+               data->cached_daylight_max = pdata->l1_daylight_max;
+               ret |= adp5520_write(master, OFFICE_MAX, pdata->l2_office_max);
+               ret |= adp5520_write(master, OFFICE_DIM, pdata->l2_office_dim);
+               ret |= adp5520_write(master, DARK_MAX, pdata->l3_dark_max);
+               ret |= adp5520_write(master, DARK_DIM, pdata->l3_dark_dim);
+               ret |= adp5520_write(master, L2_TRIP, pdata->l2_trip);
+               ret |= adp5520_write(master, L2_HYS, pdata->l2_hyst);
+               ret |= adp5520_write(master, L3_TRIP, pdata->l3_trip);
+               ret |= adp5520_write(master, L3_HYS, pdata->l3_hyst);
+               ret |= adp5520_write(master, ALS_CMPR_CFG,
+                       ALS_CMPR_CFG_VAL(pdata->abml_filt, L3_EN));
+       }
+
+       ret |= adp5520_write(master, BL_CONTROL,
+                       BL_CTRL_VAL(pdata->fade_led_law, pdata->en_ambl_sens));
+
+       ret |= adp5520_write(master, BL_FADE, FADE_VAL(pdata->fade_in,
+                       pdata->fade_out));
+
+       ret |= adp5520_set_bits(master, MODE_STATUS, BL_EN | DIM_EN);
+
+       return ret;
+}
+
+static ssize_t adp5520_show(struct device *dev, char *buf, int reg)
+{
+       struct adp5520_bl *data = dev_get_drvdata(dev);
+       int error;
+       uint8_t reg_val;
+
+       mutex_lock(&data->lock);
+       error = adp5520_read(data->master, reg, &reg_val);
+       mutex_unlock(&data->lock);
+
+       return sprintf(buf, "%u\n", reg_val);
+}
+
+static ssize_t adp5520_store(struct device *dev, const char *buf,
+                        size_t count, int reg)
+{
+       struct adp5520_bl *data = dev_get_drvdata(dev);
+       unsigned long val;
+       int ret;
+
+       ret = strict_strtoul(buf, 10, &val);
+       if (ret)
+               return ret;
+
+       mutex_lock(&data->lock);
+       adp5520_write(data->master, reg, val);
+       mutex_unlock(&data->lock);
+
+       return count;
+}
+
+static ssize_t adp5520_bl_dark_max_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       return adp5520_show(dev, buf, DARK_MAX);
+}
+
+static ssize_t adp5520_bl_dark_max_store(struct device *dev,
+               struct device_attribute *attr, const char *buf, size_t count)
+{
+       return adp5520_store(dev, buf, count, DARK_MAX);
+}
+static DEVICE_ATTR(dark_max, 0664, adp5520_bl_dark_max_show,
+                       adp5520_bl_dark_max_store);
+
+static ssize_t adp5520_bl_office_max_show(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+       return adp5520_show(dev, buf, OFFICE_MAX);
+}
+
+static ssize_t adp5520_bl_office_max_store(struct device *dev,
+               struct device_attribute *attr, const char *buf, size_t count)
+{
+       return adp5520_store(dev, buf, count, OFFICE_MAX);
+}
+static DEVICE_ATTR(office_max, 0664, adp5520_bl_office_max_show,
+                       adp5520_bl_office_max_store);
+
+static ssize_t adp5520_bl_daylight_max_show(struct device *dev,
+                       struct device_attribute *attr, char *buf)
+{
+       return adp5520_show(dev, buf, DAYLIGHT_MAX);
+}
+
+static ssize_t adp5520_bl_daylight_max_store(struct device *dev,
+               struct device_attribute *attr, const char *buf, size_t count)
+{
+       struct adp5520_bl *data = dev_get_drvdata(dev);
+
+       strict_strtoul(buf, 10, &data->cached_daylight_max);
+       return adp5520_store(dev, buf, count, DAYLIGHT_MAX);
+}
+static DEVICE_ATTR(daylight_max, 0664, adp5520_bl_daylight_max_show,
+                       adp5520_bl_daylight_max_store);
+
+static ssize_t adp5520_bl_dark_dim_show(struct device *dev,
+                       struct device_attribute *attr, char *buf)
+{
+       return adp5520_show(dev, buf, DARK_DIM);
+}
+
+static ssize_t adp5520_bl_dark_dim_store(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
+{
+       return adp5520_store(dev, buf, count, DARK_DIM);
+}
+static DEVICE_ATTR(dark_dim, 0664, adp5520_bl_dark_dim_show,
+                       adp5520_bl_dark_dim_store);
+
+static ssize_t adp5520_bl_office_dim_show(struct device *dev,
+                       struct device_attribute *attr, char *buf)
+{
+       return adp5520_show(dev, buf, OFFICE_DIM);
+}
+
+static ssize_t adp5520_bl_office_dim_store(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
+{
+       return adp5520_store(dev, buf, count, OFFICE_DIM);
+}
+static DEVICE_ATTR(office_dim, 0664, adp5520_bl_office_dim_show,
+                       adp5520_bl_office_dim_store);
+
+static ssize_t adp5520_bl_daylight_dim_show(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+       return adp5520_show(dev, buf, DAYLIGHT_DIM);
+}
+
+static ssize_t adp5520_bl_daylight_dim_store(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
+{
+       return adp5520_store(dev, buf, count, DAYLIGHT_DIM);
+}
+static DEVICE_ATTR(daylight_dim, 0664, adp5520_bl_daylight_dim_show,
+                       adp5520_bl_daylight_dim_store);
+
+static struct attribute *adp5520_bl_attributes[] = {
+       &dev_attr_dark_max.attr,
+       &dev_attr_dark_dim.attr,
+       &dev_attr_office_max.attr,
+       &dev_attr_office_dim.attr,
+       &dev_attr_daylight_max.attr,
+       &dev_attr_daylight_dim.attr,
+       NULL
+};
+
+static const struct attribute_group adp5520_bl_attr_group = {
+       .attrs = adp5520_bl_attributes,
+};
+
+static int __devinit adp5520_bl_probe(struct platform_device *pdev)
+{
+       struct backlight_device *bl;
+       struct adp5520_bl *data;
+       int ret = 0;
+
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (data == NULL)
+               return -ENOMEM;
+
+       data->master = pdev->dev.parent;
+       data->pdata = pdev->dev.platform_data;
+
+       if (data->pdata  == NULL) {
+               dev_err(&pdev->dev, "missing platform data\n");
+               kfree(data);
+               return -ENODEV;
+       }
+
+       data->id = pdev->id;
+       data->current_brightness = 0;
+
+       mutex_init(&data->lock);
+
+       bl = backlight_device_register(pdev->name, data->master,
+                       data, &adp5520_bl_ops);
+       if (IS_ERR(bl)) {
+               dev_err(&pdev->dev, "failed to register backlight\n");
+               kfree(data);
+               return PTR_ERR(bl);
+       }
+
+       bl->props.max_brightness =
+               bl->props.brightness = ADP5020_MAX_BRIGHTNESS;
+
+       if (data->pdata->en_ambl_sens)
+               ret = sysfs_create_group(&bl->dev.kobj,
+                       &adp5520_bl_attr_group);
+
+       if (ret) {
+               dev_err(&pdev->dev, "failed to register sysfs\n");
+               backlight_device_unregister(bl);
+               kfree(data);
+       }
+
+       platform_set_drvdata(pdev, bl);
+       ret |= adp5520_bl_setup(bl);
+       backlight_update_status(bl);
+
+       return ret;
+}
+
+static int __devexit adp5520_bl_remove(struct platform_device *pdev)
+{
+       struct backlight_device *bl = platform_get_drvdata(pdev);
+       struct adp5520_bl *data = bl_get_data(bl);
+
+       adp5520_clr_bits(data->master, MODE_STATUS, BL_EN);
+
+       if (data->pdata->en_ambl_sens)
+               sysfs_remove_group(&bl->dev.kobj,
+                               &adp5520_bl_attr_group);
+
+       backlight_device_unregister(bl);
+       kfree(data);
+
+       return 0;
+}
+
+#ifdef CONFIG_PM
+static int adp5520_bl_suspend(struct platform_device *pdev,
+                                pm_message_t state)
+{
+       struct backlight_device *bl = platform_get_drvdata(pdev);
+       return adp5520_bl_set(bl, 0);
+}
+
+static int adp5520_bl_resume(struct platform_device *pdev)
+{
+       struct backlight_device *bl = platform_get_drvdata(pdev);
+
+       backlight_update_status(bl);
+       return 0;
+}
+#else
+#define adp5520_bl_suspend     NULL
+#define adp5520_bl_resume      NULL
+#endif
+
+static struct platform_driver adp5520_bl_driver = {
+       .driver         = {
+               .name   = "adp5520-backlight",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = adp5520_bl_probe,
+       .remove         = __devexit_p(adp5520_bl_remove),
+       .suspend        = adp5520_bl_suspend,
+       .resume         = adp5520_bl_resume,
+};
+
+static int __init adp5520_bl_init(void)
+{
+       return platform_driver_register(&adp5520_bl_driver);
+}
+module_init(adp5520_bl_init);
+
+static void __exit adp5520_bl_exit(void)
+{
+       platform_driver_unregister(&adp5520_bl_driver);
+}
+module_exit(adp5520_bl_exit);
+
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("ADP5520(01) Backlight Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:adp5520-backlight");
diff --git a/drivers/video/backlight/adx_bl.c b/drivers/video/backlight/adx_bl.c
new file mode 100644 (file)
index 0000000..2c3bdfc
--- /dev/null
@@ -0,0 +1,178 @@
+/*
+ * linux/drivers/video/backlight/adx.c
+ *
+ * Copyright (C) 2009 Avionic Design GmbH
+ *
+ * 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.
+ *
+ * Written by Thierry Reding <thierry.reding@avionic-design.de>
+ */
+
+#include <linux/backlight.h>
+#include <linux/fb.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+/* register definitions */
+#define ADX_BACKLIGHT_CONTROL          0x00
+#define ADX_BACKLIGHT_CONTROL_ENABLE   (1 << 0)
+#define ADX_BACKLIGHT_BRIGHTNESS       0x08
+#define ADX_BACKLIGHT_STATUS           0x10
+#define ADX_BACKLIGHT_ERROR            0x18
+
+struct adxbl {
+       void __iomem *base;
+};
+
+static int adx_backlight_update_status(struct backlight_device *bldev)
+{
+       struct adxbl *bl = bl_get_data(bldev);
+       u32 value;
+
+       value = bldev->props.brightness;
+       writel(value, bl->base + ADX_BACKLIGHT_BRIGHTNESS);
+
+       value = readl(bl->base + ADX_BACKLIGHT_CONTROL);
+
+       if (bldev->props.state & BL_CORE_FBBLANK)
+               value &= ~ADX_BACKLIGHT_CONTROL_ENABLE;
+       else
+               value |= ADX_BACKLIGHT_CONTROL_ENABLE;
+
+       writel(value, bl->base + ADX_BACKLIGHT_CONTROL);
+
+       return 0;
+}
+
+static int adx_backlight_get_brightness(struct backlight_device *bldev)
+{
+       struct adxbl *bl = bl_get_data(bldev);
+       u32 brightness;
+
+       brightness = readl(bl->base + ADX_BACKLIGHT_BRIGHTNESS);
+       return brightness & 0xff;
+}
+
+static int adx_backlight_check_fb(struct fb_info *fb)
+{
+       return 1;
+}
+
+static struct backlight_ops adx_backlight_ops = {
+       .options = 0,
+       .update_status = adx_backlight_update_status,
+       .get_brightness = adx_backlight_get_brightness,
+       .check_fb = adx_backlight_check_fb,
+};
+
+static int __devinit adx_backlight_probe(struct platform_device *pdev)
+{
+       struct backlight_device *bldev;
+       struct resource *res;
+       struct adxbl *bl;
+       int ret = 0;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               ret = -ENXIO;
+               goto out;
+       }
+
+       res = devm_request_mem_region(&pdev->dev, res->start,
+                       resource_size(res), res->name);
+       if (!res) {
+               ret = -ENXIO;
+               goto out;
+       }
+
+       bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
+       if (!bl) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       bl->base = devm_ioremap_nocache(&pdev->dev, res->start,
+                       resource_size(res));
+       if (!bl->base) {
+               ret = -ENXIO;
+               goto out;
+       }
+
+       bldev = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, bl,
+                       &adx_backlight_ops);
+       if (!bldev) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       bldev->props.max_brightness = 0xff;
+       bldev->props.brightness = 0xff;
+       bldev->props.power = FB_BLANK_UNBLANK;
+
+       platform_set_drvdata(pdev, bldev);
+
+out:
+       return ret;
+}
+
+static int __devexit adx_backlight_remove(struct platform_device *pdev)
+{
+       struct backlight_device *bldev;
+       int ret = 0;
+
+       bldev = platform_get_drvdata(pdev);
+       bldev->props.power = FB_BLANK_UNBLANK;
+       bldev->props.brightness = 0xff;
+       backlight_update_status(bldev);
+       backlight_device_unregister(bldev);
+       platform_set_drvdata(pdev, NULL);
+
+       return ret;
+}
+
+#ifdef CONFIG_PM
+static int adx_backlight_suspend(struct platform_device *pdev,
+               pm_message_t state)
+{
+       return 0;
+}
+
+static int adx_backlight_resume(struct platform_device *pdev)
+{
+       return 0;
+}
+#else
+#define adx_backlight_suspend NULL
+#define adx_backlight_resume NULL
+#endif
+
+static struct platform_driver adx_backlight_driver = {
+       .probe = adx_backlight_probe,
+       .remove = __devexit_p(adx_backlight_remove),
+       .suspend = adx_backlight_suspend,
+       .resume = adx_backlight_resume,
+       .driver = {
+               .name = "adx-backlight",
+               .owner = THIS_MODULE,
+       },
+};
+
+static int __init adx_backlight_init(void)
+{
+       return platform_driver_register(&adx_backlight_driver);
+}
+
+static void __exit adx_backlight_exit(void)
+{
+       platform_driver_unregister(&adx_backlight_driver);
+}
+
+module_init(adx_backlight_init);
+module_exit(adx_backlight_exit);
+
+MODULE_AUTHOR("Thierry Reding <thierry.reding@avionic-design.de>");
+MODULE_DESCRIPTION("Avionic Design Xanthos Backlight Driver");
+MODULE_LICENSE("GPL v2");
index 157057c79ca3760fc80d6df28236dc0bbf106044..6615ac7fa60a6124e31257a2ce1b09cf871ed719 100644 (file)
@@ -73,6 +73,27 @@ static inline void backlight_unregister_fb(struct backlight_device *bd)
 }
 #endif /* CONFIG_FB */
 
+static void backlight_generate_event(struct backlight_device *bd,
+                                    enum backlight_update_reason reason)
+{
+       char *envp[2];
+
+       switch (reason) {
+       case BACKLIGHT_UPDATE_SYSFS:
+               envp[0] = "SOURCE=sysfs";
+               break;
+       case BACKLIGHT_UPDATE_HOTKEY:
+               envp[0] = "SOURCE=hotkey";
+               break;
+       default:
+               envp[0] = "SOURCE=unknown";
+               break;
+       }
+       envp[1] = NULL;
+       kobject_uevent_env(&bd->dev.kobj, KOBJ_CHANGE, envp);
+       sysfs_notify(&bd->dev.kobj, NULL, "actual_brightness");
+}
+
 static ssize_t backlight_show_power(struct device *dev,
                struct device_attribute *attr,char *buf)
 {
@@ -142,6 +163,8 @@ static ssize_t backlight_store_brightness(struct device *dev,
        }
        mutex_unlock(&bd->ops_lock);
 
+       backlight_generate_event(bd, BACKLIGHT_UPDATE_SYSFS);
+
        return rc;
 }
 
@@ -213,6 +236,25 @@ static struct device_attribute bl_device_attributes[] = {
        __ATTR_NULL,
 };
 
+/**
+ * backlight_force_update - tell the backlight subsystem that hardware state
+ *   has changed
+ * @bd: the backlight device to update
+ *
+ * Updates the internal state of the backlight in response to a hardware event,
+ * and generate a uevent to notify userspace
+ */
+void backlight_force_update(struct backlight_device *bd,
+                           enum backlight_update_reason reason)
+{
+       mutex_lock(&bd->ops_lock);
+       if (bd->ops && bd->ops->get_brightness)
+               bd->props.brightness = bd->ops->get_brightness(bd);
+       mutex_unlock(&bd->ops_lock);
+       backlight_generate_event(bd, reason);
+}
+EXPORT_SYMBOL(backlight_force_update);
+
 /**
  * backlight_device_register - create and register a new object of
  *   backlight_device class.
index 5be55a20d8c77326510f48a6ad0ba600b5c36435..7fb4eefff80daa497fdc4440508b5b3ca8739886 100644 (file)
@@ -103,7 +103,7 @@ static struct backlight_ops hp680bl_ops = {
        .update_status  = hp680bl_set_intensity,
 };
 
-static int __init hp680bl_probe(struct platform_device *pdev)
+static int __devinit hp680bl_probe(struct platform_device *pdev)
 {
        struct backlight_device *bd;
 
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
new file mode 100644 (file)
index 0000000..447b542
--- /dev/null
@@ -0,0 +1,242 @@
+/*
+ * lms283gf05.c -- support for Samsung LMS283GF05 LCD
+ *
+ * Copyright (c) 2009 Marek Vasut <marek.vasut@gmail.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/device.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/lcd.h>
+
+#include <linux/spi/spi.h>
+#include <linux/spi/lms283gf05.h>
+
+struct lms283gf05_state {
+       struct spi_device       *spi;
+       struct lcd_device       *ld;
+};
+
+struct lms283gf05_seq {
+       unsigned char           reg;
+       unsigned short          value;
+       unsigned char           delay;
+};
+
+/* Magic sequences supplied by manufacturer, for details refer to datasheet */
+static struct lms283gf05_seq disp_initseq[] = {
+       /* REG, VALUE, DELAY */
+       { 0x07, 0x0000, 0 },
+       { 0x13, 0x0000, 10 },
+
+       { 0x11, 0x3004, 0 },
+       { 0x14, 0x200F, 0 },
+       { 0x10, 0x1a20, 0 },
+       { 0x13, 0x0040, 50 },
+
+       { 0x13, 0x0060, 0 },
+       { 0x13, 0x0070, 200 },
+
+       { 0x01, 0x0127, 0 },
+       { 0x02, 0x0700, 0 },
+       { 0x03, 0x1030, 0 },
+       { 0x08, 0x0208, 0 },
+       { 0x0B, 0x0620, 0 },
+       { 0x0C, 0x0110, 0 },
+       { 0x30, 0x0120, 0 },
+       { 0x31, 0x0127, 0 },
+       { 0x32, 0x0000, 0 },
+       { 0x33, 0x0503, 0 },
+       { 0x34, 0x0727, 0 },
+       { 0x35, 0x0124, 0 },
+       { 0x36, 0x0706, 0 },
+       { 0x37, 0x0701, 0 },
+       { 0x38, 0x0F00, 0 },
+       { 0x39, 0x0F00, 0 },
+       { 0x40, 0x0000, 0 },
+       { 0x41, 0x0000, 0 },
+       { 0x42, 0x013f, 0 },
+       { 0x43, 0x0000, 0 },
+       { 0x44, 0x013f, 0 },
+       { 0x45, 0x0000, 0 },
+       { 0x46, 0xef00, 0 },
+       { 0x47, 0x013f, 0 },
+       { 0x48, 0x0000, 0 },
+       { 0x07, 0x0015, 30 },
+
+       { 0x07, 0x0017, 0 },
+
+       { 0x20, 0x0000, 0 },
+       { 0x21, 0x0000, 0 },
+       { 0x22, 0x0000, 0 }
+};
+
+static struct lms283gf05_seq disp_pdwnseq[] = {
+       { 0x07, 0x0016, 30 },
+
+       { 0x07, 0x0004, 0 },
+       { 0x10, 0x0220, 20 },
+
+       { 0x13, 0x0060, 50 },
+
+       { 0x13, 0x0040, 50 },
+
+       { 0x13, 0x0000, 0 },
+       { 0x10, 0x0000, 0 }
+};
+
+
+static void lms283gf05_reset(unsigned long gpio, bool inverted)
+{
+       gpio_set_value(gpio, !inverted);
+       mdelay(100);
+       gpio_set_value(gpio, inverted);
+       mdelay(20);
+       gpio_set_value(gpio, !inverted);
+       mdelay(20);
+}
+
+static void lms283gf05_toggle(struct spi_device *spi,
+                       struct lms283gf05_seq *seq, int sz)
+{
+       char buf[3];
+       int i;
+
+       for (i = 0; i < sz; i++) {
+               buf[0] = 0x74;
+               buf[1] = 0x00;
+               buf[2] = seq[i].reg;
+               spi_write(spi, buf, 3);
+
+               buf[0] = 0x76;
+               buf[1] = seq[i].value >> 8;
+               buf[2] = seq[i].value & 0xff;
+               spi_write(spi, buf, 3);
+
+               mdelay(seq[i].delay);
+       }
+}
+
+static int lms283gf05_power_set(struct lcd_device *ld, int power)
+{
+       struct lms283gf05_state *st = lcd_get_data(ld);
+       struct spi_device *spi = st->spi;
+       struct lms283gf05_pdata *pdata = spi->dev.platform_data;
+
+       if (power) {
+               if (pdata)
+                       lms283gf05_reset(pdata->reset_gpio,
+                                       pdata->reset_inverted);
+               lms283gf05_toggle(spi, disp_initseq, ARRAY_SIZE(disp_initseq));
+       } else {
+               lms283gf05_toggle(spi, disp_pdwnseq, ARRAY_SIZE(disp_pdwnseq));
+               if (pdata)
+                       gpio_set_value(pdata->reset_gpio,
+                                       pdata->reset_inverted);
+       }
+
+       return 0;
+}
+
+static struct lcd_ops lms_ops = {
+       .set_power      = lms283gf05_power_set,
+       .get_power      = NULL,
+};
+
+static int __devinit lms283gf05_probe(struct spi_device *spi)
+{
+       struct lms283gf05_state *st;
+       struct lms283gf05_pdata *pdata = spi->dev.platform_data;
+       struct lcd_device *ld;
+       int ret = 0;
+
+       if (pdata != NULL) {
+               ret = gpio_request(pdata->reset_gpio, "LMS285GF05 RESET");
+               if (ret)
+                       return ret;
+
+               ret = gpio_direction_output(pdata->reset_gpio,
+                                               !pdata->reset_inverted);
+               if (ret)
+                       goto err;
+       }
+
+       st = kzalloc(sizeof(struct lms283gf05_state), GFP_KERNEL);
+       if (st == NULL) {
+               dev_err(&spi->dev, "No memory for device state\n");
+               ret = -ENOMEM;
+               goto err;
+       }
+
+       ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops);
+       if (IS_ERR(ld)) {
+               ret = PTR_ERR(ld);
+               goto err2;
+       }
+
+       st->spi = spi;
+       st->ld = ld;
+
+       dev_set_drvdata(&spi->dev, st);
+
+       /* kick in the LCD */
+       if (pdata)
+               lms283gf05_reset(pdata->reset_gpio, pdata->reset_inverted);
+       lms283gf05_toggle(spi, disp_initseq, ARRAY_SIZE(disp_initseq));
+
+       return 0;
+
+err2:
+       kfree(st);
+err:
+       if (pdata != NULL)
+               gpio_free(pdata->reset_gpio);
+
+       return ret;
+}
+
+static int __devexit lms283gf05_remove(struct spi_device *spi)
+{
+       struct lms283gf05_state *st = dev_get_drvdata(&spi->dev);
+       struct lms283gf05_pdata *pdata = st->spi->dev.platform_data;
+
+       lcd_device_unregister(st->ld);
+
+       if (pdata != NULL)
+               gpio_free(pdata->reset_gpio);
+
+       kfree(st);
+
+       return 0;
+}
+
+static struct spi_driver lms283gf05_driver = {
+       .driver = {
+               .name   = "lms283gf05",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = lms283gf05_probe,
+       .remove         = __devexit_p(lms283gf05_remove),
+};
+
+static __init int lms283gf05_init(void)
+{
+       return spi_register_driver(&lms283gf05_driver);
+}
+
+static __exit void lms283gf05_exit(void)
+{
+       spi_unregister_driver(&lms283gf05_driver);
+}
+
+module_init(lms283gf05_init);
+module_exit(lms283gf05_exit);
+
+MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
+MODULE_DESCRIPTION("LCD283GF05 LCD");
+MODULE_LICENSE("GPL v2");
index 3bb4c0a50c62f501fca12471a09c046141d6ddca..9edb8d7c295f38ed02a31642b3eba3be1c5681c9 100644 (file)
@@ -164,6 +164,15 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
                },
                .driver_data    = (void *)&intel_chipset_data,
        },
+       {
+               .callback       = mbp_dmi_match,
+               .ident          = "MacBookAir 1,1",
+               .matches        = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir1,1"),
+               },
+               .driver_data    = (void *)&intel_chipset_data,
+       },
        {
                .callback       = mbp_dmi_match,
                .ident          = "MacBook 5,1",
@@ -173,6 +182,15 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
                },
                .driver_data    = (void *)&nvidia_chipset_data,
        },
+       {
+               .callback       = mbp_dmi_match,
+               .ident          = "MacBook 5,2",
+               .matches        = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5,2"),
+               },
+               .driver_data    = (void *)&nvidia_chipset_data,
+       },
        {
                .callback       = mbp_dmi_match,
                .ident          = "MacBookAir 2,1",
@@ -191,6 +209,24 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
                },
                .driver_data    = (void *)&nvidia_chipset_data,
        },
+       {
+               .callback       = mbp_dmi_match,
+               .ident          = "MacBookPro 5,2",
+               .matches        = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,2"),
+               },
+               .driver_data    = (void *)&nvidia_chipset_data,
+       },
+       {
+               .callback       = mbp_dmi_match,
+               .ident          = "MacBookPro 5,5",
+               .matches        = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,5"),
+               },
+               .driver_data    = (void *)&nvidia_chipset_data,
+       },
        { }
 };
 
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
new file mode 100644 (file)
index 0000000..467bdb7
--- /dev/null
@@ -0,0 +1,250 @@
+/*
+ * Backlight driver for Wolfson Microelectronics WM831x PMICs
+ *
+ * Copyright 2009 Wolfson Microelectonics plc
+ *
+ * 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/wm831x/core.h>
+#include <linux/mfd/wm831x/pdata.h>
+#include <linux/mfd/wm831x/regulator.h>
+
+struct wm831x_backlight_data {
+       struct wm831x *wm831x;
+       int isink_reg;
+       int current_brightness;
+};
+
+static int wm831x_backlight_set(struct backlight_device *bl, int brightness)
+{
+       struct wm831x_backlight_data *data = bl_get_data(bl);
+       struct wm831x *wm831x = data->wm831x;
+       int power_up = !data->current_brightness && brightness;
+       int power_down = data->current_brightness && !brightness;
+       int ret;
+
+       if (power_up) {
+               /* Enable the ISINK */
+               ret = wm831x_set_bits(wm831x, data->isink_reg,
+                                     WM831X_CS1_ENA, WM831X_CS1_ENA);
+               if (ret < 0)
+                       goto err;
+
+               /* Enable the DC-DC */
+               ret = wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE,
+                                     WM831X_DC4_ENA, WM831X_DC4_ENA);
+               if (ret < 0)
+                       goto err;
+       }
+
+       if (power_down) {
+               /* DCDC first */
+               ret = wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE,
+                                     WM831X_DC4_ENA, 0);
+               if (ret < 0)
+                       goto err;
+
+               /* ISINK */
+               ret = wm831x_set_bits(wm831x, data->isink_reg,
+                                     WM831X_CS1_DRIVE | WM831X_CS1_ENA, 0);
+               if (ret < 0)
+                       goto err;
+       }
+
+       /* Set the new brightness */
+       ret = wm831x_set_bits(wm831x, data->isink_reg,
+                             WM831X_CS1_ISEL_MASK, brightness);
+       if (ret < 0)
+               goto err;
+
+       if (power_up) {
+               /* Drive current through the ISINK */
+               ret = wm831x_set_bits(wm831x, data->isink_reg,
+                                     WM831X_CS1_DRIVE, WM831X_CS1_DRIVE);
+               if (ret < 0)
+                       return ret;
+       }
+
+       data->current_brightness = brightness;
+
+       return 0;
+
+err:
+       /* If we were in the middle of a power transition always shut down
+        * for safety.
+        */
+       if (power_up || power_down) {
+               wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE, WM831X_DC4_ENA, 0);
+               wm831x_set_bits(wm831x, data->isink_reg, WM831X_CS1_ENA, 0);
+       }
+
+       return ret;
+}
+
+static int wm831x_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;
+
+       if (bl->props.state & BL_CORE_SUSPENDED)
+               brightness = 0;
+
+       return wm831x_backlight_set(bl, brightness);
+}
+
+static int wm831x_backlight_get_brightness(struct backlight_device *bl)
+{
+       struct wm831x_backlight_data *data = bl_get_data(bl);
+       return data->current_brightness;
+}
+
+static struct backlight_ops wm831x_backlight_ops = {
+       .options = BL_CORE_SUSPENDRESUME,
+       .update_status  = wm831x_backlight_update_status,
+       .get_brightness = wm831x_backlight_get_brightness,
+};
+
+static int wm831x_backlight_probe(struct platform_device *pdev)
+{
+       struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
+       struct wm831x_pdata *wm831x_pdata;
+       struct wm831x_backlight_pdata *pdata;
+       struct wm831x_backlight_data *data;
+       struct backlight_device *bl;
+       int ret, i, max_isel, isink_reg, dcdc_cfg;
+
+       /* We need platform data */
+       if (pdev->dev.parent->platform_data) {
+               wm831x_pdata = pdev->dev.parent->platform_data;
+               pdata = wm831x_pdata->backlight;
+       } else {
+               pdata = NULL;
+       }
+
+       if (!pdata) {
+               dev_err(&pdev->dev, "No platform data supplied\n");
+               return -EINVAL;
+       }
+
+       /* Figure out the maximum current we can use */
+       for (i = 0; i < WM831X_ISINK_MAX_ISEL; i++) {
+               if (wm831x_isinkv_values[i] > pdata->max_uA)
+                       break;
+       }
+
+       if (i == 0) {
+               dev_err(&pdev->dev, "Invalid max_uA: %duA\n", pdata->max_uA);
+               return -EINVAL;
+       }
+       max_isel = i - 1;
+
+       if (pdata->max_uA != wm831x_isinkv_values[max_isel])
+               dev_warn(&pdev->dev,
+                        "Maximum current is %duA not %duA as requested\n",
+                        wm831x_isinkv_values[max_isel], pdata->max_uA);
+
+       switch (pdata->isink) {
+       case 1:
+               isink_reg = WM831X_CURRENT_SINK_1;
+               dcdc_cfg = 0;
+               break;
+       case 2:
+               isink_reg = WM831X_CURRENT_SINK_2;
+               dcdc_cfg = WM831X_DC4_FBSRC;
+               break;
+       default:
+               dev_err(&pdev->dev, "Invalid ISINK %d\n", pdata->isink);
+               return -EINVAL;
+       }
+
+       /* Configure the ISINK to use for feedback */
+       ret = wm831x_reg_unlock(wm831x);
+       if (ret < 0)
+               return ret;
+
+       ret = wm831x_set_bits(wm831x, WM831X_DC4_CONTROL, WM831X_DC4_FBSRC,
+                             dcdc_cfg);
+
+       wm831x_reg_lock(wm831x);
+       if (ret < 0)
+               return ret;
+
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (data == NULL)
+               return -ENOMEM;
+
+       data->wm831x = wm831x;
+       data->current_brightness = 0;
+       data->isink_reg = isink_reg;
+
+       bl = backlight_device_register("wm831x", &pdev->dev,
+                       data, &wm831x_backlight_ops);
+       if (IS_ERR(bl)) {
+               dev_err(&pdev->dev, "failed to register backlight\n");
+               kfree(data);
+               return PTR_ERR(bl);
+       }
+
+       bl->props.max_brightness = max_isel;
+       bl->props.brightness = max_isel;
+
+       platform_set_drvdata(pdev, bl);
+
+       /* Disable the DCDC if it was started so we can bootstrap */
+       wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE, WM831X_DC4_ENA, 0);
+
+
+       backlight_update_status(bl);
+
+       return 0;
+}
+
+static int wm831x_backlight_remove(struct platform_device *pdev)
+{
+       struct backlight_device *bl = platform_get_drvdata(pdev);
+       struct wm831x_backlight_data *data = bl_get_data(bl);
+
+       backlight_device_unregister(bl);
+       kfree(data);
+       return 0;
+}
+
+static struct platform_driver wm831x_backlight_driver = {
+       .driver         = {
+               .name   = "wm831x-backlight",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = wm831x_backlight_probe,
+       .remove         = wm831x_backlight_remove,
+};
+
+static int __init wm831x_backlight_init(void)
+{
+       return platform_driver_register(&wm831x_backlight_driver);
+}
+module_init(wm831x_backlight_init);
+
+static void __exit wm831x_backlight_exit(void)
+{
+       platform_driver_unregister(&wm831x_backlight_driver);
+}
+module_exit(wm831x_backlight_exit);
+
+MODULE_DESCRIPTION("Backlight Driver for WM831x PMICs");
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:wm831x-backlight");
index 79ca2da81c87a9710f790241dc494f67ed003dae..0f5f57858a237bb16335b90bafbe9ece0cf9d8f8 100644 (file)
  * Any other use of the locks below is probably wrong.
  */
 
+enum backlight_update_reason {
+       BACKLIGHT_UPDATE_HOTKEY,
+       BACKLIGHT_UPDATE_SYSFS,
+};
+
 struct backlight_device;
 struct fb_info;
 
@@ -100,6 +105,8 @@ static inline void backlight_update_status(struct backlight_device *bd)
 extern struct backlight_device *backlight_device_register(const char *name,
        struct device *dev, void *devdata, struct backlight_ops *ops);
 extern void backlight_device_unregister(struct backlight_device *bd);
+extern void backlight_force_update(struct backlight_device *bd,
+                                  enum backlight_update_reason reason);
 
 #define to_backlight_device(obj) container_of(obj, struct backlight_device, dev)
 
diff --git a/include/linux/spi/lms283gf05.h b/include/linux/spi/lms283gf05.h
new file mode 100644 (file)
index 0000000..555d254
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * lms283gf05.h - Platform glue for Samsung LMS283GF05 LCD
+ *
+ * Copyright (C) 2009 Marek Vasut <marek.vasut@gmail.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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef _INCLUDE_LINUX_SPI_LMS283GF05_H_
+#define _INCLUDE_LINUX_SPI_LMS283GF05_H_
+
+struct lms283gf05_pdata {
+       unsigned long   reset_gpio;
+       bool            reset_inverted;
+};
+
+#endif /* _INCLUDE_LINUX_SPI_LMS283GF05_H_ */