106 files changed, 2035 insertions, 925 deletions

diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index 8d0061569326..77dc53272289 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -341,7 +341,7 @@ static int regcache_lzo_sync(struct regmap *map, unsigned int min,
 
         lzo_blocks = map->cache;
         i = min;
-        for_each_set_bit_cont(i, lzo_blocks[0]->sync_bmp,
+        for_each_set_bit_from(i, lzo_blocks[0]->sync_bmp,
                               lzo_blocks[0]->sync_bmp_nbits) {
                 if (i > max)
                         continue;
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index e09f9cebbb20..abfaacaaf346 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -179,7 +179,7 @@ int drbd_khelper(struct drbd_conf *mdev, char *cmd)
         dev_info(DEV, "helper command: %s %s %s\n", usermode_helper, cmd, mb);
 
         drbd_bcast_ev_helper(mdev, cmd);
-        ret = call_usermodehelper(usermode_helper, argv, envp, 1);
+        ret = call_usermodehelper(usermode_helper, argv, envp, UMH_WAIT_PROC);
         if (ret)
                 dev_warn(DEV, "helper command: %s %s %s exit code %u (0x%x)\n",
                                 usermode_helper, cmd, mb,
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 8c7a75d53101..589ba02d65a2 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -17,7 +17,7 @@ menuconfig NEW_LEDS
 if NEW_LEDS
 
 config LEDS_CLASS
-        bool "LED Class Support"
+        tristate "LED Class Support"
         help
           This option enables the led sysfs class in /sys/class/leds.  You'll
           need this to do anything useful with LEDs.  If unsure, say N.
@@ -234,6 +234,14 @@ config LEDS_PCA955X
           LED driver chips accessed via the I2C bus.  Supported
           devices include PCA9550, PCA9551, PCA9552, and PCA9553.
 
+config LEDS_PCA9633
+        tristate "LED support for PCA9633 I2C chip"
+        depends on LEDS_CLASS
+        depends on I2C
+        help
+          This option enables support for LEDs connected to the PCA9633
+          LED driver chip accessed via the I2C bus.
+
 config LEDS_WM831X_STATUS
         tristate "LED support for status LEDs on WM831x PMICs"
         depends on LEDS_CLASS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 6bcf4f695515..fa0f428b32fe 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_LEDS_HP6XX)		+= leds-hp6xx.o
 obj-$(CONFIG_LEDS_OT200)                += leds-ot200.o
 obj-$(CONFIG_LEDS_FSG)                  += leds-fsg.o
 obj-$(CONFIG_LEDS_PCA955X)              += leds-pca955x.o
+obj-$(CONFIG_LEDS_PCA9633)              += leds-pca9633.o
 obj-$(CONFIG_LEDS_DA903X)               += leds-da903x.o
 obj-$(CONFIG_LEDS_WM831X_STATUS)        += leds-wm831x-status.o
 obj-$(CONFIG_LEDS_WM8350)               += leds-wm8350.o
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 0c8739c448b1..5bff8439dc68 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -110,50 +110,6 @@ static void led_timer_function(unsigned long data)
         mod_timer(&led_cdev->blink_timer, jiffies + msecs_to_jiffies(delay));
 }
 
-static void led_stop_software_blink(struct led_classdev *led_cdev)
-{
-        /* deactivate previous settings */
-        del_timer_sync(&led_cdev->blink_timer);
-        led_cdev->blink_delay_on = 0;
-        led_cdev->blink_delay_off = 0;
-}
-
-static void led_set_software_blink(struct led_classdev *led_cdev,
-                                   unsigned long delay_on,
-                                   unsigned long delay_off)
-{
-        int current_brightness;
-
-        current_brightness = led_get_brightness(led_cdev);
-        if (current_brightness)
-                led_cdev->blink_brightness = current_brightness;
-        if (!led_cdev->blink_brightness)
-                led_cdev->blink_brightness = led_cdev->max_brightness;
-
-        if (led_get_trigger_data(led_cdev) &&
-            delay_on == led_cdev->blink_delay_on &&
-            delay_off == led_cdev->blink_delay_off)
-                return;
-
-        led_stop_software_blink(led_cdev);
-
-        led_cdev->blink_delay_on = delay_on;
-        led_cdev->blink_delay_off = delay_off;
-
-        /* never on - don't blink */
-        if (!delay_on)
-                return;
-
-        /* never off - just set to brightness */
-        if (!delay_off) {
-                led_set_brightness(led_cdev, led_cdev->blink_brightness);
-                return;
-        }
-
-        mod_timer(&led_cdev->blink_timer, jiffies + 1);
-}
-
-
 /**
  * led_classdev_suspend - suspend an led_classdev.
  * @led_cdev: the led_classdev to suspend.
@@ -262,32 +218,6 @@ void led_classdev_unregister(struct led_classdev *led_cdev)
 }
 EXPORT_SYMBOL_GPL(led_classdev_unregister);
 
-void led_blink_set(struct led_classdev *led_cdev,
-                   unsigned long *delay_on,
-                   unsigned long *delay_off)
-{
-        del_timer_sync(&led_cdev->blink_timer);
-
-        if (led_cdev->blink_set &&
-            !led_cdev->blink_set(led_cdev, delay_on, delay_off))
-                return;
-
-        /* blink with 1 Hz as default if nothing specified */
-        if (!*delay_on && !*delay_off)
-                *delay_on = *delay_off = 500;
-
-        led_set_software_blink(led_cdev, *delay_on, *delay_off);
-}
-EXPORT_SYMBOL(led_blink_set);
-
-void led_brightness_set(struct led_classdev *led_cdev,
-                        enum led_brightness brightness)
-{
-        led_stop_software_blink(led_cdev);
-        led_cdev->brightness_set(led_cdev, brightness);
-}
-EXPORT_SYMBOL(led_brightness_set);
-
 static int __init leds_init(void)
 {
         leds_class = class_create(THIS_MODULE, "leds");
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 016d19f5486f..d6860043f6f9 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -23,3 +23,73 @@ EXPORT_SYMBOL_GPL(leds_list_lock);
 
 LIST_HEAD(leds_list);
 EXPORT_SYMBOL_GPL(leds_list);
+
+static void led_stop_software_blink(struct led_classdev *led_cdev)
+{
+        /* deactivate previous settings */
+        del_timer_sync(&led_cdev->blink_timer);
+        led_cdev->blink_delay_on = 0;
+        led_cdev->blink_delay_off = 0;
+}
+
+static void led_set_software_blink(struct led_classdev *led_cdev,
+                                   unsigned long delay_on,
+                                   unsigned long delay_off)
+{
+        int current_brightness;
+
+        current_brightness = led_get_brightness(led_cdev);
+        if (current_brightness)
+                led_cdev->blink_brightness = current_brightness;
+        if (!led_cdev->blink_brightness)
+                led_cdev->blink_brightness = led_cdev->max_brightness;
+
+        if (led_get_trigger_data(led_cdev) &&
+            delay_on == led_cdev->blink_delay_on &&
+            delay_off == led_cdev->blink_delay_off)
+                return;
+
+        led_stop_software_blink(led_cdev);
+
+        led_cdev->blink_delay_on = delay_on;
+        led_cdev->blink_delay_off = delay_off;
+
+        /* never on - don't blink */
+        if (!delay_on)
+                return;
+
+        /* never off - just set to brightness */
+        if (!delay_off) {
+                led_set_brightness(led_cdev, led_cdev->blink_brightness);
+                return;
+        }
+
+        mod_timer(&led_cdev->blink_timer, jiffies + 1);
+}
+
+
+void led_blink_set(struct led_classdev *led_cdev,
+                   unsigned long *delay_on,
+                   unsigned long *delay_off)
+{
+        del_timer_sync(&led_cdev->blink_timer);
+
+        if (led_cdev->blink_set &&
+            !led_cdev->blink_set(led_cdev, delay_on, delay_off))
+                return;
+
+        /* blink with 1 Hz as default if nothing specified */
+        if (!*delay_on && !*delay_off)
+                *delay_on = *delay_off = 500;
+
+        led_set_software_blink(led_cdev, *delay_on, *delay_off);
+}
+EXPORT_SYMBOL(led_blink_set);
+
+void led_brightness_set(struct led_classdev *led_cdev,
+                        enum led_brightness brightness)
+{
+        led_stop_software_blink(led_cdev);
+        led_cdev->brightness_set(led_cdev, brightness);
+}
+EXPORT_SYMBOL(led_brightness_set);
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 7df74cb97e70..f4c470a3bc8d 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
@@ -20,8 +21,6 @@
 #include <linux/workqueue.h>
 #include <linux/module.h>
 
-#include <asm/gpio.h>
-
 struct gpio_led_data {
         struct led_classdev cdev;
         unsigned gpio;
diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index e59c166a0ce2..968fd5fef4fc 100644
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -26,7 +26,6 @@
 #define LM3530_GEN_CONFIG               0x10
 #define LM3530_ALS_CONFIG               0x20
 #define LM3530_BRT_RAMP_RATE            0x30
-#define LM3530_ALS_ZONE_REG             0x40
 #define LM3530_ALS_IMP_SELECT           0x41
 #define LM3530_BRT_CTRL_REG             0xA0
 #define LM3530_ALS_ZB0_REG              0x60
@@ -38,7 +37,7 @@
 #define LM3530_ALS_Z2T_REG              0x72
 #define LM3530_ALS_Z3T_REG              0x73
 #define LM3530_ALS_Z4T_REG              0x74
-#define LM3530_REG_MAX                  15
+#define LM3530_REG_MAX                  14
 
 /* General Control Register */
 #define LM3530_EN_I2C_SHIFT             (0)
@@ -80,6 +79,9 @@
 #define LM3530_DEF_ZT_3                 (0x33)
 #define LM3530_DEF_ZT_4                 (0x19)
 
+/* 7 bits are used for the brightness : LM3530_BRT_CTRL_REG */
+#define MAX_BRIGHTNESS                  (127)
+
 struct lm3530_mode_map {
         const char *mode;
         enum lm3530_mode mode_val;
@@ -115,7 +117,6 @@ static const u8 lm3530_reg[LM3530_REG_MAX] = {
         LM3530_GEN_CONFIG,
         LM3530_ALS_CONFIG,
         LM3530_BRT_RAMP_RATE,
-        LM3530_ALS_ZONE_REG,
         LM3530_ALS_IMP_SELECT,
         LM3530_BRT_CTRL_REG,
         LM3530_ALS_ZB0_REG,
@@ -152,27 +153,35 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
         u8 reg_val[LM3530_REG_MAX];
         u8 zones[LM3530_ALS_ZB_MAX];
         u32 als_vmin, als_vmax, als_vstep;
-        struct lm3530_platform_data *pltfm = drvdata->pdata;
+        struct lm3530_platform_data *pdata = drvdata->pdata;
         struct i2c_client *client = drvdata->client;
+        struct lm3530_pwm_data *pwm = &pdata->pwm_data;
 
-        gen_config = (pltfm->brt_ramp_law << LM3530_RAMP_LAW_SHIFT) |
-                        ((pltfm->max_current & 7) << LM3530_MAX_CURR_SHIFT);
+        gen_config = (pdata->brt_ramp_law << LM3530_RAMP_LAW_SHIFT) |
+                        ((pdata->max_current & 7) << LM3530_MAX_CURR_SHIFT);
 
-        if (drvdata->mode == LM3530_BL_MODE_MANUAL ||
-            drvdata->mode == LM3530_BL_MODE_ALS)
-                gen_config |= (LM3530_ENABLE_I2C);
+        switch (drvdata->mode) {
+        case LM3530_BL_MODE_MANUAL:
+        case LM3530_BL_MODE_ALS:
+                gen_config |= LM3530_ENABLE_I2C;
+                break;
+        case LM3530_BL_MODE_PWM:
+                gen_config |= LM3530_ENABLE_PWM | LM3530_ENABLE_PWM_SIMPLE |
+                              (pdata->pwm_pol_hi << LM3530_PWM_POL_SHIFT);
+                break;
+        }
 
         if (drvdata->mode == LM3530_BL_MODE_ALS) {
-                if (pltfm->als_vmax == 0) {
-                        pltfm->als_vmin = 0;
-                        pltfm->als_vmax = LM3530_ALS_WINDOW_mV;
+                if (pdata->als_vmax == 0) {
+                        pdata->als_vmin = 0;
+                        pdata->als_vmax = LM3530_ALS_WINDOW_mV;
                 }
 
-                als_vmin = pltfm->als_vmin;
-                als_vmax = pltfm->als_vmax;
+                als_vmin = pdata->als_vmin;
+                als_vmax = pdata->als_vmax;
 
                 if ((als_vmax - als_vmin) > LM3530_ALS_WINDOW_mV)
-                        pltfm->als_vmax = als_vmax =
+                        pdata->als_vmax = als_vmax =
                                 als_vmin + LM3530_ALS_WINDOW_mV;
 
                 /* n zone boundary makes n+1 zones */
@@ -184,44 +193,41 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
                                         / 1000;
 
                 als_config =
-                        (pltfm->als_avrg_time << LM3530_ALS_AVG_TIME_SHIFT) |
+                        (pdata->als_avrg_time << LM3530_ALS_AVG_TIME_SHIFT) |
                         (LM3530_ENABLE_ALS) |
-                        (pltfm->als_input_mode << LM3530_ALS_SEL_SHIFT);
+                        (pdata->als_input_mode << LM3530_ALS_SEL_SHIFT);
 
                 als_imp_sel =
-                        (pltfm->als1_resistor_sel << LM3530_ALS1_IMP_SHIFT) |
-                        (pltfm->als2_resistor_sel << LM3530_ALS2_IMP_SHIFT);
+                        (pdata->als1_resistor_sel << LM3530_ALS1_IMP_SHIFT) |
+                        (pdata->als2_resistor_sel << LM3530_ALS2_IMP_SHIFT);
 
         }
 
-        if (drvdata->mode == LM3530_BL_MODE_PWM)
-                gen_config |= (LM3530_ENABLE_PWM) |
-                                (pltfm->pwm_pol_hi << LM3530_PWM_POL_SHIFT) |
-                                (LM3530_ENABLE_PWM_SIMPLE);
-
-        brt_ramp = (pltfm->brt_ramp_fall << LM3530_BRT_RAMP_FALL_SHIFT) |
-                        (pltfm->brt_ramp_rise << LM3530_BRT_RAMP_RISE_SHIFT);
+        brt_ramp = (pdata->brt_ramp_fall << LM3530_BRT_RAMP_FALL_SHIFT) |
+                        (pdata->brt_ramp_rise << LM3530_BRT_RAMP_RISE_SHIFT);
 
         if (drvdata->brightness)
                 brightness = drvdata->brightness;
         else
-                brightness = drvdata->brightness = pltfm->brt_val;
+                brightness = drvdata->brightness = pdata->brt_val;
+
+        if (brightness > drvdata->led_dev.max_brightness)
+                brightness = drvdata->led_dev.max_brightness;
 
         reg_val[0] = gen_config;        /* LM3530_GEN_CONFIG */
         reg_val[1] = als_config;        /* LM3530_ALS_CONFIG */
         reg_val[2] = brt_ramp;          /* LM3530_BRT_RAMP_RATE */
-        reg_val[3] = 0x00;              /* LM3530_ALS_ZONE_REG */
-        reg_val[4] = als_imp_sel;       /* LM3530_ALS_IMP_SELECT */
-        reg_val[5] = brightness;        /* LM3530_BRT_CTRL_REG */
-        reg_val[6] = zones[0];          /* LM3530_ALS_ZB0_REG */
-        reg_val[7] = zones[1];          /* LM3530_ALS_ZB1_REG */
-        reg_val[8] = zones[2];          /* LM3530_ALS_ZB2_REG */
-        reg_val[9] = zones[3];          /* LM3530_ALS_ZB3_REG */
-        reg_val[10] = LM3530_DEF_ZT_0;  /* LM3530_ALS_Z0T_REG */
-        reg_val[11] = LM3530_DEF_ZT_1;  /* LM3530_ALS_Z1T_REG */
-        reg_val[12] = LM3530_DEF_ZT_2;  /* LM3530_ALS_Z2T_REG */
-        reg_val[13] = LM3530_DEF_ZT_3;  /* LM3530_ALS_Z3T_REG */
-        reg_val[14] = LM3530_DEF_ZT_4;  /* LM3530_ALS_Z4T_REG */
+        reg_val[3] = als_imp_sel;       /* LM3530_ALS_IMP_SELECT */
+        reg_val[4] = brightness;        /* LM3530_BRT_CTRL_REG */
+        reg_val[5] = zones[0];          /* LM3530_ALS_ZB0_REG */
+        reg_val[6] = zones[1];          /* LM3530_ALS_ZB1_REG */
+        reg_val[7] = zones[2];          /* LM3530_ALS_ZB2_REG */
+        reg_val[8] = zones[3];          /* LM3530_ALS_ZB3_REG */
+        reg_val[9] = LM3530_DEF_ZT_0;   /* LM3530_ALS_Z0T_REG */
+        reg_val[10] = LM3530_DEF_ZT_1;  /* LM3530_ALS_Z1T_REG */
+        reg_val[11] = LM3530_DEF_ZT_2;  /* LM3530_ALS_Z2T_REG */
+        reg_val[12] = LM3530_DEF_ZT_3;  /* LM3530_ALS_Z3T_REG */
+        reg_val[13] = LM3530_DEF_ZT_4;  /* LM3530_ALS_Z4T_REG */
 
         if (!drvdata->enable) {
                 ret = regulator_enable(drvdata->regulator);
@@ -234,6 +240,15 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
         }
 
         for (i = 0; i < LM3530_REG_MAX; i++) {
+                /* do not update brightness register when pwm mode */
+                if (lm3530_reg[i] == LM3530_BRT_CTRL_REG &&
+                    drvdata->mode == LM3530_BL_MODE_PWM) {
+                        if (pwm->pwm_set_intensity)
+                                pwm->pwm_set_intensity(reg_val[i],
+                                        drvdata->led_dev.max_brightness);
+                        continue;
+                }
+
                 ret = i2c_smbus_write_byte_data(client,
                                 lm3530_reg[i], reg_val[i]);
                 if (ret)
@@ -249,6 +264,9 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev,
         int err;
         struct lm3530_data *drvdata =
             container_of(led_cdev, struct lm3530_data, led_dev);
+        struct lm3530_platform_data *pdata = drvdata->pdata;
+        struct lm3530_pwm_data *pwm = &pdata->pwm_data;
+        u8 max_brightness = led_cdev->max_brightness;
 
         switch (drvdata->mode) {
         case LM3530_BL_MODE_MANUAL:
@@ -264,12 +282,12 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev,
 
                 /* set the brightness in brightness control register*/
                 err = i2c_smbus_write_byte_data(drvdata->client,
-                                LM3530_BRT_CTRL_REG, brt_val / 2);
+                                LM3530_BRT_CTRL_REG, brt_val);
                 if (err)
                         dev_err(&drvdata->client->dev,
                                 "Unable to set brightness: %d\n", err);
                 else
-                        drvdata->brightness = brt_val / 2;
+                        drvdata->brightness = brt_val;
 
                 if (brt_val == 0) {
                         err = regulator_disable(drvdata->regulator);
@@ -282,6 +300,8 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev,
         case LM3530_BL_MODE_ALS:
                 break;
         case LM3530_BL_MODE_PWM:
+                if (pwm->pwm_set_intensity)
+                        pwm->pwm_set_intensity(brt_val, max_brightness);
                 break;
         default:
                 break;
@@ -291,11 +311,11 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev,
 static ssize_t lm3530_mode_get(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
-        struct i2c_client *client = container_of(
-                                        dev->parent, struct i2c_client, dev);
-        struct lm3530_data *drvdata = i2c_get_clientdata(client);
+        struct led_classdev *led_cdev = dev_get_drvdata(dev);
+        struct lm3530_data *drvdata;
         int i, len = 0;
 
+        drvdata = container_of(led_cdev, struct lm3530_data, led_dev);
         for (i = 0; i < ARRAY_SIZE(mode_map); i++)
                 if (drvdata->mode == mode_map[i].mode_val)
                         len += sprintf(buf + len, "[%s] ", mode_map[i].mode);
@@ -310,26 +330,26 @@ static ssize_t lm3530_mode_get(struct device *dev,
 static ssize_t lm3530_mode_set(struct device *dev, struct device_attribute
                                    *attr, const char *buf, size_t size)
 {
-        int err;
-        struct i2c_client *client = container_of(
-                                        dev->parent, struct i2c_client, dev);
-        struct lm3530_data *drvdata = i2c_get_clientdata(client);
-        int mode;
+        struct led_classdev *led_cdev = dev_get_drvdata(dev);
+        struct lm3530_data *drvdata;
+        struct lm3530_pwm_data *pwm;
+        u8 max_brightness;
+        int mode, err;
 
+        drvdata = container_of(led_cdev, struct lm3530_data, led_dev);
+        pwm = &drvdata->pdata->pwm_data;
+        max_brightness = led_cdev->max_brightness;
         mode = lm3530_get_mode_from_str(buf);
         if (mode < 0) {
                 dev_err(dev, "Invalid mode\n");
                 return -EINVAL;
         }
 
-        if (mode == LM3530_BL_MODE_MANUAL)
-                drvdata->mode = LM3530_BL_MODE_MANUAL;
-        else if (mode == LM3530_BL_MODE_ALS)
-                drvdata->mode = LM3530_BL_MODE_ALS;
-        else if (mode == LM3530_BL_MODE_PWM) {
-                dev_err(dev, "PWM mode not supported\n");
-                return -EINVAL;
-        }
+        drvdata->mode = mode;
+
+        /* set pwm to low if unnecessary */
+        if (mode != LM3530_BL_MODE_PWM && pwm->pwm_set_intensity)
+                pwm->pwm_set_intensity(0, max_brightness);
 
         err = lm3530_init_registers(drvdata);
         if (err) {
@@ -380,6 +400,7 @@ static int __devinit lm3530_probe(struct i2c_client *client,
         drvdata->enable = false;
         drvdata->led_dev.name = LM3530_LED_DEV;
         drvdata->led_dev.brightness_set = lm3530_brightness_set;
+        drvdata->led_dev.max_brightness = MAX_BRIGHTNESS;
 
         i2c_set_clientdata(client, drvdata);
 
diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index d62a7982a5e6..410a723b8691 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -81,18 +81,10 @@
 #define LP5521_MASTER_ENABLE            0x40    /* Chip master enable */
 #define LP5521_LOGARITHMIC_PWM          0x80    /* Logarithmic PWM adjustment */
 #define LP5521_EXEC_RUN                 0x2A
-
-/* Bits in CONFIG register */
-#define LP5521_PWM_HF                   0x40    /* PWM: 0 = 256Hz, 1 = 558Hz */
-#define LP5521_PWRSAVE_EN               0x20    /* 1 = Power save mode */
-#define LP5521_CP_MODE_OFF              0       /* Charge pump (CP) off */
-#define LP5521_CP_MODE_BYPASS           8       /* CP forced to bypass mode */
-#define LP5521_CP_MODE_1X5              0x10    /* CP forced to 1.5x mode */
-#define LP5521_CP_MODE_AUTO             0x18    /* Automatic mode selection */
-#define LP5521_R_TO_BATT                4       /* R out: 0 = CP, 1 = Vbat */
-#define LP5521_CLK_SRC_EXT              0       /* Ext-clk source (CLK_32K) */
-#define LP5521_CLK_INT                  1       /* Internal clock */
-#define LP5521_CLK_AUTO                 2       /* Automatic clock selection */
+#define LP5521_ENABLE_DEFAULT   \
+        (LP5521_MASTER_ENABLE | LP5521_LOGARITHMIC_PWM)
+#define LP5521_ENABLE_RUN_PROGRAM       \
+        (LP5521_ENABLE_DEFAULT | LP5521_EXEC_RUN)
 
 /* Status */
 #define LP5521_EXT_CLK_USED             0x08
@@ -100,6 +92,9 @@
 /* default R channel current register value */
 #define LP5521_REG_R_CURR_DEFAULT       0xAF
 
+/* Pattern Mode */
+#define PATTERN_OFF     0
+
 struct lp5521_engine {
         int             id;
         u8              mode;
@@ -241,15 +236,16 @@ static int lp5521_configure(struct i2c_client *client)
 {
         struct lp5521_chip *chip = i2c_get_clientdata(client);
         int ret;
+        u8 cfg;
 
         lp5521_init_engine(chip);
 
         /* Set all PWMs to direct control mode */
-        ret = lp5521_write(client, LP5521_REG_OP_MODE, 0x3F);
+        ret = lp5521_write(client, LP5521_REG_OP_MODE, LP5521_CMD_DIRECT);
 
-        /* Enable auto-powersave, set charge pump to auto, red to battery */
-        ret |= lp5521_write(client, LP5521_REG_CONFIG,
-                LP5521_PWRSAVE_EN | LP5521_CP_MODE_AUTO | LP5521_R_TO_BATT);
+        cfg = chip->pdata->update_config ?
+                : (LP5521_PWRSAVE_EN | LP5521_CP_MODE_AUTO | LP5521_R_TO_BATT);
+        ret |= lp5521_write(client, LP5521_REG_CONFIG, cfg);
 
         /* Initialize all channels PWM to zero -> leds off */
         ret |= lp5521_write(client, LP5521_REG_R_PWM, 0);
@@ -258,8 +254,7 @@ static int lp5521_configure(struct i2c_client *client)
 
         /* Set engines are set to run state when OP_MODE enables engines */
         ret |= lp5521_write(client, LP5521_REG_ENABLE,
-                        LP5521_MASTER_ENABLE | LP5521_LOGARITHMIC_PWM |
-                        LP5521_EXEC_RUN);
+                        LP5521_ENABLE_RUN_PROGRAM);
         /* enable takes 500us. 1 - 2 ms leaves some margin */
         usleep_range(1000, 2000);
 
@@ -310,8 +305,7 @@ static int lp5521_detect(struct i2c_client *client)
         int ret;
         u8 buf;
 
-        ret = lp5521_write(client, LP5521_REG_ENABLE,
-                        LP5521_MASTER_ENABLE | LP5521_LOGARITHMIC_PWM);
+        ret = lp5521_write(client, LP5521_REG_ENABLE, LP5521_ENABLE_DEFAULT);
         if (ret)
                 return ret;
         /* enable takes 500us. 1 - 2 ms leaves some margin */
@@ -319,7 +313,7 @@ static int lp5521_detect(struct i2c_client *client)
         ret = lp5521_read(client, LP5521_REG_ENABLE, &buf);
         if (ret)
                 return ret;
-        if (buf != (LP5521_MASTER_ENABLE | LP5521_LOGARITHMIC_PWM))
+        if (buf != LP5521_ENABLE_DEFAULT)
                 return -ENODEV;
 
         return 0;
@@ -504,7 +498,7 @@ static ssize_t store_current(struct device *dev,
         ssize_t ret;
         unsigned long curr;
 
-        if (strict_strtoul(buf, 0, &curr))
+        if (kstrtoul(buf, 0, &curr))
                 return -EINVAL;
 
         if (curr > led->max_current)
@@ -536,6 +530,97 @@ static ssize_t lp5521_selftest(struct device *dev,
         return sprintf(buf, "%s\n", ret ? "FAIL" : "OK");
 }
 
+static void lp5521_clear_program_memory(struct i2c_client *cl)
+{
+        int i;
+        u8 rgb_mem[] = {
+                LP5521_REG_R_PROG_MEM,
+                LP5521_REG_G_PROG_MEM,
+                LP5521_REG_B_PROG_MEM,
+        };
+
+        for (i = 0; i < ARRAY_SIZE(rgb_mem); i++) {
+                lp5521_write(cl, rgb_mem[i], 0);
+                lp5521_write(cl, rgb_mem[i] + 1, 0);
+        }
+}
+
+static void lp5521_write_program_memory(struct i2c_client *cl,
+                                u8 base, u8 *rgb, int size)
+{
+        int i;
+
+        if (!rgb || size <= 0)
+                return;
+
+        for (i = 0; i < size; i++)
+                lp5521_write(cl, base + i, *(rgb + i));
+
+        lp5521_write(cl, base + i, 0);
+        lp5521_write(cl, base + i + 1, 0);
+}
+
+static inline struct lp5521_led_pattern *lp5521_get_pattern
+                                        (struct lp5521_chip *chip, u8 offset)
+{
+        struct lp5521_led_pattern *ptn;
+        ptn = chip->pdata->patterns + (offset - 1);
+        return ptn;
+}
+
+static void lp5521_run_led_pattern(int mode, struct lp5521_chip *chip)
+{
+        struct lp5521_led_pattern *ptn;
+        struct i2c_client *cl = chip->client;
+        int num_patterns = chip->pdata->num_patterns;
+
+        if (mode > num_patterns || !(chip->pdata->patterns))
+                return;
+
+        if (mode == PATTERN_OFF) {
+                lp5521_write(cl, LP5521_REG_ENABLE, LP5521_ENABLE_DEFAULT);
+                usleep_range(1000, 2000);
+                lp5521_write(cl, LP5521_REG_OP_MODE, LP5521_CMD_DIRECT);
+        } else {
+                ptn = lp5521_get_pattern(chip, mode);
+                if (!ptn)
+                        return;
+
+                lp5521_write(cl, LP5521_REG_OP_MODE, LP5521_CMD_LOAD);
+                usleep_range(1000, 2000);
+
+                lp5521_clear_program_memory(cl);
+
+                lp5521_write_program_memory(cl, LP5521_REG_R_PROG_MEM,
+                                        ptn->r, ptn->size_r);
+                lp5521_write_program_memory(cl, LP5521_REG_G_PROG_MEM,
+                                        ptn->g, ptn->size_g);
+                lp5521_write_program_memory(cl, LP5521_REG_B_PROG_MEM,
+                                        ptn->b, ptn->size_b);
+
+                lp5521_write(cl, LP5521_REG_OP_MODE, LP5521_CMD_RUN);
+                usleep_range(1000, 2000);
+                lp5521_write(cl, LP5521_REG_ENABLE, LP5521_ENABLE_RUN_PROGRAM);
+        }
+}
+
+static ssize_t store_led_pattern(struct device *dev,
+                                struct device_attribute *attr,
+                                const char *buf, size_t len)
+{
+        struct lp5521_chip *chip = i2c_get_clientdata(to_i2c_client(dev));
+        unsigned long val;
+        int ret;
+
+        ret = strict_strtoul(buf, 16, &val);
+        if (ret)
+                return ret;
+
+        lp5521_run_led_pattern(val, chip);
+
+        return len;
+}
+
 /* led class device attributes */
 static DEVICE_ATTR(led_current, S_IRUGO | S_IWUSR, show_current, store_current);
 static DEVICE_ATTR(max_current, S_IRUGO , show_max_current, NULL);
@@ -561,6 +646,7 @@ static DEVICE_ATTR(engine1_load, S_IWUSR, NULL, store_engine1_load);
 static DEVICE_ATTR(engine2_load, S_IWUSR, NULL, store_engine2_load);
 static DEVICE_ATTR(engine3_load, S_IWUSR, NULL, store_engine3_load);
 static DEVICE_ATTR(selftest, S_IRUGO, lp5521_selftest, NULL);
+static DEVICE_ATTR(led_pattern, S_IWUSR, NULL, store_led_pattern);
 
 static struct attribute *lp5521_attributes[] = {
         &dev_attr_engine1_mode.attr,
@@ -570,6 +656,7 @@ static struct attribute *lp5521_attributes[] = {
         &dev_attr_engine1_load.attr,
         &dev_attr_engine2_load.attr,
         &dev_attr_engine3_load.attr,
+        &dev_attr_led_pattern.attr,
         NULL
 };
 
@@ -620,10 +707,15 @@ static int __devinit lp5521_init_led(struct lp5521_led *led,
                 return -EINVAL;
         }
 
-        snprintf(name, sizeof(name), "%s:channel%d",
-                        pdata->label ?: client->name, chan);
         led->cdev.brightness_set = lp5521_set_brightness;
-        led->cdev.name = name;
+        if (pdata->led_config[chan].name) {
+                led->cdev.name = pdata->led_config[chan].name;
+        } else {
+                snprintf(name, sizeof(name), "%s:channel%d",
+                        pdata->label ?: client->name, chan);
+                led->cdev.name = name;
+        }
+
         res = led_classdev_register(dev, &led->cdev);
         if (res < 0) {
                 dev_err(dev, "couldn't register led on channel %d\n", chan);
@@ -692,9 +784,9 @@ static int __devinit lp5521_probe(struct i2c_client *client,
          * otherwise further access to the R G B channels in the
          * LP5521_REG_ENABLE register will not have any effect - strange!
          */
-        lp5521_read(client, LP5521_REG_R_CURRENT, &buf);
+        ret = lp5521_read(client, LP5521_REG_R_CURRENT, &buf);
         if (buf != LP5521_REG_R_CURR_DEFAULT) {
-                dev_err(&client->dev, "error in reseting chip\n");
+                dev_err(&client->dev, "error in resetting chip\n");
                 goto fail2;
         }
         usleep_range(10000, 20000);
@@ -767,6 +859,7 @@ static int __devexit lp5521_remove(struct i2c_client *client)
         struct lp5521_chip *chip = i2c_get_clientdata(client);
         int i;
 
+        lp5521_run_led_pattern(PATTERN_OFF, chip);
         lp5521_unregister_sysfs(client);
 
         for (i = 0; i < chip->num_leds; i++) {
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 73e791ae7259..857a3e15f2dd 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -152,7 +152,7 @@ static inline struct lp5523_chip *led_to_lp5523(struct lp5523_led *led)
 
 static int lp5523_set_mode(struct lp5523_engine *engine, u8 mode);
 static int lp5523_set_engine_mode(struct lp5523_engine *engine, u8 mode);
-static int lp5523_load_program(struct lp5523_engine *engine, u8 *pattern);
+static int lp5523_load_program(struct lp5523_engine *engine, const u8 *pattern);
 
 static void lp5523_led_brightness_work(struct work_struct *work);
 
@@ -196,7 +196,7 @@ static int lp5523_configure(struct i2c_client *client)
         u8 status;
 
         /* one pattern per engine setting led mux start and stop addresses */
-        u8 pattern[][LP5523_PROGRAM_LENGTH] =  {
+        static const u8 pattern[][LP5523_PROGRAM_LENGTH] =  {
                 { 0x9c, 0x30, 0x9c, 0xb0, 0x9d, 0x80, 0xd8, 0x00, 0},
                 { 0x9c, 0x40, 0x9c, 0xc0, 0x9d, 0x80, 0xd8, 0x00, 0},
                 { 0x9c, 0x50, 0x9c, 0xd0, 0x9d, 0x80, 0xd8, 0x00, 0},
@@ -301,7 +301,7 @@ static int lp5523_load_mux(struct lp5523_engine *engine, u16 mux)
         return ret;
 }
 
-static int lp5523_load_program(struct lp5523_engine *engine, u8 *pattern)
+static int lp5523_load_program(struct lp5523_engine *engine, const u8 *pattern)
 {
         struct lp5523_chip *chip = engine_to_lp5523(engine);
         struct i2c_client *client = chip->client;
diff --git a/drivers/leds/leds-pca9633.c b/drivers/leds/leds-pca9633.c
new file mode 100644
index 000000000000..d8926fd031aa
--- /dev/null
+++ b/drivers/leds/leds-pca9633.c
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2011 bct electronic GmbH
+ *
+ * Author: Peter Meerwald <p.meerwald@bct-electronic.com>
+ *
+ * Based on leds-pca955x.c
+ *
+ * This file is subject to the terms and conditions of version 2 of
+ * the GNU General Public License.  See the file COPYING in the main
+ * directory of this archive for more details.
+ *
+ * LED driver for the PCA9633 I2C LED driver (7-bit slave address 0x62)
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+#include <linux/leds.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/workqueue.h>
+#include <linux/slab.h>
+
+/* LED select registers determine the source that drives LED outputs */
+#define PCA9633_LED_OFF         0x0     /* LED driver off */
+#define PCA9633_LED_ON          0x1     /* LED driver on */
+#define PCA9633_LED_PWM         0x2     /* Controlled through PWM */
+#define PCA9633_LED_GRP_PWM     0x3     /* Controlled through PWM/GRPPWM */
+
+#define PCA9633_MODE1           0x00
+#define PCA9633_MODE2           0x01
+#define PCA9633_PWM_BASE        0x02
+#define PCA9633_LEDOUT          0x08
+
+static const struct i2c_device_id pca9633_id[] = {
+        { "pca9633", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, pca9633_id);
+
+struct pca9633_led {
+        struct i2c_client *client;
+        struct work_struct work;
+        enum led_brightness brightness;
+        struct led_classdev led_cdev;
+        int led_num; /* 0 .. 3 potentially */
+        char name[32];
+};
+
+static void pca9633_led_work(struct work_struct *work)
+{
+        struct pca9633_led *pca9633 = container_of(work,
+                struct pca9633_led, work);
+        u8 ledout = i2c_smbus_read_byte_data(pca9633->client, PCA9633_LEDOUT);
+        int shift = 2 * pca9633->led_num;
+        u8 mask = 0x3 << shift;
+
+        switch (pca9633->brightness) {
+        case LED_FULL:
+                i2c_smbus_write_byte_data(pca9633->client, PCA9633_LEDOUT,
+                        (ledout & ~mask) | (PCA9633_LED_ON << shift));
+                break;
+        case LED_OFF:
+                i2c_smbus_write_byte_data(pca9633->client, PCA9633_LEDOUT,
+                        ledout & ~mask);
+                break;
+        default:
+                i2c_smbus_write_byte_data(pca9633->client,
+                        PCA9633_PWM_BASE + pca9633->led_num,
+                        pca9633->brightness);
+                i2c_smbus_write_byte_data(pca9633->client, PCA9633_LEDOUT,
+                        (ledout & ~mask) | (PCA9633_LED_PWM << shift));
+                break;
+        }
+}
+
+static void pca9633_led_set(struct led_classdev *led_cdev,
+        enum led_brightness value)
+{
+        struct pca9633_led *pca9633;
+
+        pca9633 = container_of(led_cdev, struct pca9633_led, led_cdev);
+
+        pca9633->brightness = value;
+
+        /*
+         * Must use workqueue for the actual I/O since I2C operations
+         * can sleep.
+         */
+        schedule_work(&pca9633->work);
+}
+
+static int __devinit pca9633_probe(struct i2c_client *client,
+                                        const struct i2c_device_id *id)
+{
+        struct pca9633_led *pca9633;
+        struct led_platform_data *pdata;
+        int i, err;
+
+        pdata = client->dev.platform_data;
+
+        if (pdata) {
+                if (pdata->num_leds <= 0 || pdata->num_leds > 4) {
+                        dev_err(&client->dev, "board info must claim at most 4 LEDs");
+                        return -EINVAL;
+                }
+        }
+
+        pca9633 = kcalloc(4, sizeof(*pca9633), GFP_KERNEL);
+        if (!pca9633)
+                return -ENOMEM;
+
+        i2c_set_clientdata(client, pca9633);
+
+        for (i = 0; i < 4; i++) {
+                pca9633[i].client = client;
+                pca9633[i].led_num = i;
+
+                /* Platform data can specify LED names and default triggers */
+                if (pdata && i < pdata->num_leds) {
+                        if (pdata->leds[i].name)
+                                snprintf(pca9633[i].name,
+                                         sizeof(pca9633[i].name), "pca9633:%s",
+                                         pdata->leds[i].name);
+                        if (pdata->leds[i].default_trigger)
+                                pca9633[i].led_cdev.default_trigger =
+                                        pdata->leds[i].default_trigger;
+                } else {
+                        snprintf(pca9633[i].name, sizeof(pca9633[i].name),
+                                 "pca9633:%d", i);
+                }
+
+                pca9633[i].led_cdev.name = pca9633[i].name;
+                pca9633[i].led_cdev.brightness_set = pca9633_led_set;
+
+                INIT_WORK(&pca9633[i].work, pca9633_led_work);
+
+                err = led_classdev_register(&client->dev, &pca9633[i].led_cdev);
+                if (err < 0)
+                        goto exit;
+        }
+
+        /* Disable LED all-call address and set normal mode */
+        i2c_smbus_write_byte_data(client, PCA9633_MODE1, 0x00);
+
+        /* Turn off LEDs */
+        i2c_smbus_write_byte_data(client, PCA9633_LEDOUT, 0x00);
+
+        return 0;
+
+exit:
+        while (i--) {
+                led_classdev_unregister(&pca9633[i].led_cdev);
+                cancel_work_sync(&pca9633[i].work);
+        }
+
+        kfree(pca9633);
+
+        return err;
+}
+
+static int __devexit pca9633_remove(struct i2c_client *client)
+{
+        struct pca9633_led *pca9633 = i2c_get_clientdata(client);
+        int i;
+
+        for (i = 0; i < 4; i++) {
+                led_classdev_unregister(&pca9633[i].led_cdev);
+                cancel_work_sync(&pca9633[i].work);
+        }
+
+        kfree(pca9633);
+
+        return 0;
+}
+
+static struct i2c_driver pca9633_driver = {
+        .driver = {
+                .name   = "leds-pca9633",
+                .owner  = THIS_MODULE,
+        },
+        .probe  = pca9633_probe,
+        .remove = __devexit_p(pca9633_remove),
+        .id_table = pca9633_id,
+};
+
+module_i2c_driver(pca9633_driver);
+
+MODULE_AUTHOR("Peter Meerwald <p.meerwald@bct-electronic.com>");
+MODULE_DESCRIPTION("PCA9633 LED driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index 133f89fb7071..6c1c14f31635 100644
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -687,10 +687,9 @@ static int __devinit tca6507_probe(struct i2c_client *client,
                         NUM_LEDS);
                 return -ENODEV;
         }
-        err = -ENOMEM;
         tca = kzalloc(sizeof(*tca), GFP_KERNEL);
         if (!tca)
-                goto exit;
+                return -ENOMEM;
 
         tca->client = client;
         INIT_WORK(&tca->work, tca6507_work);
@@ -724,11 +723,10 @@ static int __devinit tca6507_probe(struct i2c_client *client,
 
         return 0;
 exit:
-        while (i--)
+        while (i--) {
                 if (tca->leds[i].led_cdev.name)
                         led_classdev_unregister(&tca->leds[i].led_cdev);
-        cancel_work_sync(&tca->work);
-        i2c_set_clientdata(client, NULL);
+        }
         kfree(tca);
         return err;
 }
@@ -745,7 +743,6 @@ static int __devexit tca6507_remove(struct i2c_client *client)
         }
         tca6507_remove_gpio(tca);
         cancel_work_sync(&tca->work);
-        i2c_set_clientdata(client, NULL);
         kfree(tca);
 
         return 0;
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index e1e122f2f929..9bcd1f415f43 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -2526,12 +2526,10 @@ static void cfi_intelext_restore_locks(struct mtd_info *mtd)
                 if (!region->lockmap)
                         continue;
 
-                for (block = 0; block < region->numblocks; block++) {
+                for_each_clear_bit(block, region->lockmap, region->numblocks) {
                         len = region->erasesize;
                         adr = region->offset + block * len;
-
-                        if (!test_bit(block, region->lockmap))
-                                cfi_intelext_unlock(mtd, adr, len);
+                        cfi_intelext_unlock(mtd, adr, len);
                 }
         }
 }
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 50c6a1e7f675..c57ae92ebda4 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -31,13 +31,13 @@
 #include <linux/compat.h>
 #include <linux/mount.h>
 #include <linux/blkpg.h>
+#include <linux/magic.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/map.h>
 
 #include <asm/uaccess.h>
 
-#define MTD_INODE_FS_MAGIC 0x11307854
 static DEFINE_MUTEX(mtd_mutex);
 static struct vfsmount *mtd_inode_mnt __read_mostly;
 
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 3a125b835546..4f9fb25f945b 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -554,6 +554,13 @@ config RTC_DRV_DS1742
           This driver can also be built as a module. If so, the module
           will be called rtc-ds1742.
 
+config RTC_DRV_DA9052
+        tristate "Dialog DA9052/DA9053 RTC"
+        depends on PMIC_DA9052
+        help
+          Say y here to support the RTC driver for Dialog Semiconductor
+          DA9052-BC and DA9053-AA/Bx PMICs.
+
 config RTC_DRV_EFI
         tristate "EFI RTC"
         depends on IA64
@@ -1070,4 +1077,14 @@ config RTC_DRV_PUV3
           This drive can also be built as a module. If so, the module
           will be called rtc-puv3.
 
+config RTC_DRV_LOONGSON1
+        tristate "loongson1 RTC support"
+        depends on MACH_LOONGSON1
+        help
+          This is a driver for the loongson1 on-chip Counter0 (Time-Of-Year
+          counter) to be used as a RTC.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ls1x.
+
 endif # RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 6e6982335c10..727ae7786e6c 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_RTC_DRV_BQ32K)	+= rtc-bq32k.o
 obj-$(CONFIG_RTC_DRV_BQ4802)    += rtc-bq4802.o
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc-cmos.o
 obj-$(CONFIG_RTC_DRV_COH901331) += rtc-coh901331.o
+obj-$(CONFIG_RTC_DRV_DA9052)    += rtc-da9052.o
 obj-$(CONFIG_RTC_DRV_DAVINCI)   += rtc-davinci.o
 obj-$(CONFIG_RTC_DRV_DM355EVM)  += rtc-dm355evm.o
 obj-$(CONFIG_RTC_DRV_VRTC)      += rtc-mrst.o
@@ -53,6 +54,7 @@ obj-$(CONFIG_RTC_DRV_ISL1208)	+= rtc-isl1208.o
 obj-$(CONFIG_RTC_DRV_ISL12022)  += rtc-isl12022.o
 obj-$(CONFIG_RTC_DRV_JZ4740)    += rtc-jz4740.o
 obj-$(CONFIG_RTC_DRV_LPC32XX)   += rtc-lpc32xx.o
+obj-$(CONFIG_RTC_DRV_LOONGSON1) += rtc-ls1x.o
 obj-$(CONFIG_RTC_DRV_M41T80)    += rtc-m41t80.o
 obj-$(CONFIG_RTC_DRV_M41T93)    += rtc-m41t93.o
 obj-$(CONFIG_RTC_DRV_M41T94)    += rtc-m41t94.o
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index ee3c122c0599..274a0aafe42b 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -335,7 +335,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
 
         /* register irq handler after we know what name we'll use */
         ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt,
-                                IRQF_DISABLED | IRQF_SHARED,
+                                IRQF_SHARED,
                                 dev_name(&rtc->rtcdev->dev), rtc);
         if (ret) {
                 dev_dbg(&pdev->dev, "can't share IRQ %d?\n", AT91_ID_SYS);
diff --git a/drivers/rtc/rtc-bq32k.c b/drivers/rtc/rtc-bq32k.c
index 408cc8f735be..f090159dce4a 100644
--- a/drivers/rtc/rtc-bq32k.c
+++ b/drivers/rtc/rtc-bq32k.c
@@ -187,17 +187,7 @@ static struct i2c_driver bq32k_driver = {
         .id_table       = bq32k_id,
 };
 
-static __init int bq32k_init(void)
-{
-        return i2c_add_driver(&bq32k_driver);
-}
-module_init(bq32k_init);
-
-static __exit void bq32k_exit(void)
-{
-        i2c_del_driver(&bq32k_driver);
-}
-module_exit(bq32k_exit);
+module_i2c_driver(bq32k_driver);
 
 MODULE_AUTHOR("Semihalf, Piotr Ziecik <kosmo@semihalf.com>");
 MODULE_DESCRIPTION("TI BQ32000 I2C RTC driver");
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index d7782aa09943..7d5f56edb8ef 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -714,7 +714,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                         rtc_cmos_int_handler = cmos_interrupt;
 
                 retval = request_irq(rtc_irq, rtc_cmos_int_handler,
-                                IRQF_DISABLED, dev_name(&cmos_rtc.rtc->dev),
+                                0, dev_name(&cmos_rtc.rtc->dev),
                                 cmos_rtc.rtc);
                 if (retval < 0) {
                         dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq);
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 80f9c88214c5..a5b8a0c4ea84 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -199,7 +199,7 @@ static int __init coh901331_probe(struct platform_device *pdev)
         }
 
         rtap->irq = platform_get_irq(pdev, 0);
-        if (request_irq(rtap->irq, coh901331_interrupt, IRQF_DISABLED,
+        if (request_irq(rtap->irq, coh901331_interrupt, 0,
                         "RTC COH 901 331 Alarm", rtap)) {
                 ret = -EIO;
                 goto out_no_irq;
diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
new file mode 100644
index 000000000000..da6ab5291a41
--- /dev/null
+++ b/drivers/rtc/rtc-da9052.c
@@ -0,0 +1,293 @@
+/*
+ * Real time clock driver for DA9052
+ *
+ * Copyright(c) 2012 Dialog Semiconductor Ltd.
+ *
+ * Author: Dajun Dajun Chen <dajun.chen@diasemi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+
+#include <linux/mfd/da9052/da9052.h>
+#include <linux/mfd/da9052/reg.h>
+
+#define rtc_err(da9052, fmt, ...) \
+                dev_err(da9052->dev, "%s: " fmt, __func__, ##__VA_ARGS__)
+
+struct da9052_rtc {
+        struct rtc_device *rtc;
+        struct da9052 *da9052;
+        int irq;
+};
+
+static int da9052_rtc_enable_alarm(struct da9052 *da9052, bool enable)
+{
+        int ret;
+        if (enable) {
+                ret = da9052_reg_update(da9052, DA9052_ALARM_Y_REG,
+                                        DA9052_ALARM_Y_ALARM_ON,
+                                        DA9052_ALARM_Y_ALARM_ON);
+                if (ret != 0)
+                        rtc_err(da9052, "Failed to enable ALM: %d\n", ret);
+        } else {
+                ret = da9052_reg_update(da9052, DA9052_ALARM_Y_REG,
+                                        DA9052_ALARM_Y_ALARM_ON, 0);
+                if (ret != 0)
+                        rtc_err(da9052, "Write error: %d\n", ret);
+        }
+        return ret;
+}
+
+static irqreturn_t da9052_rtc_irq(int irq, void *data)
+{
+        struct da9052_rtc *rtc = data;
+        int ret;
+
+        ret = da9052_reg_read(rtc->da9052, DA9052_ALARM_MI_REG);
+        if (ret < 0) {
+                rtc_err(rtc->da9052, "Read error: %d\n", ret);
+                return IRQ_NONE;
+        }
+
+        if (ret & DA9052_ALARMMI_ALARMTYPE) {
+                da9052_rtc_enable_alarm(rtc->da9052, 0);
+                rtc_update_irq(rtc->rtc, 1, RTC_IRQF | RTC_AF);
+        } else
+                rtc_update_irq(rtc->rtc, 1, RTC_IRQF | RTC_PF);
+
+        return IRQ_HANDLED;
+}
+
+static int da9052_read_alarm(struct da9052 *da9052, struct rtc_time *rtc_tm)
+{
+        int ret;
+        uint8_t v[5];
+
+        ret = da9052_group_read(da9052, DA9052_ALARM_MI_REG, 5, v);
+        if (ret != 0) {
+                rtc_err(da9052, "Failed to group read ALM: %d\n", ret);
+                return ret;
+        }
+
+        rtc_tm->tm_year = (v[4] & DA9052_RTC_YEAR) + 100;
+        rtc_tm->tm_mon  = (v[3] & DA9052_RTC_MONTH) - 1;
+        rtc_tm->tm_mday = v[2] & DA9052_RTC_DAY;
+        rtc_tm->tm_hour = v[1] & DA9052_RTC_HOUR;
+        rtc_tm->tm_min  = v[0] & DA9052_RTC_MIN;
+
+        ret = rtc_valid_tm(rtc_tm);
+        if (ret != 0)
+                return ret;
+        return ret;
+}
+
+static int da9052_set_alarm(struct da9052 *da9052, struct rtc_time *rtc_tm)
+{
+        int ret;
+        uint8_t v[3];
+
+        rtc_tm->tm_year -= 100;
+        rtc_tm->tm_mon += 1;
+
+        ret = da9052_reg_update(da9052, DA9052_ALARM_MI_REG,
+                                DA9052_RTC_MIN, rtc_tm->tm_min);
+        if (ret != 0) {
+                rtc_err(da9052, "Failed to write ALRM MIN: %d\n", ret);
+                return ret;
+        }
+
+        v[0] = rtc_tm->tm_hour;
+        v[1] = rtc_tm->tm_mday;
+        v[2] = rtc_tm->tm_mon;
+
+        ret = da9052_group_write(da9052, DA9052_ALARM_H_REG, 3, v);
+        if (ret < 0)
+                return ret;
+
+        ret = da9052_reg_update(da9052, DA9052_ALARM_Y_REG,
+                                DA9052_RTC_YEAR, rtc_tm->tm_year);
+        if (ret != 0)
+                rtc_err(da9052, "Failed to write ALRM YEAR: %d\n", ret);
+
+        return ret;
+}
+
+static int da9052_rtc_get_alarm_status(struct da9052 *da9052)
+{
+        int ret;
+
+        ret = da9052_reg_read(da9052, DA9052_ALARM_Y_REG);
+        if (ret < 0) {
+                rtc_err(da9052, "Failed to read ALM: %d\n", ret);
+                return ret;
+        }
+        ret &= DA9052_ALARM_Y_ALARM_ON;
+        return (ret > 0) ? 1 : 0;
+}
+
+static int da9052_rtc_read_time(struct device *dev, struct rtc_time *rtc_tm)
+{
+        struct da9052_rtc *rtc = dev_get_drvdata(dev);
+        uint8_t v[6];
+        int ret;
+
+        ret = da9052_group_read(rtc->da9052, DA9052_COUNT_S_REG, 6, v);
+        if (ret < 0) {
+                rtc_err(rtc->da9052, "Failed to read RTC time : %d\n", ret);
+                return ret;
+        }
+
+        rtc_tm->tm_year = (v[5] & DA9052_RTC_YEAR) + 100;
+        rtc_tm->tm_mon  = (v[4] & DA9052_RTC_MONTH) - 1;
+        rtc_tm->tm_mday = v[3] & DA9052_RTC_DAY;
+        rtc_tm->tm_hour = v[2] & DA9052_RTC_HOUR;
+        rtc_tm->tm_min  = v[1] & DA9052_RTC_MIN;
+        rtc_tm->tm_sec  = v[0] & DA9052_RTC_SEC;
+
+        ret = rtc_valid_tm(rtc_tm);
+        if (ret != 0) {
+                rtc_err(rtc->da9052, "rtc_valid_tm failed: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int da9052_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct da9052_rtc *rtc;
+        uint8_t v[6];
+
+        rtc = dev_get_drvdata(dev);
+
+        v[0] = tm->tm_sec;
+        v[1] = tm->tm_min;
+        v[2] = tm->tm_hour;
+        v[3] = tm->tm_mday;
+        v[4] = tm->tm_mon + 1;
+        v[5] = tm->tm_year - 100;
+
+        return da9052_group_write(rtc->da9052, DA9052_COUNT_S_REG, 6, v);
+}
+
+static int da9052_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        int ret;
+        struct rtc_time *tm = &alrm->time;
+        struct da9052_rtc *rtc = dev_get_drvdata(dev);
+
+        ret = da9052_read_alarm(rtc->da9052, tm);
+
+        if (ret)
+                return ret;
+
+        alrm->enabled = da9052_rtc_get_alarm_status(rtc->da9052);
+
+        return 0;
+}
+
+static int da9052_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        int ret;
+        struct rtc_time *tm = &alrm->time;
+        struct da9052_rtc *rtc = dev_get_drvdata(dev);
+
+        ret = da9052_rtc_enable_alarm(rtc->da9052, 0);
+        if (ret < 0)
+                return ret;
+
+        ret = da9052_set_alarm(rtc->da9052, tm);
+        if (ret)
+                return ret;
+
+        ret = da9052_rtc_enable_alarm(rtc->da9052, 1);
+
+        return ret;
+}
+
+static int da9052_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct da9052_rtc *rtc = dev_get_drvdata(dev);
+
+        return da9052_rtc_enable_alarm(rtc->da9052, enabled);
+}
+
+static const struct rtc_class_ops da9052_rtc_ops = {
+        .read_time      = da9052_rtc_read_time,
+        .set_time       = da9052_rtc_set_time,
+        .read_alarm     = da9052_rtc_read_alarm,
+        .set_alarm      = da9052_rtc_set_alarm,
+        .alarm_irq_enable = da9052_rtc_alarm_irq_enable,
+};
+
+static int __devinit da9052_rtc_probe(struct platform_device *pdev)
+{
+        struct da9052_rtc *rtc;
+        int ret;
+
+        rtc = devm_kzalloc(&pdev->dev, sizeof(struct da9052_rtc), GFP_KERNEL);
+        if (!rtc)
+                return -ENOMEM;
+
+        rtc->da9052 = dev_get_drvdata(pdev->dev.parent);
+        platform_set_drvdata(pdev, rtc);
+        rtc->irq = platform_get_irq_byname(pdev, "ALM");
+        ret = request_threaded_irq(rtc->irq, NULL, da9052_rtc_irq,
+                                   IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                   "ALM", rtc);
+        if (ret != 0) {
+                rtc_err(rtc->da9052, "irq registration failed: %d\n", ret);
+                goto err_mem;
+        }
+
+        rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                                       &da9052_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc->rtc)) {
+                ret = PTR_ERR(rtc->rtc);
+                goto err_free_irq;
+        }
+
+        return 0;
+
+err_free_irq:
+        free_irq(rtc->irq, rtc);
+err_mem:
+        devm_kfree(&pdev->dev, rtc);
+        return ret;
+}
+
+static int __devexit da9052_rtc_remove(struct platform_device *pdev)
+{
+        struct da9052_rtc *rtc = pdev->dev.platform_data;
+
+        rtc_device_unregister(rtc->rtc);
+        free_irq(rtc->irq, rtc);
+        platform_set_drvdata(pdev, NULL);
+        devm_kfree(&pdev->dev, rtc);
+
+        return 0;
+}
+
+static struct platform_driver da9052_rtc_driver = {
+        .probe  = da9052_rtc_probe,
+        .remove = __devexit_p(da9052_rtc_remove),
+        .driver = {
+                .name   = "da9052-rtc",
+                .owner  = THIS_MODULE,
+        },
+};
+
+module_platform_driver(da9052_rtc_driver);
+
+MODULE_AUTHOR("David Dajun Chen <dchen@diasemi.com>");
+MODULE_DESCRIPTION("RTC driver for Dialog DA9052 PMIC");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:da9052-rtc");
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c
index 755e1fe914af..14c2109dbaa3 100644
--- a/drivers/rtc/rtc-davinci.c
+++ b/drivers/rtc/rtc-davinci.c
@@ -542,7 +542,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
         rtcss_write(davinci_rtc, 0, PRTCSS_RTC_CCTRL);
 
         ret = request_irq(davinci_rtc->irq, davinci_rtc_interrupt,
-                          IRQF_DISABLED, "davinci_rtc", davinci_rtc);
+                          0, "davinci_rtc", davinci_rtc);
         if (ret < 0) {
                 dev_err(dev, "unable to register davinci RTC interrupt\n");
                 goto fail4;
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 3a33b1fdbe0f..686a865913e1 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -814,17 +814,7 @@ static struct spi_driver ds1305_driver = {
         /* REVISIT add suspend/resume */
 };
 
-static int __init ds1305_init(void)
-{
-        return spi_register_driver(&ds1305_driver);
-}
-module_init(ds1305_init);
-
-static void __exit ds1305_exit(void)
-{
-        spi_unregister_driver(&ds1305_driver);
-}
-module_exit(ds1305_exit);
+module_spi_driver(ds1305_driver);
 
 MODULE_DESCRIPTION("RTC driver for DS1305 and DS1306 chips");
 MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 62b0763b7b9a..cd188ab72f79 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -20,7 +20,8 @@
 
 
 
-/* We can't determine type by probing, but if we expect pre-Linux code
+/*
+ * We can't determine type by probing, but if we expect pre-Linux code
  * to have set the chip up as a clock (turning on the oscillator and
  * setting the date and time), Linux can ignore the non-clock features.
  * That's a natural job for a factory or repair bench.
@@ -36,7 +37,8 @@ enum ds_type {
         m41t00,
         mcp7941x,
         rx_8025,
-        // rs5c372 too?  different address...
+        last_ds_type /* always last */
+        /* rs5c372 too?  different address... */
 };
 
 
@@ -58,7 +60,8 @@ enum ds_type {
 #       define DS1337_BIT_CENTURY       0x80    /* in REG_MONTH */
 #define DS1307_REG_YEAR         0x06    /* 00-99 */
 
-/* Other registers (control, status, alarms, trickle charge, NVRAM, etc)
+/*
+ * Other registers (control, status, alarms, trickle charge, NVRAM, etc)
  * start at 7, and they differ a LOT. Only control and status matter for
  * basic RTC date and time functionality; be careful using them.
  */
@@ -102,6 +105,8 @@ enum ds_type {
 struct ds1307 {
         u8                      offset; /* register's offset */
         u8                      regs[11];
+        u16                     nvram_offset;
+        struct bin_attribute    *nvram;
         enum ds_type            type;
         unsigned long           flags;
 #define HAS_NVRAM       0               /* bit 0 == sysfs file active */
@@ -116,34 +121,35 @@ struct ds1307 {
 };
 
 struct chip_desc {
-        unsigned                nvram56:1;
         unsigned                alarm:1;
+        u16                     nvram_offset;
+        u16                     nvram_size;
 };
 
-static const struct chip_desc chips[] = {
-[ds_1307] = {
-        .nvram56        = 1,
-},
-[ds_1337] = {
-        .alarm          = 1,
-},
-[ds_1338] = {
-        .nvram56        = 1,
-},
-[ds_1339] = {
-        .alarm          = 1,
-},
-[ds_1340] = {
-},
-[ds_3231] = {
-        .alarm          = 1,
-},
-[m41t00] = {
-},
-[mcp7941x] = {
-},
-[rx_8025] = {
-}, };
+static const struct chip_desc chips[last_ds_type] = {
+        [ds_1307] = {
+                .nvram_offset   = 8,
+                .nvram_size     = 56,
+        },
+        [ds_1337] = {
+                .alarm          = 1,
+        },
+        [ds_1338] = {
+                .nvram_offset   = 8,
+                .nvram_size     = 56,
+        },
+        [ds_1339] = {
+                .alarm          = 1,
+        },
+        [ds_3231] = {
+                .alarm          = 1,
+        },
+        [mcp7941x] = {
+                /* this is battery backed SRAM */
+                .nvram_offset   = 0x20,
+                .nvram_size     = 0x40,
+        },
+};
 
 static const struct i2c_device_id ds1307_id[] = {
         { "ds1307", ds_1307 },
@@ -372,6 +378,11 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)
                                 | DS1340_BIT_CENTURY;
                 break;
         case mcp7941x:
+                /*
+                 * these bits were cleared when preparing the date/time
+                 * values and need to be set again before writing the
+                 * buffer out to the device.
+                 */
                 buf[DS1307_REG_SECS] |= MCP7941X_BIT_ST;
                 buf[DS1307_REG_WDAY] |= MCP7941X_BIT_VBATEN;
                 break;
@@ -417,7 +428,8 @@ static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t)
                         ds1307->regs[6], ds1307->regs[7],
                         ds1307->regs[8]);
 
-        /* report alarm time (ALARM1); assume 24 hour and day-of-month modes,
+        /*
+         * report alarm time (ALARM1); assume 24 hour and day-of-month modes,
          * and that all four fields are checked matches
          */
         t->time.tm_sec = bcd2bin(ds1307->regs[0] & 0x7f);
@@ -445,7 +457,7 @@ static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t)
 
 static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t)
 {
-        struct i2c_client       *client = to_i2c_client(dev);
+        struct i2c_client       *client = to_i2c_client(dev);
         struct ds1307           *ds1307 = i2c_get_clientdata(client);
         unsigned char           *buf = ds1307->regs;
         u8                      control, status;
@@ -541,8 +553,6 @@ static const struct rtc_class_ops ds13xx_rtc_ops = {
 
 /*----------------------------------------------------------------------*/
 
-#define NVRAM_SIZE      56
-
 static ssize_t
 ds1307_nvram_read(struct file *filp, struct kobject *kobj,
                 struct bin_attribute *attr,
@@ -555,14 +565,15 @@ ds1307_nvram_read(struct file *filp, struct kobject *kobj,
         client = kobj_to_i2c_client(kobj);
         ds1307 = i2c_get_clientdata(client);
 
-        if (unlikely(off >= NVRAM_SIZE))
+        if (unlikely(off >= ds1307->nvram->size))
                 return 0;
-        if ((off + count) > NVRAM_SIZE)
-                count = NVRAM_SIZE - off;
+        if ((off + count) > ds1307->nvram->size)
+                count = ds1307->nvram->size - off;
         if (unlikely(!count))
                 return count;
 
-        result = ds1307->read_block_data(client, 8 + off, count, buf);
+        result = ds1307->read_block_data(client, ds1307->nvram_offset + off,
+                                                                count, buf);
         if (result < 0)
                 dev_err(&client->dev, "%s error %d\n", "nvram read", result);
         return result;
@@ -580,14 +591,15 @@ ds1307_nvram_write(struct file *filp, struct kobject *kobj,
         client = kobj_to_i2c_client(kobj);
         ds1307 = i2c_get_clientdata(client);
 
-        if (unlikely(off >= NVRAM_SIZE))
+        if (unlikely(off >= ds1307->nvram->size))
                 return -EFBIG;
-        if ((off + count) > NVRAM_SIZE)
-                count = NVRAM_SIZE - off;
+        if ((off + count) > ds1307->nvram->size)
+                count = ds1307->nvram->size - off;
         if (unlikely(!count))
                 return count;
 
-        result = ds1307->write_block_data(client, 8 + off, count, buf);
+        result = ds1307->write_block_data(client, ds1307->nvram_offset + off,
+                                                                count, buf);
         if (result < 0) {
                 dev_err(&client->dev, "%s error %d\n", "nvram write", result);
                 return result;
@@ -595,21 +607,8 @@ ds1307_nvram_write(struct file *filp, struct kobject *kobj,
         return count;
 }
 
-static struct bin_attribute nvram = {
-        .attr = {
-                .name   = "nvram",
-                .mode   = S_IRUGO | S_IWUSR,
-        },
-
-        .read   = ds1307_nvram_read,
-        .write  = ds1307_nvram_write,
-        .size   = NVRAM_SIZE,
-};
-
 /*----------------------------------------------------------------------*/
 
-static struct i2c_driver ds1307_driver;
-
 static int __devinit ds1307_probe(struct i2c_client *client,
                                   const struct i2c_device_id *id)
 {
@@ -630,7 +629,8 @@ static int __devinit ds1307_probe(struct i2c_client *client,
             && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
                 return -EIO;
 
-        if (!(ds1307 = kzalloc(sizeof(struct ds1307), GFP_KERNEL)))
+        ds1307 = kzalloc(sizeof(struct ds1307), GFP_KERNEL);
+        if (!ds1307)
                 return -ENOMEM;
 
         i2c_set_clientdata(client, ds1307);
@@ -652,11 +652,6 @@ static int __devinit ds1307_probe(struct i2c_client *client,
         case ds_1337:
         case ds_1339:
         case ds_3231:
-                /* has IRQ? */
-                if (ds1307->client->irq > 0 && chip->alarm) {
-                        INIT_WORK(&ds1307->work, ds1307_work);
-                        want_irq = true;
-                }
                 /* get registers that the "rtc" read below won't read... */
                 tmp = ds1307->read_block_data(ds1307->client,
                                 DS1337_REG_CONTROL, 2, buf);
@@ -670,14 +665,19 @@ static int __devinit ds1307_probe(struct i2c_client *client,
                 if (ds1307->regs[0] & DS1337_BIT_nEOSC)
                         ds1307->regs[0] &= ~DS1337_BIT_nEOSC;
 
-                /* Using IRQ?  Disable the square wave and both alarms.
+                /*
+                 * Using IRQ?  Disable the square wave and both alarms.
                  * For some variants, be sure alarms can trigger when we're
                  * running on Vbackup (BBSQI/BBSQW)
                  */
-                if (want_irq) {
+                if (ds1307->client->irq > 0 && chip->alarm) {
+                        INIT_WORK(&ds1307->work, ds1307_work);
+
                         ds1307->regs[0] |= DS1337_BIT_INTCN
                                         | bbsqi_bitpos[ds1307->type];
                         ds1307->regs[0] &= ~(DS1337_BIT_A2IE | DS1337_BIT_A1IE);
+
+                        want_irq = true;
                 }
 
                 i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,
@@ -772,7 +772,8 @@ read_rtc:
                 goto exit_free;
         }
 
-        /* minimal sanity checking; some chips (like DS1340) don't
+        /*
+         * minimal sanity checking; some chips (like DS1340) don't
          * specify the extra bits as must-be-zero, but there are
          * still a few values that are clearly out-of-range.
          */
@@ -836,11 +837,7 @@ read_rtc:
                 }
 
                 break;
-        case rx_8025:
-        case ds_1337:
-        case ds_1339:
-        case ds_1388:
-        case ds_3231:
+        default:
                 break;
         }
 
@@ -848,7 +845,8 @@ read_rtc:
         switch (ds1307->type) {
         case ds_1340:
         case m41t00:
-                /* NOTE: ignores century bits; fix before deploying
+                /*
+                 * NOTE: ignores century bits; fix before deploying
                  * systems that will run through year 2100.
                  */
                 break;
@@ -858,7 +856,8 @@ read_rtc:
                 if (!(tmp & DS1307_BIT_12HR))
                         break;
 
-                /* Be sure we're in 24 hour mode.  Multi-master systems
+                /*
+                 * Be sure we're in 24 hour mode.  Multi-master systems
                  * take note...
                  */
                 tmp = bcd2bin(tmp & 0x1f);
@@ -894,16 +893,31 @@ read_rtc:
                 dev_dbg(&client->dev, "got IRQ %d\n", client->irq);
         }
 
-        if (chip->nvram56) {
-                err = sysfs_create_bin_file(&client->dev.kobj, &nvram);
-                if (err == 0) {
-                        set_bit(HAS_NVRAM, &ds1307->flags);
-                        dev_info(&client->dev, "56 bytes nvram\n");
+        if (chip->nvram_size) {
+                ds1307->nvram = kzalloc(sizeof(struct bin_attribute),
+                                                        GFP_KERNEL);
+                if (!ds1307->nvram) {
+                        err = -ENOMEM;
+                        goto exit_nvram;
+                }
+                ds1307->nvram->attr.name = "nvram";
+                ds1307->nvram->attr.mode = S_IRUGO | S_IWUSR;
+                ds1307->nvram->read = ds1307_nvram_read,
+                ds1307->nvram->write = ds1307_nvram_write,
+                ds1307->nvram->size = chip->nvram_size;
+                ds1307->nvram_offset = chip->nvram_offset;
+                err = sysfs_create_bin_file(&client->dev.kobj, ds1307->nvram);
+                if (err) {
+                        kfree(ds1307->nvram);
+                        goto exit_nvram;
                 }
+                set_bit(HAS_NVRAM, &ds1307->flags);
+                dev_info(&client->dev, "%zu bytes nvram\n", ds1307->nvram->size);
         }
 
         return 0;
 
+exit_nvram:
 exit_irq:
         rtc_device_unregister(ds1307->rtc);
 exit_free:
@@ -913,15 +927,17 @@ exit_free:
 
 static int __devexit ds1307_remove(struct i2c_client *client)
 {
-        struct ds1307           *ds1307 = i2c_get_clientdata(client);
+        struct ds1307 *ds1307 = i2c_get_clientdata(client);
 
         if (test_and_clear_bit(HAS_ALARM, &ds1307->flags)) {
                 free_irq(client->irq, client);
                 cancel_work_sync(&ds1307->work);
         }
 
-        if (test_and_clear_bit(HAS_NVRAM, &ds1307->flags))
-                sysfs_remove_bin_file(&client->dev.kobj, &nvram);
+        if (test_and_clear_bit(HAS_NVRAM, &ds1307->flags)) {
+                sysfs_remove_bin_file(&client->dev.kobj, ds1307->nvram);
+                kfree(ds1307->nvram);
+        }
 
         rtc_device_unregister(ds1307->rtc);
         kfree(ds1307);
@@ -938,17 +954,7 @@ static struct i2c_driver ds1307_driver = {
         .id_table       = ds1307_id,
 };
 
-static int __init ds1307_init(void)
-{
-        return i2c_add_driver(&ds1307_driver);
-}
-module_init(ds1307_init);
-
-static void __exit ds1307_exit(void)
-{
-        i2c_del_driver(&ds1307_driver);
-}
-module_exit(ds1307_exit);
+module_i2c_driver(ds1307_driver);
 
 MODULE_DESCRIPTION("RTC driver for DS1307 and similar chips");
 MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index e6e71deb188f..966316088b7f 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -446,18 +446,7 @@ static struct i2c_driver ds1374_driver = {
         .id_table = ds1374_id,
 };
 
-static int __init ds1374_init(void)
-{
-        return i2c_add_driver(&ds1374_driver);
-}
-
-static void __exit ds1374_exit(void)
-{
-        i2c_del_driver(&ds1374_driver);
-}
-
-module_init(ds1374_init);
-module_exit(ds1374_exit);
+module_i2c_driver(ds1374_driver);
 
 MODULE_AUTHOR("Scott Wood <scottwood@freescale.com>");
 MODULE_DESCRIPTION("Maxim/Dallas DS1374 RTC Driver");
diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c
index b038d2cfef26..b0a99e1b25be 100644
--- a/drivers/rtc/rtc-ds1390.c
+++ b/drivers/rtc/rtc-ds1390.c
@@ -175,17 +175,7 @@ static struct spi_driver ds1390_driver = {
         .remove = __devexit_p(ds1390_remove),
 };
 
-static __init int ds1390_init(void)
-{
-        return spi_register_driver(&ds1390_driver);
-}
-module_init(ds1390_init);
-
-static __exit void ds1390_exit(void)
-{
-        spi_unregister_driver(&ds1390_driver);
-}
-module_exit(ds1390_exit);
+module_spi_driver(ds1390_driver);
 
 MODULE_DESCRIPTION("Dallas/Maxim DS1390/93/94 SPI RTC driver");
 MODULE_AUTHOR("Mark Jackson <mpfj@mimc.co.uk>");
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 761f36bc83a9..1f675f5294f5 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -532,7 +532,7 @@ ds1511_rtc_probe(struct platform_device *pdev)
         if (pdata->irq > 0) {
                 rtc_read(RTC_CMD1);
                 if (devm_request_irq(&pdev->dev, pdata->irq, ds1511_interrupt,
-                        IRQF_DISABLED | IRQF_SHARED, pdev->name, pdev) < 0) {
+                        IRQF_SHARED, pdev->name, pdev) < 0) {
 
                         dev_warn(&pdev->dev, "interrupt not available.\n");
                         pdata->irq = 0;
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index 6f0a1b530f2e..6ccedbbf923c 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -320,7 +320,7 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev)
                 writeb(0, ioaddr + RTC_INTERRUPTS);
                 if (devm_request_irq(&pdev->dev, pdata->irq,
                                 ds1553_rtc_interrupt,
-                                IRQF_DISABLED, pdev->name, pdev) < 0) {
+                                0, pdev->name, pdev) < 0) {
                         dev_warn(&pdev->dev, "interrupt not available.\n");
                         pdata->irq = 0;
                 }
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index a319402a5447..7fa67d0df172 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -202,20 +202,9 @@ static struct i2c_driver ds1672_driver = {
         .id_table = ds1672_id,
 };
 
-static int __init ds1672_init(void)
-{
-        return i2c_add_driver(&ds1672_driver);
-}
-
-static void __exit ds1672_exit(void)
-{
-        i2c_del_driver(&ds1672_driver);
-}
+module_i2c_driver(ds1672_driver);
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("Dallas/Maxim DS1672 timekeeper driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(ds1672_init);
-module_exit(ds1672_exit);
diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c
index 27b7bf672ac6..e1945095814e 100644
--- a/drivers/rtc/rtc-ds3232.c
+++ b/drivers/rtc/rtc-ds3232.c
@@ -473,18 +473,7 @@ static struct i2c_driver ds3232_driver = {
         .id_table = ds3232_id,
 };
 
-static int __init ds3232_init(void)
-{
-        return i2c_add_driver(&ds3232_driver);
-}
-
-static void __exit ds3232_exit(void)
-{
-        i2c_del_driver(&ds3232_driver);
-}
-
-module_init(ds3232_init);
-module_exit(ds3232_exit);
+module_i2c_driver(ds3232_driver);
 
 MODULE_AUTHOR("Srikanth Srinivasan <srikanth.srinivasan@freescale.com>");
 MODULE_DESCRIPTION("Maxim/Dallas DS3232 RTC Driver");
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
index bbd26228f532..fda707926f02 100644
--- a/drivers/rtc/rtc-ds3234.c
+++ b/drivers/rtc/rtc-ds3234.c
@@ -173,17 +173,7 @@ static struct spi_driver ds3234_driver = {
         .remove = __devexit_p(ds3234_remove),
 };
 
-static __init int ds3234_init(void)
-{
-        return spi_register_driver(&ds3234_driver);
-}
-module_init(ds3234_init);
-
-static __exit void ds3234_exit(void)
-{
-        spi_unregister_driver(&ds3234_driver);
-}
-module_exit(ds3234_exit);
+module_spi_driver(ds3234_driver);
 
 MODULE_DESCRIPTION("DS3234 SPI RTC driver");
 MODULE_AUTHOR("Dennis Aberilla <denzzzhome@yahoo.com>");
diff --git a/drivers/rtc/rtc-em3027.c b/drivers/rtc/rtc-em3027.c
index 8414dea5fb14..0104ea7ebe50 100644
--- a/drivers/rtc/rtc-em3027.c
+++ b/drivers/rtc/rtc-em3027.c
@@ -144,19 +144,8 @@ static struct i2c_driver em3027_driver = {
         .id_table = em3027_id,
 };
 
-static int __init em3027_init(void)
-{
-        return i2c_add_driver(&em3027_driver);
-}
-
-static void __exit em3027_exit(void)
-{
-        i2c_del_driver(&em3027_driver);
-}
+module_i2c_driver(em3027_driver);
 
 MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
 MODULE_DESCRIPTION("EM Microelectronic EM3027 RTC driver");
 MODULE_LICENSE("GPL");
-
-module_init(em3027_init);
-module_exit(em3027_exit);
diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c
index 4cf2e70c5078..86b6ecce99f0 100644
--- a/drivers/rtc/rtc-fm3130.c
+++ b/drivers/rtc/rtc-fm3130.c
@@ -565,17 +565,7 @@ static struct i2c_driver fm3130_driver = {
         .id_table       = fm3130_id,
 };
 
-static int __init fm3130_init(void)
-{
-        return i2c_add_driver(&fm3130_driver);
-}
-module_init(fm3130_init);
-
-static void __exit fm3130_exit(void)
-{
-        i2c_del_driver(&fm3130_driver);
-}
-module_exit(fm3130_exit);
+module_i2c_driver(fm3130_driver);
 
 MODULE_DESCRIPTION("RTC driver for FM3130");
 MODULE_AUTHOR("Sergey Lapin <slapin@ossfans.org>");
diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index 6186833973ee..1850104705c0 100644
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -309,18 +309,7 @@ static struct i2c_driver isl12022_driver = {
         .id_table       = isl12022_id,
 };
 
-static int __init isl12022_init(void)
-{
-        return i2c_add_driver(&isl12022_driver);
-}
-
-static void __exit isl12022_exit(void)
-{
-        i2c_del_driver(&isl12022_driver);
-}
-
-module_init(isl12022_init);
-module_exit(isl12022_exit);
+module_i2c_driver(isl12022_driver);
 
 MODULE_AUTHOR("roman.fietze@telemotive.de");
 MODULE_DESCRIPTION("ISL 12022 RTC driver");
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index da8beb8cae51..dd2aeee6c66a 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -710,22 +710,9 @@ static struct i2c_driver isl1208_driver = {
         .id_table = isl1208_id,
 };
 
-static int __init
-isl1208_init(void)
-{
-        return i2c_add_driver(&isl1208_driver);
-}
-
-static void __exit
-isl1208_exit(void)
-{
-        i2c_del_driver(&isl1208_driver);
-}
+module_i2c_driver(isl1208_driver);
 
 MODULE_AUTHOR("Herbert Valerio Riedel <hvr@gnu.org>");
 MODULE_DESCRIPTION("Intersil ISL1208 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(isl1208_init);
-module_exit(isl1208_exit);
diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c
index ecc1713b2b4f..63c72189c64b 100644
--- a/drivers/rtc/rtc-lpc32xx.c
+++ b/drivers/rtc/rtc-lpc32xx.c
@@ -287,7 +287,7 @@ static int __devinit lpc32xx_rtc_probe(struct platform_device *pdev)
         if (rtc->irq >= 0) {
                 if (devm_request_irq(&pdev->dev, rtc->irq,
                                      lpc32xx_rtc_alarm_interrupt,
-                                     IRQF_DISABLED, pdev->name, rtc) < 0) {
+                                     0, pdev->name, rtc) < 0) {
                         dev_warn(&pdev->dev, "Can't request interrupt.\n");
                         rtc->irq = -1;
                 } else {
diff --git a/drivers/rtc/rtc-ls1x.c b/drivers/rtc/rtc-ls1x.c
new file mode 100644
index 000000000000..07e81c5f8247
--- /dev/null
+++ b/drivers/rtc/rtc-ls1x.c
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2011 Zhao Zhang <zhzhl555@gmail.com>
+ *
+ * Derived from driver/rtc/rtc-au1xxx.c
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/types.h>
+#include <linux/io.h>
+#include <asm/mach-loongson1/loongson1.h>
+
+#define LS1X_RTC_REG_OFFSET     (LS1X_RTC_BASE + 0x20)
+#define LS1X_RTC_REGS(x) \
+                ((void __iomem *)KSEG1ADDR(LS1X_RTC_REG_OFFSET + (x)))
+
+/*RTC programmable counters 0 and 1*/
+#define SYS_COUNTER_CNTRL               (LS1X_RTC_REGS(0x20))
+#define SYS_CNTRL_ERS                   (1 << 23)
+#define SYS_CNTRL_RTS                   (1 << 20)
+#define SYS_CNTRL_RM2                   (1 << 19)
+#define SYS_CNTRL_RM1                   (1 << 18)
+#define SYS_CNTRL_RM0                   (1 << 17)
+#define SYS_CNTRL_RS                    (1 << 16)
+#define SYS_CNTRL_BP                    (1 << 14)
+#define SYS_CNTRL_REN                   (1 << 13)
+#define SYS_CNTRL_BRT                   (1 << 12)
+#define SYS_CNTRL_TEN                   (1 << 11)
+#define SYS_CNTRL_BTT                   (1 << 10)
+#define SYS_CNTRL_E0                    (1 << 8)
+#define SYS_CNTRL_ETS                   (1 << 7)
+#define SYS_CNTRL_32S                   (1 << 5)
+#define SYS_CNTRL_TTS                   (1 << 4)
+#define SYS_CNTRL_TM2                   (1 << 3)
+#define SYS_CNTRL_TM1                   (1 << 2)
+#define SYS_CNTRL_TM0                   (1 << 1)
+#define SYS_CNTRL_TS                    (1 << 0)
+
+/* Programmable Counter 0 Registers */
+#define SYS_TOYTRIM             (LS1X_RTC_REGS(0))
+#define SYS_TOYWRITE0           (LS1X_RTC_REGS(4))
+#define SYS_TOYWRITE1           (LS1X_RTC_REGS(8))
+#define SYS_TOYREAD0            (LS1X_RTC_REGS(0xC))
+#define SYS_TOYREAD1            (LS1X_RTC_REGS(0x10))
+#define SYS_TOYMATCH0           (LS1X_RTC_REGS(0x14))
+#define SYS_TOYMATCH1           (LS1X_RTC_REGS(0x18))
+#define SYS_TOYMATCH2           (LS1X_RTC_REGS(0x1C))
+
+/* Programmable Counter 1 Registers */
+#define SYS_RTCTRIM             (LS1X_RTC_REGS(0x40))
+#define SYS_RTCWRITE0           (LS1X_RTC_REGS(0x44))
+#define SYS_RTCREAD0            (LS1X_RTC_REGS(0x48))
+#define SYS_RTCMATCH0           (LS1X_RTC_REGS(0x4C))
+#define SYS_RTCMATCH1           (LS1X_RTC_REGS(0x50))
+#define SYS_RTCMATCH2           (LS1X_RTC_REGS(0x54))
+
+#define LS1X_SEC_OFFSET         (4)
+#define LS1X_MIN_OFFSET         (10)
+#define LS1X_HOUR_OFFSET        (16)
+#define LS1X_DAY_OFFSET         (21)
+#define LS1X_MONTH_OFFSET       (26)
+
+
+#define LS1X_SEC_MASK           (0x3f)
+#define LS1X_MIN_MASK           (0x3f)
+#define LS1X_HOUR_MASK          (0x1f)
+#define LS1X_DAY_MASK           (0x1f)
+#define LS1X_MONTH_MASK         (0x3f)
+#define LS1X_YEAR_MASK          (0xffffffff)
+
+#define ls1x_get_sec(t)         (((t) >> LS1X_SEC_OFFSET) & LS1X_SEC_MASK)
+#define ls1x_get_min(t)         (((t) >> LS1X_MIN_OFFSET) & LS1X_MIN_MASK)
+#define ls1x_get_hour(t)        (((t) >> LS1X_HOUR_OFFSET) & LS1X_HOUR_MASK)
+#define ls1x_get_day(t)         (((t) >> LS1X_DAY_OFFSET) & LS1X_DAY_MASK)
+#define ls1x_get_month(t)       (((t) >> LS1X_MONTH_OFFSET) & LS1X_MONTH_MASK)
+
+#define RTC_CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)
+
+static int ls1x_rtc_read_time(struct device *dev, struct rtc_time *rtm)
+{
+        unsigned long v, t;
+
+        v = readl(SYS_TOYREAD0);
+        t = readl(SYS_TOYREAD1);
+
+        memset(rtm, 0, sizeof(struct rtc_time));
+        t  = mktime((t & LS1X_YEAR_MASK), ls1x_get_month(v),
+                        ls1x_get_day(v), ls1x_get_hour(v),
+                        ls1x_get_min(v), ls1x_get_sec(v));
+        rtc_time_to_tm(t, rtm);
+
+        return rtc_valid_tm(rtm);
+}
+
+static int ls1x_rtc_set_time(struct device *dev, struct  rtc_time *rtm)
+{
+        unsigned long v, t, c;
+        int ret = -ETIMEDOUT;
+
+        v = ((rtm->tm_mon + 1)  << LS1X_MONTH_OFFSET)
+                | (rtm->tm_mday << LS1X_DAY_OFFSET)
+                | (rtm->tm_hour << LS1X_HOUR_OFFSET)
+                | (rtm->tm_min  << LS1X_MIN_OFFSET)
+                | (rtm->tm_sec  << LS1X_SEC_OFFSET);
+
+        writel(v, SYS_TOYWRITE0);
+        c = 0x10000;
+        /* add timeout check counter, for more safe */
+        while ((readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_TS) && --c)
+                usleep_range(1000, 3000);
+
+        if (!c) {
+                dev_err(dev, "set time timeout!\n");
+                goto err;
+        }
+
+        t = rtm->tm_year + 1900;
+        writel(t, SYS_TOYWRITE1);
+        c = 0x10000;
+        while ((readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_TS) && --c)
+                usleep_range(1000, 3000);
+
+        if (!c) {
+                dev_err(dev, "set time timeout!\n");
+                goto err;
+        }
+        return 0;
+err:
+        return ret;
+}
+
+static struct rtc_class_ops  ls1x_rtc_ops = {
+        .read_time      = ls1x_rtc_read_time,
+        .set_time       = ls1x_rtc_set_time,
+};
+
+static int __devinit ls1x_rtc_probe(struct platform_device *pdev)
+{
+        struct rtc_device *rtcdev;
+        unsigned long v;
+        int ret;
+
+        v = readl(SYS_COUNTER_CNTRL);
+        if (!(v & RTC_CNTR_OK)) {
+                dev_err(&pdev->dev, "rtc counters not working\n");
+                ret = -ENODEV;
+                goto err;
+        }
+        ret = -ETIMEDOUT;
+        /* set to 1 HZ if needed */
+        if (readl(SYS_TOYTRIM) != 32767) {
+                v = 0x100000;
+                while ((readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_TTS) && --v)
+                        usleep_range(1000, 3000);
+
+                if (!v) {
+                        dev_err(&pdev->dev, "time out\n");
+                        goto err;
+                }
+                writel(32767, SYS_TOYTRIM);
+        }
+        /* this loop coundn't be endless */
+        while (readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_TTS)
+                usleep_range(1000, 3000);
+
+        rtcdev = rtc_device_register("ls1x-rtc", &pdev->dev,
+                                        &ls1x_rtc_ops , THIS_MODULE);
+        if (IS_ERR(rtcdev)) {
+                ret = PTR_ERR(rtcdev);
+                goto err;
+        }
+
+        platform_set_drvdata(pdev, rtcdev);
+        return 0;
+err:
+        return ret;
+}
+
+static int __devexit ls1x_rtc_remove(struct platform_device *pdev)
+{
+        struct rtc_device *rtcdev = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(rtcdev);
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver  ls1x_rtc_driver = {
+        .driver         = {
+                .name   = "ls1x-rtc",
+                .owner  = THIS_MODULE,
+        },
+        .remove         = __devexit_p(ls1x_rtc_remove),
+        .probe          = ls1x_rtc_probe,
+};
+
+module_platform_driver(ls1x_rtc_driver);
+
+MODULE_AUTHOR("zhao zhang <zhzhl555@gmail.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 64aedd8cc095..4e0f84af99a7 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -900,20 +900,9 @@ static struct i2c_driver m41t80_driver = {
         .id_table = m41t80_id,
 };
 
-static int __init m41t80_rtc_init(void)
-{
-        return i2c_add_driver(&m41t80_driver);
-}
-
-static void __exit m41t80_rtc_exit(void)
-{
-        i2c_del_driver(&m41t80_driver);
-}
+module_i2c_driver(m41t80_driver);
 
 MODULE_AUTHOR("Alexander Bigga <ab@mycable.de>");
 MODULE_DESCRIPTION("ST Microelectronics M41T80 series RTC I2C Client Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(m41t80_rtc_init);
-module_exit(m41t80_rtc_exit);
diff --git a/drivers/rtc/rtc-m41t93.c b/drivers/rtc/rtc-m41t93.c
index ef71132ff205..10f1c29436ec 100644
--- a/drivers/rtc/rtc-m41t93.c
+++ b/drivers/rtc/rtc-m41t93.c
@@ -206,17 +206,7 @@ static struct spi_driver m41t93_driver = {
         .remove = __devexit_p(m41t93_remove),
 };
 
-static __init int m41t93_init(void)
-{
-        return spi_register_driver(&m41t93_driver);
-}
-module_init(m41t93_init);
-
-static __exit void m41t93_exit(void)
-{
-        spi_unregister_driver(&m41t93_driver);
-}
-module_exit(m41t93_exit);
+module_spi_driver(m41t93_driver);
 
 MODULE_AUTHOR("Nikolaus Voss <n.voss@weinmann.de>");
 MODULE_DESCRIPTION("Driver for ST M41T93 SPI RTC");
diff --git a/drivers/rtc/rtc-m41t94.c b/drivers/rtc/rtc-m41t94.c
index 2a4721f61797..6e78193e026b 100644
--- a/drivers/rtc/rtc-m41t94.c
+++ b/drivers/rtc/rtc-m41t94.c
@@ -153,19 +153,7 @@ static struct spi_driver m41t94_driver = {
         .remove = __devexit_p(m41t94_remove),
 };
 
-static __init int m41t94_init(void)
-{
-        return spi_register_driver(&m41t94_driver);
-}
-
-module_init(m41t94_init);
-
-static __exit void m41t94_exit(void)
-{
-        spi_unregister_driver(&m41t94_driver);
-}
-
-module_exit(m41t94_exit);
+module_spi_driver(m41t94_driver);
 
 MODULE_AUTHOR("Kim B. Heino <Kim.Heino@bluegiga.com>");
 MODULE_DESCRIPTION("Driver for ST M41T94 SPI RTC");
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
index 486142c2637a..a00e33204b91 100644
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -261,20 +261,9 @@ static struct i2c_driver max6900_driver = {
         .id_table = max6900_id,
 };
 
-static int __init max6900_init(void)
-{
-        return i2c_add_driver(&max6900_driver);
-}
-
-static void __exit max6900_exit(void)
-{
-        i2c_del_driver(&max6900_driver);
-}
+module_i2c_driver(max6900_driver);
 
 MODULE_DESCRIPTION("Maxim MAX6900 RTC driver");
 MODULE_AUTHOR("Dale Farnsworth <dale@farnsworth.org>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(max6900_init);
-module_exit(max6900_exit);
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 1f6b3cc58e8a..36c74d22e8b5 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -160,17 +160,7 @@ static struct spi_driver max6902_driver = {
         .remove = __devexit_p(max6902_remove),
 };
 
-static __init int max6902_init(void)
-{
-        return spi_register_driver(&max6902_driver);
-}
-module_init(max6902_init);
-
-static __exit void max6902_exit(void)
-{
-        spi_unregister_driver(&max6902_driver);
-}
-module_exit(max6902_exit);
+module_spi_driver(max6902_driver);
 
 MODULE_DESCRIPTION ("max6902 spi RTC driver");
 MODULE_AUTHOR ("Raphael Assenat");
diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 2d71943bc436..1459055a83aa 100644
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -193,10 +193,17 @@ static int max8925_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         ret = max8925_reg_read(info->rtc, MAX8925_RTC_IRQ_MASK);
         if (ret < 0)
                 goto out;
-        if ((ret & ALARM0_IRQ) == 0)
-                alrm->enabled = 1;
-        else
+        if (ret & ALARM0_IRQ) {
                 alrm->enabled = 0;
+        } else {
+                ret = max8925_reg_read(info->rtc, MAX8925_ALARM0_CNTL);
+                if (ret < 0)
+                        goto out;
+                if (!ret)
+                        alrm->enabled = 0;
+                else
+                        alrm->enabled = 1;
+        }
         ret = max8925_reg_read(info->rtc, MAX8925_RTC_STATUS);
         if (ret < 0)
                 goto out;
@@ -204,6 +211,7 @@ static int max8925_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
                 alrm->pending = 1;
         else
                 alrm->pending = 0;
+        return 0;
 out:
         return ret;
 }
@@ -220,8 +228,11 @@ static int max8925_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         ret = max8925_bulk_write(info->rtc, MAX8925_ALARM0_SEC, TIME_NUM, buf);
         if (ret < 0)
                 goto out;
-        /* only enable alarm on year/month/day/hour/min/sec */
-        ret = max8925_reg_write(info->rtc, MAX8925_ALARM0_CNTL, 0x77);
+        if (alrm->enabled)
+                /* only enable alarm on year/month/day/hour/min/sec */
+                ret = max8925_reg_write(info->rtc, MAX8925_ALARM0_CNTL, 0x77);
+        else
+                ret = max8925_reg_write(info->rtc, MAX8925_ALARM0_CNTL, 0x0);
         if (ret < 0)
                 goto out;
 out:
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index 9d3caccfc250..e954a759ba85 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@ -327,7 +327,7 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op)
         dev_set_drvdata(&op->dev, rtc);
 
         rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1);
-        err = request_irq(rtc->irq, mpc5121_rtc_handler, IRQF_DISABLED,
+        err = request_irq(rtc->irq, mpc5121_rtc_handler, 0,
                                                 "mpc5121-rtc", &op->dev);
         if (err) {
                 dev_err(&op->dev, "%s: could not request irq: %i\n",
@@ -337,7 +337,7 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op)
 
         rtc->irq_periodic = irq_of_parse_and_map(op->dev.of_node, 0);
         err = request_irq(rtc->irq_periodic, mpc5121_rtc_handler_upd,
-                                IRQF_DISABLED, "mpc5121-rtc_upd", &op->dev);
+                                0, "mpc5121-rtc_upd", &op->dev);
         if (err) {
                 dev_err(&op->dev, "%s: could not request irq: %i\n",
                                                 __func__, rtc->irq_periodic);
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 6cd6c7235344..f51719bf4a75 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -366,7 +366,7 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
 
         if (rtc_irq) {
                 retval = request_irq(rtc_irq, mrst_rtc_irq,
-                                IRQF_DISABLED, dev_name(&mrst_rtc.rtc->dev),
+                                0, dev_name(&mrst_rtc.rtc->dev),
                                 mrst_rtc.rtc);
                 if (retval < 0) {
                         dev_dbg(dev, "IRQ %d is already in use, err %d\n",
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c
index 768e2edb9678..1300962486d1 100644
--- a/drivers/rtc/rtc-mv.c
+++ b/drivers/rtc/rtc-mv.c
@@ -273,7 +273,7 @@ static int __devinit mv_rtc_probe(struct platform_device *pdev)
         if (pdata->irq >= 0) {
                 writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
                 if (devm_request_irq(&pdev->dev, pdata->irq, mv_rtc_interrupt,
-                                     IRQF_DISABLED | IRQF_SHARED,
+                                     IRQF_SHARED,
                                      pdev->name, pdata) < 0) {
                         dev_warn(&pdev->dev, "interrupt not available.\n");
                         pdata->irq = -1;
diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index 781068d62f23..b79010987d1e 100644
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -269,7 +269,7 @@ static int __devinit nuc900_rtc_probe(struct platform_device *pdev)
 
         nuc900_rtc->irq_num = platform_get_irq(pdev, 0);
         if (request_irq(nuc900_rtc->irq_num, nuc900_rtc_interrupt,
-                                IRQF_DISABLED, "nuc900rtc", nuc900_rtc)) {
+                                0, "nuc900rtc", nuc900_rtc)) {
                 dev_err(&pdev->dev, "NUC900 RTC request irq failed\n");
                 err = -EBUSY;
                 goto fail4;
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 7789002bdd5c..0b614e32653d 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -348,14 +348,14 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
                 rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG);
 
         /* handle periodic and alarm irqs */
-        if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED,
+        if (request_irq(omap_rtc_timer, rtc_irq, 0,
                         dev_name(&rtc->dev), rtc)) {
                 pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n",
                         pdev->name, omap_rtc_timer);
                 goto fail1;
         }
         if ((omap_rtc_timer != omap_rtc_alarm) &&
-                (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED,
+                (request_irq(omap_rtc_alarm, rtc_irq, 0,
                         dev_name(&rtc->dev), rtc))) {
                 pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n",
                         pdev->name, omap_rtc_alarm);
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index b46c4004d8fe..836118795c0b 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -346,20 +346,9 @@ static struct spi_driver pcf2123_driver = {
         .remove = __devexit_p(pcf2123_remove),
 };
 
-static int __init pcf2123_init(void)
-{
-        return spi_register_driver(&pcf2123_driver);
-}
-
-static void __exit pcf2123_exit(void)
-{
-        spi_unregister_driver(&pcf2123_driver);
-}
+module_spi_driver(pcf2123_driver);
 
 MODULE_AUTHOR("Chris Verges <chrisv@cyberswitching.com>");
 MODULE_DESCRIPTION("NXP PCF2123 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(pcf2123_init);
-module_exit(pcf2123_exit);
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 606fdfab34e2..bc0677de1996 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -252,20 +252,9 @@ static struct i2c_driver pcf8563_driver = {
         .id_table       = pcf8563_id,
 };
 
-static int __init pcf8563_init(void)
-{
-        return i2c_add_driver(&pcf8563_driver);
-}
-
-static void __exit pcf8563_exit(void)
-{
-        i2c_del_driver(&pcf8563_driver);
-}
+module_i2c_driver(pcf8563_driver);
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("Philips PCF8563/Epson RTC8564 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(pcf8563_init);
-module_exit(pcf8563_exit);
diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 2d201afead3b..019ff3571168 100644
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -320,18 +320,7 @@ static struct i2c_driver pcf8583_driver = {
         .id_table       = pcf8583_id,
 };
 
-static __init int pcf8583_init(void)
-{
-        return i2c_add_driver(&pcf8583_driver);
-}
-
-static __exit void pcf8583_exit(void)
-{
-        i2c_del_driver(&pcf8583_driver);
-}
-
-module_init(pcf8583_init);
-module_exit(pcf8583_exit);
+module_i2c_driver(pcf8583_driver);
 
 MODULE_AUTHOR("Russell King");
 MODULE_DESCRIPTION("PCF8583 I2C RTC driver");
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index 02111fee077e..a4a1e534ed42 100644
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -123,7 +123,7 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
 
         amba_set_drvdata(dev, rtc);
 
-        ret = request_irq(dev->irq[0], pl030_interrupt, IRQF_DISABLED,
+        ret = request_irq(dev->irq[0], pl030_interrupt, 0,
                           "rtc-pl030", rtc);
         if (ret)
                 goto err_irq;
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index a952c8de1dd7..3a470e291282 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -352,7 +352,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
         }
 
         if (request_irq(adev->irq[0], pl031_interrupt,
-                        IRQF_DISABLED, "rtc-pl031", ldata)) {
+                        0, "rtc-pl031", ldata)) {
                 ret = -EIO;
                 goto out_no_irq;
         }
diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c
index 9f1d6bcbdf6c..d00bd24342a3 100644
--- a/drivers/rtc/rtc-pm8xxx.c
+++ b/drivers/rtc/rtc-pm8xxx.c
@@ -520,7 +520,7 @@ static int pm8xxx_rtc_suspend(struct device *dev)
 }
 #endif
 
-SIMPLE_DEV_PM_OPS(pm8xxx_rtc_pm_ops, pm8xxx_rtc_suspend, pm8xxx_rtc_resume);
+static SIMPLE_DEV_PM_OPS(pm8xxx_rtc_pm_ops, pm8xxx_rtc_suspend, pm8xxx_rtc_resume);
 
 static struct platform_driver pm8xxx_rtc_driver = {
         .probe          = pm8xxx_rtc_probe,
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index fc9f4991574b..0075c8fd93d8 100644
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -174,14 +174,14 @@ static int pxa_rtc_open(struct device *dev)
         struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev);
         int ret;
 
-        ret = request_irq(pxa_rtc->irq_1Hz, pxa_rtc_irq, IRQF_DISABLED,
+        ret = request_irq(pxa_rtc->irq_1Hz, pxa_rtc_irq, 0,
                           "rtc 1Hz", dev);
         if (ret < 0) {
                 dev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_1Hz,
                         ret);
                 goto err_irq_1Hz;
         }
-        ret = request_irq(pxa_rtc->irq_Alrm, pxa_rtc_irq, IRQF_DISABLED,
+        ret = request_irq(pxa_rtc->irq_Alrm, pxa_rtc_irq, 0,
                           "rtc Alrm", dev);
         if (ret < 0) {
                 dev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_Alrm,
diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c
index 2853c2a6f10f..7f8e6c247935 100644
--- a/drivers/rtc/rtc-r9701.c
+++ b/drivers/rtc/rtc-r9701.c
@@ -159,17 +159,7 @@ static struct spi_driver r9701_driver = {
         .remove = __devexit_p(r9701_remove),
 };
 
-static __init int r9701_init(void)
-{
-        return spi_register_driver(&r9701_driver);
-}
-module_init(r9701_init);
-
-static __exit void r9701_exit(void)
-{
-        spi_unregister_driver(&r9701_driver);
-}
-module_exit(r9701_exit);
+module_spi_driver(r9701_driver);
 
 MODULE_DESCRIPTION("r9701 spi RTC driver");
 MODULE_AUTHOR("Magnus Damm <damm@opensource.se>");
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index ce2ca8523ddd..77074ccd2850 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -235,18 +235,7 @@ static struct spi_driver rs5c348_driver = {
         .remove = __devexit_p(rs5c348_remove),
 };
 
-static __init int rs5c348_init(void)
-{
-        return spi_register_driver(&rs5c348_driver);
-}
-
-static __exit void rs5c348_exit(void)
-{
-        spi_unregister_driver(&rs5c348_driver);
-}
-
-module_init(rs5c348_init);
-module_exit(rs5c348_exit);
+module_spi_driver(rs5c348_driver);
 
 MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
 MODULE_DESCRIPTION("Ricoh RS5C348 RTC driver");
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index d29f5432c6e8..fb4842c3544e 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -689,18 +689,7 @@ static struct i2c_driver rs5c372_driver = {
         .id_table       = rs5c372_id,
 };
 
-static __init int rs5c372_init(void)
-{
-        return i2c_add_driver(&rs5c372_driver);
-}
-
-static __exit void rs5c372_exit(void)
-{
-        i2c_del_driver(&rs5c372_driver);
-}
-
-module_init(rs5c372_init);
-module_exit(rs5c372_exit);
+module_i2c_driver(rs5c372_driver);
 
 MODULE_AUTHOR(
                 "Pavel Mironchik <pmironchik@optifacio.net>, "
diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index ea09ff211dc6..0fbe57b2f6d2 100644
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -436,18 +436,7 @@ static struct i2c_driver rv3029c2_driver = {
         .id_table = rv3029c2_id,
 };
 
-static int __init rv3029c2_init(void)
-{
-        return i2c_add_driver(&rv3029c2_driver);
-}
-
-static void __exit rv3029c2_exit(void)
-{
-        i2c_del_driver(&rv3029c2_driver);
-}
-
-module_init(rv3029c2_init);
-module_exit(rv3029c2_exit);
+module_i2c_driver(rv3029c2_driver);
 
 MODULE_AUTHOR("Gregory Hermant <gregory.hermant@calao-systems.com>");
 MODULE_DESCRIPTION("Micro Crystal RV3029C2 RTC driver");
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index fde172fb2abe..0de902dc1cd5 100644
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -644,19 +644,8 @@ static struct i2c_driver rx8025_driver = {
         .id_table       = rx8025_id,
 };
 
-static int __init rx8025_init(void)
-{
-        return i2c_add_driver(&rx8025_driver);
-}
-
-static void __exit rx8025_exit(void)
-{
-        i2c_del_driver(&rx8025_driver);
-}
+module_i2c_driver(rx8025_driver);
 
 MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");
 MODULE_DESCRIPTION("RX-8025 SA/NB RTC driver");
 MODULE_LICENSE("GPL");
-
-module_init(rx8025_init);
-module_exit(rx8025_exit);
diff --git a/drivers/rtc/rtc-rx8581.c b/drivers/rtc/rtc-rx8581.c
index 600b890a3c15..d84825124a7a 100644
--- a/drivers/rtc/rtc-rx8581.c
+++ b/drivers/rtc/rtc-rx8581.c
@@ -276,20 +276,9 @@ static struct i2c_driver rx8581_driver = {
         .id_table       = rx8581_id,
 };
 
-static int __init rx8581_init(void)
-{
-        return i2c_add_driver(&rx8581_driver);
-}
-
-static void __exit rx8581_exit(void)
-{
-        i2c_del_driver(&rx8581_driver);
-}
+module_i2c_driver(rx8581_driver);
 
 MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>");
 MODULE_DESCRIPTION("Epson RX-8581 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(rx8581_init);
-module_exit(rx8581_exit);
diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c
index f789e002c9b0..c9562ceedef3 100644
--- a/drivers/rtc/rtc-s35390a.c
+++ b/drivers/rtc/rtc-s35390a.c
@@ -304,19 +304,8 @@ static struct i2c_driver s35390a_driver = {
         .id_table       = s35390a_id,
 };
 
-static int __init s35390a_rtc_init(void)
-{
-        return i2c_add_driver(&s35390a_driver);
-}
-
-static void __exit s35390a_rtc_exit(void)
-{
-        i2c_del_driver(&s35390a_driver);
-}
+module_i2c_driver(s35390a_driver);
 
 MODULE_AUTHOR("Byron Bradley <byron.bbradley@gmail.com>");
 MODULE_DESCRIPTION("S35390A RTC driver");
 MODULE_LICENSE("GPL");
-
-module_init(s35390a_rtc_init);
-module_exit(s35390a_rtc_exit);
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index aef40bd2957b..c543f6f1eec2 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -543,14 +543,14 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
         s3c_rtc_setfreq(&pdev->dev, 1);
 
         ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
-                          IRQF_DISABLED,  "s3c2410-rtc alarm", rtc);
+                          0,  "s3c2410-rtc alarm", rtc);
         if (ret) {
                 dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
                 goto err_alarm_irq;
         }
 
         ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
-                          IRQF_DISABLED,  "s3c2410-rtc tick", rtc);
+                          0,  "s3c2410-rtc tick", rtc);
         if (ret) {
                 dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);
                 free_irq(s3c_rtc_alarmno, rtc);
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index cb9a585312cc..fb758db9d0f4 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -160,14 +160,13 @@ static int sa1100_rtc_open(struct device *dev)
         struct platform_device *plat_dev = to_platform_device(dev);
         struct rtc_device *rtc = platform_get_drvdata(plat_dev);
 
-        ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,
-                "rtc 1Hz", dev);
+        ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev);
         if (ret) {
                 dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
                 goto fail_ui;
         }
-        ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED,
-                "rtc Alrm", dev);
+        ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
+                          "rtc Alrm", dev);
         if (ret) {
                 dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
                 goto fail_ai;
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 6ac55fd48413..e55a7635ae5f 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -666,7 +666,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
         if (rtc->carry_irq <= 0) {
                 /* register shared periodic/carry/alarm irq */
                 ret = request_irq(rtc->periodic_irq, sh_rtc_shared,
-                                  IRQF_DISABLED, "sh-rtc", rtc);
+                                  0, "sh-rtc", rtc);
                 if (unlikely(ret)) {
                         dev_err(&pdev->dev,
                                 "request IRQ failed with %d, IRQ %d\n", ret,
@@ -676,7 +676,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
         } else {
                 /* register periodic/carry/alarm irqs */
                 ret = request_irq(rtc->periodic_irq, sh_rtc_periodic,
-                                  IRQF_DISABLED, "sh-rtc period", rtc);
+                                  0, "sh-rtc period", rtc);
                 if (unlikely(ret)) {
                         dev_err(&pdev->dev,
                                 "request period IRQ failed with %d, IRQ %d\n",
@@ -685,7 +685,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
                 }
 
                 ret = request_irq(rtc->carry_irq, sh_rtc_interrupt,
-                                  IRQF_DISABLED, "sh-rtc carry", rtc);
+                                  0, "sh-rtc carry", rtc);
                 if (unlikely(ret)) {
                         dev_err(&pdev->dev,
                                 "request carry IRQ failed with %d, IRQ %d\n",
@@ -695,7 +695,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
                 }
 
                 ret = request_irq(rtc->alarm_irq, sh_rtc_alarm,
-                                  IRQF_DISABLED, "sh-rtc alarm", rtc);
+                                  0, "sh-rtc alarm", rtc);
                 if (unlikely(ret)) {
                         dev_err(&pdev->dev,
                                 "request alarm IRQ failed with %d, IRQ %d\n",
diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index 19a28a671a8e..e38da0dc4187 100644
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -77,9 +77,11 @@
 #define STATUS_FAIL             (LOST_WR_TIME | LOST_WR_DATE)
 
 struct spear_rtc_config {
+        struct rtc_device *rtc;
         struct clk *clk;
         spinlock_t lock;
         void __iomem *ioaddr;
+        unsigned int irq_wake;
 };
 
 static inline void spear_rtc_clear_interrupt(struct spear_rtc_config *config)
@@ -149,8 +151,7 @@ static void rtc_wait_not_busy(struct spear_rtc_config *config)
 
 static irqreturn_t spear_rtc_irq(int irq, void *dev_id)
 {
-        struct rtc_device *rtc = (struct rtc_device *)dev_id;
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = dev_id;
         unsigned long flags, events = 0;
         unsigned int irq_data;
 
@@ -161,7 +162,7 @@ static irqreturn_t spear_rtc_irq(int irq, void *dev_id)
         if ((irq_data & RTC_INT_MASK)) {
                 spear_rtc_clear_interrupt(config);
                 events = RTC_IRQF | RTC_AF;
-                rtc_update_irq(rtc, 1, events);
+                rtc_update_irq(config->rtc, 1, events);
                 return IRQ_HANDLED;
         } else
                 return IRQ_NONE;
@@ -203,9 +204,7 @@ static void bcd2tm(struct rtc_time *tm)
  */
 static int spear_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = dev_get_drvdata(dev);
         unsigned int time, date;
 
         /* we don't report wday/yday/isdst ... */
@@ -234,9 +233,7 @@ static int spear_rtc_read_time(struct device *dev, struct rtc_time *tm)
  */
 static int spear_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = dev_get_drvdata(dev);
         unsigned int time, date, err = 0;
 
         if (tm2bcd(tm) < 0)
@@ -266,9 +263,7 @@ static int spear_rtc_set_time(struct device *dev, struct rtc_time *tm)
  */
 static int spear_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = dev_get_drvdata(dev);
         unsigned int time, date;
 
         rtc_wait_not_busy(config);
@@ -298,9 +293,7 @@ static int spear_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
  */
 static int spear_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = dev_get_drvdata(dev);
         unsigned int time, date, err = 0;
 
         if (tm2bcd(&alm->time) < 0)
@@ -326,17 +319,42 @@ static int spear_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 
         return 0;
 }
+
+static int spear_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct spear_rtc_config *config = dev_get_drvdata(dev);
+        int ret = 0;
+
+        spear_rtc_clear_interrupt(config);
+
+        switch (enabled) {
+        case 0:
+                /* alarm off */
+                spear_rtc_disable_interrupt(config);
+                break;
+        case 1:
+                /* alarm on */
+                spear_rtc_enable_interrupt(config);
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        return ret;
+}
+
 static struct rtc_class_ops spear_rtc_ops = {
         .read_time = spear_rtc_read_time,
         .set_time = spear_rtc_set_time,
         .read_alarm = spear_rtc_read_alarm,
         .set_alarm = spear_rtc_set_alarm,
+        .alarm_irq_enable = spear_alarm_irq_enable,
 };
 
 static int __devinit spear_rtc_probe(struct platform_device *pdev)
 {
         struct resource *res;
-        struct rtc_device *rtc;
         struct spear_rtc_config *config;
         unsigned int status = 0;
         int irq;
@@ -376,19 +394,17 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev)
         }
 
         spin_lock_init(&config->lock);
+        platform_set_drvdata(pdev, config);
 
-        rtc = rtc_device_register(pdev->name, &pdev->dev, &spear_rtc_ops,
-                        THIS_MODULE);
-        if (IS_ERR(rtc)) {
+        config->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                        &spear_rtc_ops, THIS_MODULE);
+        if (IS_ERR(config->rtc)) {
                 dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
-                                PTR_ERR(rtc));
-                status = PTR_ERR(rtc);
+                                PTR_ERR(config->rtc));
+                status = PTR_ERR(config->rtc);
                 goto err_iounmap;
         }
 
-        platform_set_drvdata(pdev, rtc);
-        dev_set_drvdata(&rtc->dev, config);
-
         /* alarm irqs */
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
@@ -397,7 +413,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev)
                 goto err_clear_platdata;
         }
 
-        status = request_irq(irq, spear_rtc_irq, 0, pdev->name, rtc);
+        status = request_irq(irq, spear_rtc_irq, 0, pdev->name, config);
         if (status) {
                 dev_err(&pdev->dev, "Alarm interrupt IRQ%d already \
                                 claimed\n", irq);
@@ -411,8 +427,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev)
 
 err_clear_platdata:
         platform_set_drvdata(pdev, NULL);
-        dev_set_drvdata(&rtc->dev, NULL);
-        rtc_device_unregister(rtc);
+        rtc_device_unregister(config->rtc);
 err_iounmap:
         iounmap(config->ioaddr);
 err_disable_clock:
@@ -429,8 +444,7 @@ err_release_region:
 
 static int __devexit spear_rtc_remove(struct platform_device *pdev)
 {
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = platform_get_drvdata(pdev);
         int irq;
         struct resource *res;
 
@@ -448,8 +462,7 @@ static int __devexit spear_rtc_remove(struct platform_device *pdev)
         if (res)
                 release_mem_region(res->start, resource_size(res));
         platform_set_drvdata(pdev, NULL);
-        dev_set_drvdata(&rtc->dev, NULL);
-        rtc_device_unregister(rtc);
+        rtc_device_unregister(config->rtc);
 
         return 0;
 }
@@ -458,14 +471,14 @@ static int __devexit spear_rtc_remove(struct platform_device *pdev)
 
 static int spear_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = platform_get_drvdata(pdev);
         int irq;
 
         irq = platform_get_irq(pdev, 0);
-        if (device_may_wakeup(&pdev->dev))
-                enable_irq_wake(irq);
-        else {
+        if (device_may_wakeup(&pdev->dev)) {
+                if (!enable_irq_wake(irq))
+                        config->irq_wake = 1;
+        } else {
                 spear_rtc_disable_interrupt(config);
                 clk_disable(config->clk);
         }
@@ -475,15 +488,17 @@ static int spear_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 
 static int spear_rtc_resume(struct platform_device *pdev)
 {
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = platform_get_drvdata(pdev);
         int irq;
 
         irq = platform_get_irq(pdev, 0);
 
-        if (device_may_wakeup(&pdev->dev))
-                disable_irq_wake(irq);
-        else {
+        if (device_may_wakeup(&pdev->dev)) {
+                if (config->irq_wake) {
+                        disable_irq_wake(irq);
+                        config->irq_wake = 0;
+                }
+        } else {
                 clk_enable(config->clk);
                 spear_rtc_enable_interrupt(config);
         }
@@ -498,8 +513,7 @@ static int spear_rtc_resume(struct platform_device *pdev)
 
 static void spear_rtc_shutdown(struct platform_device *pdev)
 {
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        struct spear_rtc_config *config = dev_get_drvdata(&rtc->dev);
+        struct spear_rtc_config *config = platform_get_drvdata(pdev);
 
         spear_rtc_disable_interrupt(config);
         clk_disable(config->clk);
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index 7621116bd20d..279f5cfa691a 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -329,7 +329,7 @@ static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev)
                 writeb(0, ioaddr + RTC_INTERRUPTS);
                 if (devm_request_irq(&pdev->dev, pdata->irq,
                                 stk17ta8_rtc_interrupt,
-                                IRQF_DISABLED | IRQF_SHARED,
+                                IRQF_SHARED,
                                 pdev->name, pdev) < 0) {
                         dev_warn(&pdev->dev, "interrupt not available.\n");
                         pdata->irq = 0;
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index d43b4f6eb4e4..4c2c6df2a9ef 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -176,6 +176,10 @@ static int set_rtc_irq_bit(unsigned char bit)
         unsigned char val;
         int ret;
 
+        /* if the bit is set, return from here */
+        if (rtc_irq_bits & bit)
+                return 0;
+
         val = rtc_irq_bits | bit;
         val &= ~BIT_RTC_INTERRUPTS_REG_EVERY_M;
         ret = twl_rtc_write_u8(val, REG_RTC_INTERRUPTS_REG);
@@ -193,6 +197,10 @@ static int mask_rtc_irq_bit(unsigned char bit)
         unsigned char val;
         int ret;
 
+        /* if the bit is clear, return from here */
+        if (!(rtc_irq_bits & bit))
+                return 0;
+
         val = rtc_irq_bits & ~bit;
         ret = twl_rtc_write_u8(val, REG_RTC_INTERRUPTS_REG);
         if (ret == 0)
@@ -357,7 +365,7 @@ out:
 
 static irqreturn_t twl_rtc_interrupt(int irq, void *rtc)
 {
-        unsigned long events = 0;
+        unsigned long events;
         int ret = IRQ_NONE;
         int res;
         u8 rd_reg;
@@ -372,11 +380,11 @@ static irqreturn_t twl_rtc_interrupt(int irq, void *rtc)
          * by reading RTS_INTERRUPTS_REGISTER[IT_TIMER,IT_ALARM]
          */
         if (rd_reg & BIT_RTC_STATUS_REG_ALARM_M)
-                events |= RTC_IRQF | RTC_AF;
+                events = RTC_IRQF | RTC_AF;
         else
-                events |= RTC_IRQF | RTC_UF;
+                events = RTC_IRQF | RTC_PF;
 
-        res = twl_rtc_write_u8(rd_reg | BIT_RTC_STATUS_REG_ALARM_M,
+        res = twl_rtc_write_u8(BIT_RTC_STATUS_REG_ALARM_M,
                                    REG_RTC_STATUS_REG);
         if (res)
                 goto out;
@@ -449,19 +457,11 @@ static int __devinit twl_rtc_probe(struct platform_device *pdev)
                         REG_INT_MSK_STS_A);
         }
 
-        /* Check RTC module status, Enable if it is off */
-        ret = twl_rtc_read_u8(&rd_reg, REG_RTC_CTRL_REG);
+        dev_info(&pdev->dev, "Enabling TWL-RTC\n");
+        ret = twl_rtc_write_u8(BIT_RTC_CTRL_REG_STOP_RTC_M, REG_RTC_CTRL_REG);
         if (ret < 0)
                 goto out1;
 
-        if (!(rd_reg & BIT_RTC_CTRL_REG_STOP_RTC_M)) {
-                dev_info(&pdev->dev, "Enabling TWL-RTC.\n");
-                rd_reg = BIT_RTC_CTRL_REG_STOP_RTC_M;
-                ret = twl_rtc_write_u8(rd_reg, REG_RTC_CTRL_REG);
-                if (ret < 0)
-                        goto out1;
-        }
-
         /* init cached IRQ enable bits */
         ret = twl_rtc_read_u8(&rtc_irq_bits, REG_RTC_INTERRUPTS_REG);
         if (ret < 0)
diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index aac0ffed4345..a12bfac49d36 100644
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -266,7 +266,7 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
         spin_lock_init(&pdata->lock);
         tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP);
         if (devm_request_irq(&pdev->dev, irq, tx4939_rtc_interrupt,
-                             IRQF_DISABLED, pdev->name, &pdev->dev) < 0)
+                             0, pdev->name, &pdev->dev) < 0)
                 return -EBUSY;
         rtc = rtc_device_register(pdev->name, &pdev->dev,
                                   &tx4939_rtc_ops, THIS_MODULE);
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index fcbfdda2993b..5f60a7c6a155 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -333,7 +333,7 @@ static int __devinit rtc_probe(struct platform_device *pdev)
                 goto err_device_unregister;
         }
 
-        retval = request_irq(aie_irq, elapsedtime_interrupt, IRQF_DISABLED,
+        retval = request_irq(aie_irq, elapsedtime_interrupt, 0,
                              "elapsed_time", pdev);
         if (retval < 0)
                 goto err_device_unregister;
@@ -342,7 +342,7 @@ static int __devinit rtc_probe(struct platform_device *pdev)
         if (pie_irq <= 0)
                 goto err_free_irq;
 
-        retval = request_irq(pie_irq, rtclong1_interrupt, IRQF_DISABLED,
+        retval = request_irq(pie_irq, rtclong1_interrupt, 0,
                              "rtclong1", pdev);
         if (retval < 0)
                 goto err_free_irq;
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 8c051d3179db..403b3d41d101 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -623,15 +623,7 @@ static struct i2c_driver x1205_driver = {
         .id_table       = x1205_id,
 };
 
-static int __init x1205_init(void)
-{
-        return i2c_add_driver(&x1205_driver);
-}
-
-static void __exit x1205_exit(void)
-{
-        i2c_del_driver(&x1205_driver);
-}
+module_i2c_driver(x1205_driver);
 
 MODULE_AUTHOR(
         "Karen Spearel <kas111 at gmail dot com>, "
@@ -639,6 +631,3 @@ MODULE_AUTHOR(
 MODULE_DESCRIPTION("Xicor/Intersil X1205 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(x1205_init);
-module_exit(x1205_exit);
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 0b54a91f8dcd..168525a9c292 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -441,9 +441,8 @@ static int sclp_mem_notifier(struct notifier_block *nb,
         start = arg->start_pfn << PAGE_SHIFT;
         size = arg->nr_pages << PAGE_SHIFT;
         mutex_lock(&sclp_mem_mutex);
-        for (id = 0; id <= sclp_max_storage_id; id++)
-                if (!test_bit(id, sclp_storage_ids))
-                        sclp_attach_storage(id);
+        for_each_clear_bit(id, sclp_storage_ids, sclp_max_storage_id + 1)
+                sclp_attach_storage(id);
         switch (action) {
         case MEM_ONLINE:
         case MEM_GOING_OFFLINE:
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index e4ade550cfe5..4fe52f6b0034 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -4159,7 +4159,7 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work)
                 argv[0] = RadioPowerPath;
                 argv[2] = NULL;
 
-                call_usermodehelper(RadioPowerPath, argv, envp, 1);
+                call_usermodehelper(RadioPowerPath, argv, envp, UMH_WAIT_PROC);
         }
 }
 
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index a7fa9aad6f2d..f026b7171f62 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -208,7 +208,7 @@ static void dm_check_ac_dc_power(struct net_device *dev)
 
         if (priv->rtllib->state != RTLLIB_LINKED)
                 return;
-        call_usermodehelper(ac_dc_check_script_path, argv, envp, 1);
+        call_usermodehelper(ac_dc_check_script_path, argv, envp, UMH_WAIT_PROC);
 
         return;
 };
@@ -2296,7 +2296,7 @@ void dm_CheckRfCtrlGPIO(void *data)
 
                 argv[0] = RadioPowerPath;
                 argv[2] = NULL;
-                call_usermodehelper(RadioPowerPath, argv, envp, 1);
+                call_usermodehelper(RadioPowerPath, argv, envp, UMH_WAIT_PROC);
         }
 }
 
diff --git a/drivers/staging/telephony/ixj.c b/drivers/staging/telephony/ixj.c
index d5f923bcdffe..f96027921f60 100644
--- a/drivers/staging/telephony/ixj.c
+++ b/drivers/staging/telephony/ixj.c
@@ -5927,7 +5927,8 @@ static void add_caps(IXJ *j)
         j->caplist[j->caps].cap = PHONE_VENDOR_QUICKNET;
         strcpy(j->caplist[j->caps].desc, "Quicknet Technologies, Inc. (www.quicknet.net)");
         j->caplist[j->caps].captype = vendor;
-        j->caplist[j->caps].handle = j->caps++;
+        j->caplist[j->caps].handle = j->caps;
+        j->caps++;
         j->caplist[j->caps].captype = device;
         switch (j->cardtype) {
         case QTI_PHONEJACK:
@@ -5947,11 +5948,13 @@ static void add_caps(IXJ *j)
                 break;
         }
         j->caplist[j->caps].cap = j->cardtype;
-        j->caplist[j->caps].handle = j->caps++;
+        j->caplist[j->caps].handle = j->caps;
+        j->caps++;
         strcpy(j->caplist[j->caps].desc, "POTS");
         j->caplist[j->caps].captype = port;
         j->caplist[j->caps].cap = pots;
-        j->caplist[j->caps].handle = j->caps++;
+        j->caplist[j->caps].handle = j->caps;
+        j->caps++;
 
         /* add devices that can do speaker/mic */
         switch (j->cardtype) {
@@ -5962,7 +5965,8 @@ static void add_caps(IXJ *j)
                 strcpy(j->caplist[j->caps].desc, "SPEAKER");
                 j->caplist[j->caps].captype = port;
                 j->caplist[j->caps].cap = speaker;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
         default:
                 break;
         }
@@ -5973,7 +5977,8 @@ static void add_caps(IXJ *j)
                 strcpy(j->caplist[j->caps].desc, "HANDSET");
                 j->caplist[j->caps].captype = port;
                 j->caplist[j->caps].cap = handset;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
                 break;
         default:
                 break;
@@ -5985,7 +5990,8 @@ static void add_caps(IXJ *j)
                 strcpy(j->caplist[j->caps].desc, "PSTN");
                 j->caplist[j->caps].captype = port;
                 j->caplist[j->caps].cap = pstn;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
                 break;
         default:
                 break;
@@ -5995,50 +6001,59 @@ static void add_caps(IXJ *j)
         strcpy(j->caplist[j->caps].desc, "ULAW");
         j->caplist[j->caps].captype = codec;
         j->caplist[j->caps].cap = ULAW;
-        j->caplist[j->caps].handle = j->caps++;
+        j->caplist[j->caps].handle = j->caps;
+        j->caps++;
 
         strcpy(j->caplist[j->caps].desc, "LINEAR 16 bit");
         j->caplist[j->caps].captype = codec;
         j->caplist[j->caps].cap = LINEAR16;
-        j->caplist[j->caps].handle = j->caps++;
+        j->caplist[j->caps].handle = j->caps;
+        j->caps++;
 
         strcpy(j->caplist[j->caps].desc, "LINEAR 8 bit");
         j->caplist[j->caps].captype = codec;
         j->caplist[j->caps].cap = LINEAR8;
-        j->caplist[j->caps].handle = j->caps++;
+        j->caplist[j->caps].handle = j->caps;
+        j->caps++;
 
         strcpy(j->caplist[j->caps].desc, "Windows Sound System");
         j->caplist[j->caps].captype = codec;
         j->caplist[j->caps].cap = WSS;
-        j->caplist[j->caps].handle = j->caps++;
+        j->caplist[j->caps].handle = j->caps;
+        j->caps++;
 
         /* software ALAW codec, made from ULAW */
         strcpy(j->caplist[j->caps].desc, "ALAW");
         j->caplist[j->caps].captype = codec;
         j->caplist[j->caps].cap = ALAW;
-        j->caplist[j->caps].handle = j->caps++;
+        j->caplist[j->caps].handle = j->caps;
+        j->caps++;
 
         /* version 12 of the 8020 does the following codecs in a broken way */
         if (j->dsp.low != 0x20 || j->ver.low != 0x12) {
                 strcpy(j->caplist[j->caps].desc, "G.723.1 6.3kbps");
                 j->caplist[j->caps].captype = codec;
                 j->caplist[j->caps].cap = G723_63;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
 
                 strcpy(j->caplist[j->caps].desc, "G.723.1 5.3kbps");
                 j->caplist[j->caps].captype = codec;
                 j->caplist[j->caps].cap = G723_53;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
 
                 strcpy(j->caplist[j->caps].desc, "TrueSpeech 4.8kbps");
                 j->caplist[j->caps].captype = codec;
                 j->caplist[j->caps].cap = TS48;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
 
                 strcpy(j->caplist[j->caps].desc, "TrueSpeech 4.1kbps");
                 j->caplist[j->caps].captype = codec;
                 j->caplist[j->caps].cap = TS41;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
         }
 
         /* 8020 chips can do TS8.5 native, and 8021/8022 can load it */
@@ -6046,7 +6061,8 @@ static void add_caps(IXJ *j)
                 strcpy(j->caplist[j->caps].desc, "TrueSpeech 8.5kbps");
                 j->caplist[j->caps].captype = codec;
                 j->caplist[j->caps].cap = TS85;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
         }
 
         /* 8021 chips can do G728 */
@@ -6054,7 +6070,8 @@ static void add_caps(IXJ *j)
                 strcpy(j->caplist[j->caps].desc, "G.728 16kbps");
                 j->caplist[j->caps].captype = codec;
                 j->caplist[j->caps].cap = G728;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
         }
 
         /* 8021/8022 chips can do G729 if loaded */
@@ -6062,13 +6079,15 @@ static void add_caps(IXJ *j)
                 strcpy(j->caplist[j->caps].desc, "G.729A 8kbps");
                 j->caplist[j->caps].captype = codec;
                 j->caplist[j->caps].cap = G729;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
         }
         if (j->dsp.low != 0x20 && j->flags.g729_loaded) {
                 strcpy(j->caplist[j->caps].desc, "G.729B 8kbps");
                 j->caplist[j->caps].captype = codec;
                 j->caplist[j->caps].cap = G729B;
-                j->caplist[j->caps].handle = j->caps++;
+                j->caplist[j->caps].handle = j->caps;
+                j->caps++;
         }
 }
 
diff --git a/drivers/uwb/allocator.c b/drivers/uwb/allocator.c
index e45e673b8770..6e3e713f0ef7 100644
--- a/drivers/uwb/allocator.c
+++ b/drivers/uwb/allocator.c
@@ -334,10 +334,8 @@ int uwb_rsv_find_best_allocation(struct uwb_rsv *rsv, struct uwb_mas_bm *availab
 
 
         /* fill the not available vector from the available bm */
-        for (bit_index = 0; bit_index < UWB_NUM_MAS; bit_index++) {
-                if (!test_bit(bit_index, available->bm))
-                        ai->bm[bit_index] = UWB_RSV_MAS_NOT_AVAIL;
-        }
+        for_each_clear_bit(bit_index, available->bm, UWB_NUM_MAS)
+                ai->bm[bit_index] = UWB_RSV_MAS_NOT_AVAIL;
 
         if (ai->max_interval == 1) {
                 get_row_descriptors(ai);
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index a1376dc73d71..915943af3f21 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -187,7 +187,8 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        data = kzalloc(sizeof(struct pm860x_backlight_data), GFP_KERNEL);
+        data = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_backlight_data),
+                            GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
         strncpy(name, res->name, MFD_NAME_SIZE);
@@ -200,7 +201,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         data->port = pdata->flags;
         if (data->port < 0) {
                 dev_err(&pdev->dev, "wrong platform data is assigned");
-                kfree(data);
                 return -EINVAL;
         }
 
@@ -211,7 +211,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
                                         &pm860x_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
-                kfree(data);
                 return PTR_ERR(bl);
         }
         bl->props.brightness = MAX_BRIGHTNESS;
@@ -247,17 +246,14 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
         return 0;
 out:
         backlight_device_unregister(bl);
-        kfree(data);
         return ret;
 }
 
 static int pm860x_backlight_remove(struct platform_device *pdev)
 {
         struct backlight_device *bl = platform_get_drvdata(pdev);
-        struct pm860x_backlight_data *data = bl_get_data(bl);
 
         backlight_device_unregister(bl);
-        kfree(data);
         return 0;
 }
 
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 681b36929fe4..7ed9991fa747 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -334,6 +334,27 @@ config BACKLIGHT_AAT2870
           If you have a AnalogicTech AAT2870 say Y to enable the
           backlight driver.
 
+config BACKLIGHT_LP855X
+        tristate "Backlight driver for TI LP855X"
+        depends on BACKLIGHT_CLASS_DEVICE && I2C
+        help
+          This supports TI LP8550, LP8551, LP8552, LP8553 and LP8556
+          backlight driver.
+
+config BACKLIGHT_OT200
+        tristate "Backlight driver for ot200 visualisation device"
+        depends on BACKLIGHT_CLASS_DEVICE && CS5535_MFGPT && GPIO_CS5535
+        help
+          To compile this driver as a module, choose M here: the module will be
+          called ot200_bl.
+
+config BACKLIGHT_PANDORA
+        tristate "Backlight driver for Pandora console"
+        depends on TWL4030_CORE
+        help
+          If you have a Pandora console, say Y to enable the
+          backlight driver.
+
 endif # BACKLIGHT_CLASS_DEVICE
 
 endif # BACKLIGHT_LCD_SUPPORT
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index af5cf654ec7c..8071eb656147 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -22,7 +22,9 @@ obj-$(CONFIG_BACKLIGHT_GENERIC)	+= generic_bl.o
 obj-$(CONFIG_BACKLIGHT_HP700)   += jornada720_bl.o
 obj-$(CONFIG_BACKLIGHT_HP680)   += hp680_bl.o
 obj-$(CONFIG_BACKLIGHT_LOCOMO)  += locomolcd.o
+obj-$(CONFIG_BACKLIGHT_LP855X)  += lp855x_bl.o
 obj-$(CONFIG_BACKLIGHT_OMAP1)   += omap1_bl.o
+obj-$(CONFIG_BACKLIGHT_PANDORA) += pandora_bl.o
 obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
@@ -38,4 +40,4 @@ obj-$(CONFIG_BACKLIGHT_ADP8870)	+= adp8870_bl.o
 obj-$(CONFIG_BACKLIGHT_88PM860X) += 88pm860x_bl.o
 obj-$(CONFIG_BACKLIGHT_PCF50633)        += pcf50633-backlight.o
 obj-$(CONFIG_BACKLIGHT_AAT2870) += aat2870_bl.o
-
+obj-$(CONFIG_BACKLIGHT_OT200) += ot200_bl.o
diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c
index 331f1ef1dad5..7ff752288b92 100644
--- a/drivers/video/backlight/aat2870_bl.c
+++ b/drivers/video/backlight/aat2870_bl.c
@@ -145,7 +145,9 @@ static int aat2870_bl_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        aat2870_bl = kzalloc(sizeof(struct aat2870_bl_driver_data), GFP_KERNEL);
+        aat2870_bl = devm_kzalloc(&pdev->dev,
+                                  sizeof(struct aat2870_bl_driver_data),
+                                  GFP_KERNEL);
         if (!aat2870_bl) {
                 dev_err(&pdev->dev,
                         "Failed to allocate memory for aat2870 backlight\n");
@@ -162,7 +164,7 @@ static int aat2870_bl_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev,
                         "Failed allocate memory for backlight device\n");
                 ret = PTR_ERR(bd);
-                goto out_kfree;
+                goto out;
         }
 
         aat2870_bl->pdev = pdev;
@@ -199,8 +201,6 @@ static int aat2870_bl_probe(struct platform_device *pdev)
 
 out_bl_dev_unregister:
         backlight_device_unregister(bd);
-out_kfree:
-        kfree(aat2870_bl);
 out:
         return ret;
 }
@@ -215,7 +215,6 @@ static int aat2870_bl_remove(struct platform_device *pdev)
         backlight_update_status(bd);
 
         backlight_device_unregister(bd);
-        kfree(aat2870_bl);
 
         return 0;
 }
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index 2e630bf1164c..4911ea7989c8 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -289,7 +289,7 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
         struct adp5520_bl *data;
         int ret = 0;
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
 
@@ -298,7 +298,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
 
         if (data->pdata  == NULL) {
                 dev_err(&pdev->dev, "missing platform data\n");
-                kfree(data);
                 return -ENODEV;
         }
 
@@ -314,7 +313,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
                                        &adp5520_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
-                kfree(data);
                 return PTR_ERR(bl);
         }
 
@@ -326,7 +324,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
         if (ret) {
                 dev_err(&pdev->dev, "failed to register sysfs\n");
                 backlight_device_unregister(bl);
-                kfree(data);
         }
 
         platform_set_drvdata(pdev, bl);
@@ -348,7 +345,6 @@ static int __devexit adp5520_bl_remove(struct platform_device *pdev)
                                 &adp5520_bl_attr_group);
 
         backlight_device_unregister(bl);
-        kfree(data);
 
         return 0;
 }
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 378276c9d3cf..550dbf0bb896 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -819,17 +819,7 @@ static struct i2c_driver adp8860_driver = {
         .id_table = adp8860_id,
 };
 
-static int __init adp8860_init(void)
-{
-        return i2c_add_driver(&adp8860_driver);
-}
-module_init(adp8860_init);
-
-static void __exit adp8860_exit(void)
-{
-        i2c_del_driver(&adp8860_driver);
-}
-module_exit(adp8860_exit);
+module_i2c_driver(adp8860_driver);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 6735059376d6..9be58c6f18f1 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -991,17 +991,7 @@ static struct i2c_driver adp8870_driver = {
         .id_table = adp8870_id,
 };
 
-static int __init adp8870_init(void)
-{
-        return i2c_add_driver(&adp8870_driver);
-}
-module_init(adp8870_init);
-
-static void __exit adp8870_exit(void)
-{
-        i2c_del_driver(&adp8870_driver);
-}
-module_exit(adp8870_exit);
+module_i2c_driver(adp8870_driver);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c
index 7838a23fbdd1..7bdadc790117 100644
--- a/drivers/video/backlight/ams369fg06.c
+++ b/drivers/video/backlight/ams369fg06.c
@@ -629,18 +629,7 @@ static struct spi_driver ams369fg06_driver = {
         .resume         = ams369fg06_resume,
 };
 
-static int __init ams369fg06_init(void)
-{
-        return spi_register_driver(&ams369fg06_driver);
-}
-
-static void __exit ams369fg06_exit(void)
-{
-        spi_unregister_driver(&ams369fg06_driver);
-}
-
-module_init(ams369fg06_init);
-module_exit(ams369fg06_exit);
+module_spi_driver(ams369fg06_driver);
 
 MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>");
 MODULE_DESCRIPTION("ams369fg06 LCD Driver");
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index c6533bad26f8..6dab13fe562e 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -629,17 +629,7 @@ static struct spi_driver corgi_lcd_driver = {
         .resume         = corgi_lcd_resume,
 };
 
-static int __init corgi_lcd_init(void)
-{
-        return spi_register_driver(&corgi_lcd_driver);
-}
-module_init(corgi_lcd_init);
-
-static void __exit corgi_lcd_exit(void)
-{
-        spi_unregister_driver(&corgi_lcd_driver);
-}
-module_exit(corgi_lcd_exit);
+module_spi_driver(corgi_lcd_driver);
 
 MODULE_DESCRIPTION("LCD and backlight driver for SHARP C7x0/Cxx00");
 MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>");
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
index 6c8c54041fae..22489eb5f3e0 100644
--- a/drivers/video/backlight/cr_bllcd.c
+++ b/drivers/video/backlight/cr_bllcd.c
@@ -212,7 +212,7 @@ static int cr_backlight_probe(struct platform_device *pdev)
                               &gpio_bar);
         gpio_bar &= ~0x3F;
 
-        crp = kzalloc(sizeof(*crp), GFP_KERNEL);
+        crp = devm_kzalloc(&pdev->dev, sizeof(*crp), GFP_KERNEL);
         if (!crp) {
                 lcd_device_unregister(ldp);
                 backlight_device_unregister(bdp);
@@ -243,7 +243,6 @@ static int cr_backlight_remove(struct platform_device *pdev)
         backlight_device_unregister(crp->cr_backlight_device);
         lcd_device_unregister(crp->cr_lcd_device);
         pci_dev_put(lpc_dev);
-        kfree(crp);
 
         return 0;
 }
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index abb4a06268f1..30e19681a30b 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -110,7 +110,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
         struct backlight_properties props;
         int max_brightness;
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
 
@@ -124,7 +124,6 @@ static int da903x_backlight_probe(struct platform_device *pdev)
         default:
                 dev_err(&pdev->dev, "invalid backlight device ID(%d)\n",
                                 pdev->id);
-                kfree(data);
                 return -EINVAL;
         }
 
@@ -143,7 +142,6 @@ static int da903x_backlight_probe(struct platform_device *pdev)
                                        &da903x_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
-                kfree(data);
                 return PTR_ERR(bl);
         }
 
@@ -157,10 +155,8 @@ static int da903x_backlight_probe(struct platform_device *pdev)
 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;
 }
 
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index 27d1d7a29c77..6022b67285ec 100644
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -274,18 +274,7 @@ static struct spi_driver l4f00242t03_driver = {
         .shutdown       = l4f00242t03_shutdown,
 };
 
-static __init int l4f00242t03_init(void)
-{
-        return spi_register_driver(&l4f00242t03_driver);
-}
-
-static __exit void l4f00242t03_exit(void)
-{
-        spi_unregister_driver(&l4f00242t03_driver);
-}
-
-module_init(l4f00242t03_init);
-module_exit(l4f00242t03_exit);
+module_spi_driver(l4f00242t03_driver);
 
 MODULE_AUTHOR("Alberto Panizzo <maramaopercheseimorto@gmail.com>");
 MODULE_DESCRIPTION("EPSON L4F00242T03 LCD");
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index 78dafc0c8fc5..efd352be21ae 100644
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -856,18 +856,7 @@ static struct spi_driver ld9040_driver = {
         .resume         = ld9040_resume,
 };
 
-static int __init ld9040_init(void)
-{
-        return spi_register_driver(&ld9040_driver);
-}
-
-static void __exit ld9040_exit(void)
-{
-        spi_unregister_driver(&ld9040_driver);
-}
-
-module_init(ld9040_init);
-module_exit(ld9040_exit);
+module_spi_driver(ld9040_driver);
 
 MODULE_AUTHOR("Donghwa Lee <dh09.lee@samsung.com>");
 MODULE_DESCRIPTION("ld9040 LCD Driver");
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index 4ec78cfe26ea..4161f9e3982a 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -226,18 +226,7 @@ static struct spi_driver lms283gf05_driver = {
         .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_spi_driver(lms283gf05_driver);
 
 MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
 MODULE_DESCRIPTION("LCD283GF05 LCD");
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
new file mode 100644
index 000000000000..72a0e0c917cf
--- /dev/null
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -0,0 +1,331 @@
+/*
+ * TI LP855x Backlight Driver
+ *
+ *                      Copyright (C) 2011 Texas Instruments
+ *
+ * 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/slab.h>
+#include <linux/i2c.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/lp855x.h>
+
+/* Registers */
+#define BRIGHTNESS_CTRL         (0x00)
+#define DEVICE_CTRL             (0x01)
+
+#define BUF_SIZE                20
+#define DEFAULT_BL_NAME         "lcd-backlight"
+#define MAX_BRIGHTNESS          255
+
+struct lp855x {
+        const char *chipname;
+        enum lp855x_chip_id chip_id;
+        struct i2c_client *client;
+        struct backlight_device *bl;
+        struct device *dev;
+        struct mutex xfer_lock;
+        struct lp855x_platform_data *pdata;
+};
+
+static int lp855x_read_byte(struct lp855x *lp, u8 reg, u8 *data)
+{
+        int ret;
+
+        mutex_lock(&lp->xfer_lock);
+        ret = i2c_smbus_read_byte_data(lp->client, reg);
+        if (ret < 0) {
+                mutex_unlock(&lp->xfer_lock);
+                dev_err(lp->dev, "failed to read 0x%.2x\n", reg);
+                return ret;
+        }
+        mutex_unlock(&lp->xfer_lock);
+
+        *data = (u8)ret;
+        return 0;
+}
+
+static int lp855x_write_byte(struct lp855x *lp, u8 reg, u8 data)
+{
+        int ret;
+
+        mutex_lock(&lp->xfer_lock);
+        ret = i2c_smbus_write_byte_data(lp->client, reg, data);
+        mutex_unlock(&lp->xfer_lock);
+
+        return ret;
+}
+
+static bool lp855x_is_valid_rom_area(struct lp855x *lp, u8 addr)
+{
+        u8 start, end;
+
+        switch (lp->chip_id) {
+        case LP8550:
+        case LP8551:
+        case LP8552:
+        case LP8553:
+                start = EEPROM_START;
+                end = EEPROM_END;
+                break;
+        case LP8556:
+                start = EPROM_START;
+                end = EPROM_END;
+                break;
+        default:
+                return false;
+        }
+
+        return (addr >= start && addr <= end);
+}
+
+static int lp855x_init_registers(struct lp855x *lp)
+{
+        u8 val, addr;
+        int i, ret;
+        struct lp855x_platform_data *pd = lp->pdata;
+
+        val = pd->initial_brightness;
+        ret = lp855x_write_byte(lp, BRIGHTNESS_CTRL, val);
+        if (ret)
+                return ret;
+
+        val = pd->device_control;
+        ret = lp855x_write_byte(lp, DEVICE_CTRL, val);
+        if (ret)
+                return ret;
+
+        if (pd->load_new_rom_data && pd->size_program) {
+                for (i = 0; i < pd->size_program; i++) {
+                        addr = pd->rom_data[i].addr;
+                        val = pd->rom_data[i].val;
+                        if (!lp855x_is_valid_rom_area(lp, addr))
+                                continue;
+
+                        ret = lp855x_write_byte(lp, addr, val);
+                        if (ret)
+                                return ret;
+                }
+        }
+
+        return ret;
+}
+
+static int lp855x_bl_update_status(struct backlight_device *bl)
+{
+        struct lp855x *lp = bl_get_data(bl);
+        enum lp855x_brightness_ctrl_mode mode = lp->pdata->mode;
+
+        if (bl->props.state & BL_CORE_SUSPENDED)
+                bl->props.brightness = 0;
+
+        if (mode == PWM_BASED) {
+                struct lp855x_pwm_data *pd = &lp->pdata->pwm_data;
+                int br = bl->props.brightness;
+                int max_br = bl->props.max_brightness;
+
+                if (pd->pwm_set_intensity)
+                        pd->pwm_set_intensity(br, max_br);
+
+        } else if (mode == REGISTER_BASED) {
+                u8 val = bl->props.brightness;
+                lp855x_write_byte(lp, BRIGHTNESS_CTRL, val);
+        }
+
+        return 0;
+}
+
+static int lp855x_bl_get_brightness(struct backlight_device *bl)
+{
+        struct lp855x *lp = bl_get_data(bl);
+        enum lp855x_brightness_ctrl_mode mode = lp->pdata->mode;
+
+        if (mode == PWM_BASED) {
+                struct lp855x_pwm_data *pd = &lp->pdata->pwm_data;
+                int max_br = bl->props.max_brightness;
+
+                if (pd->pwm_get_intensity)
+                        bl->props.brightness = pd->pwm_get_intensity(max_br);
+
+        } else if (mode == REGISTER_BASED) {
+                u8 val = 0;
+
+                lp855x_read_byte(lp, BRIGHTNESS_CTRL, &val);
+                bl->props.brightness = val;
+        }
+
+        return bl->props.brightness;
+}
+
+static const struct backlight_ops lp855x_bl_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
+        .update_status = lp855x_bl_update_status,
+        .get_brightness = lp855x_bl_get_brightness,
+};
+
+static int lp855x_backlight_register(struct lp855x *lp)
+{
+        struct backlight_device *bl;
+        struct backlight_properties props;
+        struct lp855x_platform_data *pdata = lp->pdata;
+        char *name = pdata->name ? : DEFAULT_BL_NAME;
+
+        props.type = BACKLIGHT_PLATFORM;
+        props.max_brightness = MAX_BRIGHTNESS;
+
+        if (pdata->initial_brightness > props.max_brightness)
+                pdata->initial_brightness = props.max_brightness;
+
+        props.brightness = pdata->initial_brightness;
+
+        bl = backlight_device_register(name, lp->dev, lp,
+                                       &lp855x_bl_ops, &props);
+        if (IS_ERR(bl))
+                return PTR_ERR(bl);
+
+        lp->bl = bl;
+
+        return 0;
+}
+
+static void lp855x_backlight_unregister(struct lp855x *lp)
+{
+        if (lp->bl)
+                backlight_device_unregister(lp->bl);
+}
+
+static ssize_t lp855x_get_chip_id(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lp855x *lp = dev_get_drvdata(dev);
+        return scnprintf(buf, BUF_SIZE, "%s\n", lp->chipname);
+}
+
+static ssize_t lp855x_get_bl_ctl_mode(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
+{
+        struct lp855x *lp = dev_get_drvdata(dev);
+        enum lp855x_brightness_ctrl_mode mode = lp->pdata->mode;
+        char *strmode = NULL;
+
+        if (mode == PWM_BASED)
+                strmode = "pwm based";
+        else if (mode == REGISTER_BASED)
+                strmode = "register based";
+
+        return scnprintf(buf, BUF_SIZE, "%s\n", strmode);
+}
+
+static DEVICE_ATTR(chip_id, S_IRUGO, lp855x_get_chip_id, NULL);
+static DEVICE_ATTR(bl_ctl_mode, S_IRUGO, lp855x_get_bl_ctl_mode, NULL);
+
+static struct attribute *lp855x_attributes[] = {
+        &dev_attr_chip_id.attr,
+        &dev_attr_bl_ctl_mode.attr,
+        NULL,
+};
+
+static const struct attribute_group lp855x_attr_group = {
+        .attrs = lp855x_attributes,
+};
+
+static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
+{
+        struct lp855x *lp;
+        struct lp855x_platform_data *pdata = cl->dev.platform_data;
+        enum lp855x_brightness_ctrl_mode mode;
+        int ret;
+
+        if (!pdata) {
+                dev_err(&cl->dev, "no platform data supplied\n");
+                return -EINVAL;
+        }
+
+        if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
+                return -EIO;
+
+        lp = devm_kzalloc(&cl->dev, sizeof(struct lp855x), GFP_KERNEL);
+        if (!lp)
+                return -ENOMEM;
+
+        mode = pdata->mode;
+        lp->client = cl;
+        lp->dev = &cl->dev;
+        lp->pdata = pdata;
+        lp->chipname = id->name;
+        lp->chip_id = id->driver_data;
+        i2c_set_clientdata(cl, lp);
+
+        mutex_init(&lp->xfer_lock);
+
+        ret = lp855x_init_registers(lp);
+        if (ret) {
+                dev_err(lp->dev, "i2c communication err: %d", ret);
+                if (mode == REGISTER_BASED)
+                        goto err_dev;
+        }
+
+        ret = lp855x_backlight_register(lp);
+        if (ret) {
+                dev_err(lp->dev,
+                        "failed to register backlight. err: %d\n", ret);
+                goto err_dev;
+        }
+
+        ret = sysfs_create_group(&lp->dev->kobj, &lp855x_attr_group);
+        if (ret) {
+                dev_err(lp->dev, "failed to register sysfs. err: %d\n", ret);
+                goto err_sysfs;
+        }
+
+        backlight_update_status(lp->bl);
+        return 0;
+
+err_sysfs:
+        lp855x_backlight_unregister(lp);
+err_dev:
+        return ret;
+}
+
+static int __devexit lp855x_remove(struct i2c_client *cl)
+{
+        struct lp855x *lp = i2c_get_clientdata(cl);
+
+        lp->bl->props.brightness = 0;
+        backlight_update_status(lp->bl);
+        sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group);
+        lp855x_backlight_unregister(lp);
+
+        return 0;
+}
+
+static const struct i2c_device_id lp855x_ids[] = {
+        {"lp8550", LP8550},
+        {"lp8551", LP8551},
+        {"lp8552", LP8552},
+        {"lp8553", LP8553},
+        {"lp8556", LP8556},
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, lp855x_ids);
+
+static struct i2c_driver lp855x_driver = {
+        .driver = {
+                   .name = "lp855x",
+                   },
+        .probe = lp855x_probe,
+        .remove = __devexit_p(lp855x_remove),
+        .id_table = lp855x_ids,
+};
+
+module_i2c_driver(lp855x_driver);
+
+MODULE_DESCRIPTION("Texas Instruments LP855x Backlight driver");
+MODULE_AUTHOR("Milo Kim <milo.kim@ti.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c
index cca43c06d3c8..333949ff3265 100644
--- a/drivers/video/backlight/ltv350qv.c
+++ b/drivers/video/backlight/ltv350qv.c
@@ -321,17 +321,7 @@ static struct spi_driver ltv350qv_driver = {
         .resume         = ltv350qv_resume,
 };
 
-static int __init ltv350qv_init(void)
-{
-        return spi_register_driver(&ltv350qv_driver);
-}
-
-static void __exit ltv350qv_exit(void)
-{
-        spi_unregister_driver(&ltv350qv_driver);
-}
-module_init(ltv350qv_init);
-module_exit(ltv350qv_exit);
+module_spi_driver(ltv350qv_driver);
 
 MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
 MODULE_DESCRIPTION("Samsung LTV350QV LCD Driver");
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index c915e3b53886..e833ac72e063 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -129,7 +129,8 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        data = kzalloc(sizeof(struct max8925_backlight_data), GFP_KERNEL);
+        data = devm_kzalloc(&pdev->dev, sizeof(struct max8925_backlight_data),
+                            GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
         strncpy(name, res->name, MAX8925_NAME_SIZE);
@@ -143,7 +144,6 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
                                         &max8925_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
-                kfree(data);
                 return PTR_ERR(bl);
         }
         bl->props.brightness = MAX_BRIGHTNESS;
@@ -165,17 +165,14 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
         return 0;
 out:
         backlight_device_unregister(bl);
-        kfree(data);
         return ret;
 }
 
 static int __devexit max8925_backlight_remove(struct platform_device *pdev)
 {
         struct backlight_device *bl = platform_get_drvdata(pdev);
-        struct max8925_backlight_data *data = bl_get_data(bl);
 
         backlight_device_unregister(bl);
-        kfree(data);
         return 0;
 }
 
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index d8cde277ec83..0175bfb08a1c 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -141,7 +141,8 @@ static int omapbl_probe(struct platform_device *pdev)
         if (!pdata)
                 return -ENXIO;
 
-        bl = kzalloc(sizeof(struct omap_backlight), GFP_KERNEL);
+        bl = devm_kzalloc(&pdev->dev, sizeof(struct omap_backlight),
+                          GFP_KERNEL);
         if (unlikely(!bl))
                 return -ENOMEM;
 
@@ -150,10 +151,8 @@ static int omapbl_probe(struct platform_device *pdev)
         props.max_brightness = OMAPBL_MAX_INTENSITY;
         dev = backlight_device_register("omap-bl", &pdev->dev, bl, &omapbl_ops,
                                         &props);
-        if (IS_ERR(dev)) {
-                kfree(bl);
+        if (IS_ERR(dev))
                 return PTR_ERR(dev);
-        }
 
         bl->powermode = FB_BLANK_POWERDOWN;
         bl->current_intensity = 0;
@@ -177,10 +176,8 @@ static int omapbl_probe(struct platform_device *pdev)
 static int omapbl_remove(struct platform_device *pdev)
 {
         struct backlight_device *dev = platform_get_drvdata(pdev);
-        struct omap_backlight *bl = dev_get_drvdata(&dev->dev);
 
         backlight_device_unregister(dev);
-        kfree(bl);
 
         return 0;
 }
diff --git a/drivers/video/backlight/ot200_bl.c b/drivers/video/backlight/ot200_bl.c
new file mode 100644
index 000000000000..f519d55a294c
--- /dev/null
+++ b/drivers/video/backlight/ot200_bl.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2012 Bachmann electronic GmbH
+ *      Christian Gmeiner <christian.gmeiner@gmail.com>
+ *
+ * Backlight driver for ot200 visualisation device from
+ * Bachmann electronic 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.
+ */
+
+#include <linux/module.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/gpio.h>
+#include <linux/cs5535.h>
+
+static struct cs5535_mfgpt_timer *pwm_timer;
+
+/* this array defines the mapping of brightness in % to pwm frequency */
+static const u8 dim_table[101] = {0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2,
+                                  2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4,
+                                  4, 5, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9,
+                                  10, 10, 11, 11, 12, 12, 13, 14, 15, 15, 16,
+                                  17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28,
+                                  30, 31, 33, 35, 37, 39, 41, 43, 45, 47, 50,
+                                  53, 55, 58, 61, 65, 68, 72, 75, 79, 84, 88,
+                                  93, 97, 103, 108, 114, 120, 126, 133, 140,
+                                  147, 155, 163};
+
+struct ot200_backlight_data {
+        int current_brightness;
+};
+
+#define GPIO_DIMM       27
+#define SCALE           1
+#define CMP1MODE        0x2     /* compare on GE; output high on compare
+                                 * greater than or equal */
+#define PWM_SETUP       (SCALE | CMP1MODE << 6 | MFGPT_SETUP_CNTEN)
+#define MAX_COMP2       163
+
+static int ot200_backlight_update_status(struct backlight_device *bl)
+{
+        struct ot200_backlight_data *data = bl_get_data(bl);
+        int brightness = bl->props.brightness;
+
+        if (bl->props.state & BL_CORE_FBBLANK)
+                brightness = 0;
+
+        /* enable or disable PWM timer */
+        if (brightness == 0)
+                cs5535_mfgpt_write(pwm_timer, MFGPT_REG_SETUP, 0);
+        else if (data->current_brightness == 0) {
+                cs5535_mfgpt_write(pwm_timer, MFGPT_REG_COUNTER, 0);
+                cs5535_mfgpt_write(pwm_timer, MFGPT_REG_SETUP,
+                        MFGPT_SETUP_CNTEN);
+        }
+
+        /* apply new brightness value */
+        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_CMP1,
+                MAX_COMP2 - dim_table[brightness]);
+        data->current_brightness = brightness;
+
+        return 0;
+}
+
+static int ot200_backlight_get_brightness(struct backlight_device *bl)
+{
+        struct ot200_backlight_data *data = bl_get_data(bl);
+        return data->current_brightness;
+}
+
+static const struct backlight_ops ot200_backlight_ops = {
+        .update_status  = ot200_backlight_update_status,
+        .get_brightness = ot200_backlight_get_brightness,
+};
+
+static int ot200_backlight_probe(struct platform_device *pdev)
+{
+        struct backlight_device *bl;
+        struct ot200_backlight_data *data;
+        struct backlight_properties props;
+        int retval = 0;
+
+        /* request gpio */
+        if (gpio_request(GPIO_DIMM, "ot200 backlight dimmer") < 0) {
+                dev_err(&pdev->dev, "failed to request GPIO %d\n", GPIO_DIMM);
+                return -ENODEV;
+        }
+
+        /* request timer */
+        pwm_timer = cs5535_mfgpt_alloc_timer(7, MFGPT_DOMAIN_ANY);
+        if (!pwm_timer) {
+                dev_err(&pdev->dev, "MFGPT 7 not available\n");
+                retval = -ENODEV;
+                goto error_mfgpt_alloc;
+        }
+
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data) {
+                retval = -ENOMEM;
+                goto error_kzalloc;
+        }
+
+        /* setup gpio */
+        cs5535_gpio_set(GPIO_DIMM, GPIO_OUTPUT_ENABLE);
+        cs5535_gpio_set(GPIO_DIMM, GPIO_OUTPUT_AUX1);
+
+        /* setup timer */
+        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_CMP1, 0);
+        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_CMP2, MAX_COMP2);
+        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_SETUP, PWM_SETUP);
+
+        data->current_brightness = 100;
+        props.max_brightness = 100;
+        props.brightness = 100;
+        props.type = BACKLIGHT_RAW;
+
+        bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, data,
+                                        &ot200_backlight_ops, &props);
+        if (IS_ERR(bl)) {
+                dev_err(&pdev->dev, "failed to register backlight\n");
+                retval = PTR_ERR(bl);
+                goto error_backlight_device_register;
+        }
+
+        platform_set_drvdata(pdev, bl);
+
+        return 0;
+
+error_backlight_device_register:
+        kfree(data);
+error_kzalloc:
+        cs5535_mfgpt_free_timer(pwm_timer);
+error_mfgpt_alloc:
+        gpio_free(GPIO_DIMM);
+        return retval;
+}
+
+static int ot200_backlight_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct ot200_backlight_data *data = bl_get_data(bl);
+
+        backlight_device_unregister(bl);
+
+        /* on module unload set brightness to 100% */
+        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_COUNTER, 0);
+        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_SETUP, MFGPT_SETUP_CNTEN);
+        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_CMP1,
+                MAX_COMP2 - dim_table[100]);
+
+        cs5535_mfgpt_free_timer(pwm_timer);
+        gpio_free(GPIO_DIMM);
+
+        kfree(data);
+        return 0;
+}
+
+static struct platform_driver ot200_backlight_driver = {
+        .driver         = {
+                .name   = "ot200-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ot200_backlight_probe,
+        .remove         = ot200_backlight_remove,
+};
+
+module_platform_driver(ot200_backlight_driver);
+
+MODULE_DESCRIPTION("backlight driver for ot200 visualisation device");
+MODULE_AUTHOR("Christian Gmeiner <christian.gmeiner@gmail.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ot200-backlight");
diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
new file mode 100644
index 000000000000..4ec30748b447
--- /dev/null
+++ b/drivers/video/backlight/pandora_bl.c
@@ -0,0 +1,171 @@
+/*
+ * Backlight driver for Pandora handheld.
+ * Pandora uses TWL4030 PWM0 -> TPS61161 combo for control backlight.
+ * Based on pwm_bl.c
+ *
+ * Copyright 2009,2012 Gražvydas Ignotas <notasas@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/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+#include <linux/i2c/twl.h>
+#include <linux/err.h>
+
+#define TWL_PWM0_ON             0x00
+#define TWL_PWM0_OFF            0x01
+
+#define TWL_INTBR_GPBR1         0x0c
+#define TWL_INTBR_PMBR1         0x0d
+
+#define TWL_PMBR1_PWM0_MUXMASK  0x0c
+#define TWL_PMBR1_PWM0          0x04
+#define PWM0_CLK_ENABLE         BIT(0)
+#define PWM0_ENABLE             BIT(2)
+
+/* range accepted by hardware */
+#define MIN_VALUE 9
+#define MAX_VALUE 63
+#define MAX_USER_VALUE (MAX_VALUE - MIN_VALUE)
+
+#define PANDORABL_WAS_OFF BL_CORE_DRIVER1
+
+static int pandora_backlight_update_status(struct backlight_device *bl)
+{
+        int brightness = bl->props.brightness;
+        u8 r;
+
+        if (bl->props.power != FB_BLANK_UNBLANK)
+                brightness = 0;
+        if (bl->props.state & BL_CORE_FBBLANK)
+                brightness = 0;
+        if (bl->props.state & BL_CORE_SUSPENDED)
+                brightness = 0;
+
+        if ((unsigned int)brightness > MAX_USER_VALUE)
+                brightness = MAX_USER_VALUE;
+
+        if (brightness == 0) {
+                if (bl->props.state & PANDORABL_WAS_OFF)
+                        goto done;
+
+                /* first disable PWM0 output, then clock */
+                twl_i2c_read_u8(TWL4030_MODULE_INTBR, &r, TWL_INTBR_GPBR1);
+                r &= ~PWM0_ENABLE;
+                twl_i2c_write_u8(TWL4030_MODULE_INTBR, r, TWL_INTBR_GPBR1);
+                r &= ~PWM0_CLK_ENABLE;
+                twl_i2c_write_u8(TWL4030_MODULE_INTBR, r, TWL_INTBR_GPBR1);
+
+                goto done;
+        }
+
+        if (bl->props.state & PANDORABL_WAS_OFF) {
+                /*
+                 * set PWM duty cycle to max. TPS61161 seems to use this
+                 * to calibrate it's PWM sensitivity when it starts.
+                 */
+                twl_i2c_write_u8(TWL4030_MODULE_PWM0, MAX_VALUE,
+                                        TWL_PWM0_OFF);
+
+                /* first enable clock, then PWM0 out */
+                twl_i2c_read_u8(TWL4030_MODULE_INTBR, &r, TWL_INTBR_GPBR1);
+                r &= ~PWM0_ENABLE;
+                r |= PWM0_CLK_ENABLE;
+                twl_i2c_write_u8(TWL4030_MODULE_INTBR, r, TWL_INTBR_GPBR1);
+                r |= PWM0_ENABLE;
+                twl_i2c_write_u8(TWL4030_MODULE_INTBR, r, TWL_INTBR_GPBR1);
+
+                /*
+                 * TI made it very easy to enable digital control, so easy that
+                 * it often triggers unintentionally and disabes PWM control,
+                 * so wait until 1 wire mode detection window ends.
+                 */
+                usleep_range(2000, 10000);
+        }
+
+        twl_i2c_write_u8(TWL4030_MODULE_PWM0, MIN_VALUE + brightness,
+                                TWL_PWM0_OFF);
+
+done:
+        if (brightness != 0)
+                bl->props.state &= ~PANDORABL_WAS_OFF;
+        else
+                bl->props.state |= PANDORABL_WAS_OFF;
+
+        return 0;
+}
+
+static int pandora_backlight_get_brightness(struct backlight_device *bl)
+{
+        return bl->props.brightness;
+}
+
+static const struct backlight_ops pandora_backlight_ops = {
+        .options        = BL_CORE_SUSPENDRESUME,
+        .update_status  = pandora_backlight_update_status,
+        .get_brightness = pandora_backlight_get_brightness,
+};
+
+static int pandora_backlight_probe(struct platform_device *pdev)
+{
+        struct backlight_properties props;
+        struct backlight_device *bl;
+        u8 r;
+
+        memset(&props, 0, sizeof(props));
+        props.max_brightness = MAX_USER_VALUE;
+        props.type = BACKLIGHT_RAW;
+        bl = backlight_device_register(pdev->name, &pdev->dev,
+                        NULL, &pandora_backlight_ops, &props);
+        if (IS_ERR(bl)) {
+                dev_err(&pdev->dev, "failed to register backlight\n");
+                return PTR_ERR(bl);
+        }
+
+        platform_set_drvdata(pdev, bl);
+
+        /* 64 cycle period, ON position 0 */
+        twl_i2c_write_u8(TWL4030_MODULE_PWM0, 0x80, TWL_PWM0_ON);
+
+        bl->props.state |= PANDORABL_WAS_OFF;
+        bl->props.brightness = MAX_USER_VALUE;
+        backlight_update_status(bl);
+
+        /* enable PWM function in pin mux */
+        twl_i2c_read_u8(TWL4030_MODULE_INTBR, &r, TWL_INTBR_PMBR1);
+        r &= ~TWL_PMBR1_PWM0_MUXMASK;
+        r |= TWL_PMBR1_PWM0;
+        twl_i2c_write_u8(TWL4030_MODULE_INTBR, r, TWL_INTBR_PMBR1);
+
+        return 0;
+}
+
+static int pandora_backlight_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        backlight_device_unregister(bl);
+        return 0;
+}
+
+static struct platform_driver pandora_backlight_driver = {
+        .driver         = {
+                .name   = "pandora-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = pandora_backlight_probe,
+        .remove         = pandora_backlight_remove,
+};
+
+module_platform_driver(pandora_backlight_driver);
+
+MODULE_AUTHOR("Gražvydas Ignotas <notasas@gmail.com>");
+MODULE_DESCRIPTION("Pandora Backlight Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pandora-backlight");
diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
index 13e88b71daec..c65853cb9740 100644
--- a/drivers/video/backlight/pcf50633-backlight.c
+++ b/drivers/video/backlight/pcf50633-backlight.c
@@ -101,14 +101,13 @@ static const struct backlight_ops pcf50633_bl_ops = {
 
 static int __devinit pcf50633_bl_probe(struct platform_device *pdev)
 {
-        int ret;
         struct pcf50633_bl *pcf_bl;
         struct device *parent = pdev->dev.parent;
         struct pcf50633_platform_data *pcf50633_data = parent->platform_data;
         struct pcf50633_bl_platform_data *pdata = pcf50633_data->backlight_data;
         struct backlight_properties bl_props;
 
-        pcf_bl = kzalloc(sizeof(*pcf_bl), GFP_KERNEL);
+        pcf_bl = devm_kzalloc(&pdev->dev, sizeof(*pcf_bl), GFP_KERNEL);
         if (!pcf_bl)
                 return -ENOMEM;
 
@@ -129,10 +128,8 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev)
         pcf_bl->bl = backlight_device_register(pdev->name, &pdev->dev, pcf_bl,
                                                 &pcf50633_bl_ops, &bl_props);
 
-        if (IS_ERR(pcf_bl->bl)) {
-                ret = PTR_ERR(pcf_bl->bl);
-                goto err_free;
-        }
+        if (IS_ERR(pcf_bl->bl))
+                return PTR_ERR(pcf_bl->bl);
 
         platform_set_drvdata(pdev, pcf_bl);
 
@@ -145,11 +142,6 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev)
         backlight_update_status(pcf_bl->bl);
 
         return 0;
-
-err_free:
-        kfree(pcf_bl);
-
-        return ret;
 }
 
 static int __devexit pcf50633_bl_remove(struct platform_device *pdev)
@@ -160,8 +152,6 @@ static int __devexit pcf50633_bl_remove(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, NULL);
 
-        kfree(pcf_bl);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c
index f0bf491ed087..b6672340d6c7 100644
--- a/drivers/video/backlight/platform_lcd.c
+++ b/drivers/video/backlight/platform_lcd.c
@@ -121,9 +121,9 @@ static int __devexit platform_lcd_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int platform_lcd_suspend(struct platform_device *pdev, pm_message_t st)
+static int platform_lcd_suspend(struct device *dev)
 {
-        struct platform_lcd *plcd = platform_get_drvdata(pdev);
+        struct platform_lcd *plcd = dev_get_drvdata(dev);
 
         plcd->suspended = 1;
         platform_lcd_set_power(plcd->lcd, plcd->power);
@@ -131,29 +131,30 @@ static int platform_lcd_suspend(struct platform_device *pdev, pm_message_t st)
         return 0;
 }
 
-static int platform_lcd_resume(struct platform_device *pdev)
+static int platform_lcd_resume(struct device *dev)
 {
-        struct platform_lcd *plcd = platform_get_drvdata(pdev);
+        struct platform_lcd *plcd = dev_get_drvdata(dev);
 
         plcd->suspended = 0;
         platform_lcd_set_power(plcd->lcd, plcd->power);
 
         return 0;
 }
-#else
-#define platform_lcd_suspend NULL
-#define platform_lcd_resume NULL
+
+static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend,
+                        platform_lcd_resume);
 #endif
 
 static struct platform_driver platform_lcd_driver = {
         .driver         = {
                 .name   = "platform-lcd",
                 .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &platform_lcd_pm_ops,
+#endif
         },
         .probe          = platform_lcd_probe,
         .remove         = __devexit_p(platform_lcd_remove),
-        .suspend        = platform_lcd_suspend,
-        .resume         = platform_lcd_resume,
 };
 
 module_platform_driver(platform_lcd_driver);
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 7496d04e1d3c..342b7d7cbb63 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -102,7 +102,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)
                         return ret;
         }
 
-        pb = kzalloc(sizeof(*pb), GFP_KERNEL);
+        pb = devm_kzalloc(&pdev->dev, sizeof(*pb), GFP_KERNEL);
         if (!pb) {
                 dev_err(&pdev->dev, "no memory for state\n");
                 ret = -ENOMEM;
@@ -121,7 +121,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)
         if (IS_ERR(pb->pwm)) {
                 dev_err(&pdev->dev, "unable to request PWM for backlight\n");
                 ret = PTR_ERR(pb->pwm);
-                goto err_pwm;
+                goto err_alloc;
         } else
                 dev_dbg(&pdev->dev, "got pwm for backlight\n");
 
@@ -144,8 +144,6 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
 err_bl:
         pwm_free(pb->pwm);
-err_pwm:
-        kfree(pb);
 err_alloc:
         if (data->exit)
                 data->exit(&pdev->dev);
@@ -162,7 +160,6 @@ static int pwm_backlight_remove(struct platform_device *pdev)
         pwm_config(pb->pwm, 0, pb->period);
         pwm_disable(pb->pwm);
         pwm_free(pb->pwm);
-        kfree(pb);
         if (data->exit)
                 data->exit(&pdev->dev);
         return 0;
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index 516db703dd24..e264f55b2574 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -909,18 +909,7 @@ static struct spi_driver s6e63m0_driver = {
         .resume         = s6e63m0_resume,
 };
 
-static int __init s6e63m0_init(void)
-{
-        return spi_register_driver(&s6e63m0_driver);
-}
-
-static void __exit s6e63m0_exit(void)
-{
-        spi_unregister_driver(&s6e63m0_driver);
-}
-
-module_init(s6e63m0_init);
-module_exit(s6e63m0_exit);
+module_spi_driver(s6e63m0_driver);
 
 MODULE_AUTHOR("InKi Dae <inki.dae@samsung.com>");
 MODULE_DESCRIPTION("S6E63M0 LCD Driver");
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index 1997e12a1057..2368b8e5f89e 100644
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -459,17 +459,7 @@ static struct spi_driver tdo24m_driver = {
         .resume         = tdo24m_resume,
 };
 
-static int __init tdo24m_init(void)
-{
-        return spi_register_driver(&tdo24m_driver);
-}
-module_init(tdo24m_init);
-
-static void __exit tdo24m_exit(void)
-{
-        spi_unregister_driver(&tdo24m_driver);
-}
-module_exit(tdo24m_exit);
+module_spi_driver(tdo24m_driver);
 
 MODULE_AUTHOR("Eric Miao <eric.miao@marvell.com>");
 MODULE_DESCRIPTION("Driver for Toppoly TDO24M LCD Panel");
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index 425a7365470b..2b241abced43 100644
--- a/drivers/video/backlight/tosa_bl.c
+++ b/drivers/video/backlight/tosa_bl.c
@@ -181,18 +181,7 @@ static struct i2c_driver tosa_bl_driver = {
         .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_i2c_driver(tosa_bl_driver);
 
 MODULE_AUTHOR("Dmitry Baryshkov");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 772f6015219a..a2161f631a83 100644
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -285,18 +285,7 @@ static struct spi_driver tosa_lcd_driver = {
         .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_spi_driver(tosa_lcd_driver);
 
 MODULE_AUTHOR("Dmitry Baryshkov");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c
index b49063c831e7..b617fae9aa26 100644
--- a/drivers/video/backlight/vgg2432a4.c
+++ b/drivers/video/backlight/vgg2432a4.c
@@ -262,20 +262,7 @@ static struct spi_driver vgg2432a4_driver = {
         .resume         = vgg2432a4_resume,
 };
 
-/* Device driver initialisation */
-
-static int __init vgg2432a4_init(void)
-{
-        return spi_register_driver(&vgg2432a4_driver);
-}
-
-static void __exit vgg2432a4_exit(void)
-{
-        spi_unregister_driver(&vgg2432a4_driver);
-}
-
-module_init(vgg2432a4_init);
-module_exit(vgg2432a4_exit);
+module_spi_driver(vgg2432a4_driver);
 
 MODULE_AUTHOR("Ben Dooks <ben-linux@fluff.org>");
 MODULE_DESCRIPTION("VGG2432A4 LCD Driver");
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 4e915f5eca99..5d365deb5f82 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -186,7 +186,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         if (ret < 0)
                 return ret;
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
 
@@ -200,7 +200,6 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
                                        &wm831x_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
-                kfree(data);
                 return PTR_ERR(bl);
         }
 
@@ -211,7 +210,6 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         /* 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;
@@ -220,10 +218,8 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
 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;
 }
 
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 9db3de3a8418..260cca7ddb41 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -121,7 +121,7 @@ static int uvesafb_helper_start(void)
                 NULL,
         };
 
-        return call_usermodehelper(v86d_path, argv, envp, 1);
+        return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
 }
 
 /*