5 files changed, 27 insertions, 62 deletions

diff --git a/Documentation/leds/leds-lp5521.txt b/Documentation/leds/leds-lp5521.txt
index 270f57196339..79e4c2e6e5e8 100644
--- a/Documentation/leds/leds-lp5521.txt
+++ b/Documentation/leds/leds-lp5521.txt
@@ -81,22 +81,3 @@ static struct lp55xx_platform_data lp5521_platform_data = {
 
 If the current is set to 0 in the platform data, that channel is
 disabled and it is not visible in the sysfs.
-
-The 'update_config' : CONFIG register (ADDR 08h)
-This value is platform-specific data.
-If update_config is not defined, the CONFIG register is set with
-'LP5521_PWRSAVE_EN | LP5521_CP_MODE_AUTO | LP5521_R_TO_BATT'.
-(Enable auto-powersave, set charge pump to auto, red to battery)
-
-example of update_config :
-
-#define LP5521_CONFIGS  (LP5521_PWM_HF | LP5521_PWRSAVE_EN | \
-                        LP5521_CP_MODE_AUTO | LP5521_R_TO_BATT | \
-                        LP5521_CLK_INT)
-
-static struct lp55xx_platform_data lp5521_pdata = {
-        .led_config = lp5521_led_config,
-        .num_channels = ARRAY_SIZE(lp5521_led_config),
-        .clock_mode = LP55XX_CLOCK_INT,
-        .update_config = LP5521_CONFIGS,
-};
diff --git a/Documentation/leds/leds-lp5562.txt b/Documentation/leds/leds-lp5562.txt
index 96061000dd93..5a823ff6b393 100644
--- a/Documentation/leds/leds-lp5562.txt
+++ b/Documentation/leds/leds-lp5562.txt
@@ -118,18 +118,3 @@ static struct lp55xx_platform_data lp5562_platform_data = {
 
 If the current is set to 0 in the platform data, that channel is
 disabled and it is not visible in the sysfs.
-
-The 'update_config' : CONFIG register (ADDR 08h)
-This value is platform-specific data.
-If update_config is not defined, the CONFIG register is set with
-'LP5562_PWRSAVE_EN | LP5562_CLK_AUTO'.
-(Enable auto-powersave, set automatic clock source selection)
-
-#define LP5562_CONFIGS  (LP5562_PWM_HF | LP5562_PWRSAVE_EN | \
-                         LP5562_CLK_SRC_EXT)
-
-static struct lp55xx_platform_data lp5562_pdata = {
-        .led_config = lp5562_led_config,
-        .num_channels = ARRAY_SIZE(lp5562_led_config),
-        .update_config = LP5562_CONFIGS,
-};
diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 7f10304219ea..19752c928aa2 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -68,6 +68,18 @@
 #define LP5521_ENABLE_RUN_PROGRAM       \
         (LP5521_ENABLE_DEFAULT | LP5521_EXEC_RUN)
 
+/* 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                0x04    /* R out: 0 = CP, 1 = Vbat */
+#define LP5521_CLK_INT                  0x01    /* Internal clock */
+#define LP5521_DEFAULT_CFG              \
+        (LP5521_PWM_HF | LP5521_PWRSAVE_EN | LP5521_CP_MODE_AUTO)
+
 /* Status */
 #define LP5521_EXT_CLK_USED             0x08
 
@@ -296,8 +308,11 @@ static int lp5521_post_init_device(struct lp55xx_chip *chip)
         /* Set all PWMs to direct control mode */
         ret = lp55xx_write(chip, LP5521_REG_OP_MODE, LP5521_CMD_DIRECT);
 
-        val = chip->pdata->update_config ?
-                : (LP5521_PWRSAVE_EN | LP5521_CP_MODE_AUTO | LP5521_R_TO_BATT);
+        /* Update configuration for the clock setting */
+        val = LP5521_DEFAULT_CFG;
+        if (!lp55xx_is_extclk_used(chip))
+                val |= LP5521_CLK_INT;
+
         ret = lp55xx_write(chip, LP5521_REG_CONFIG, val);
         if (ret)
                 return ret;
diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
index f8b927788c3a..513f2390ca2d 100644
--- a/drivers/leds/leds-lp5562.c
+++ b/drivers/leds/leds-lp5562.c
@@ -71,8 +71,10 @@
 
 /* CONFIG Register 08h */
 #define LP5562_REG_CONFIG               0x08
-#define LP5562_DEFAULT_CFG      \
-        (LP5562_PWM_HF | LP5562_PWRSAVE_EN | LP5562_CLK_INT)
+#define LP5562_PWM_HF                   0x40
+#define LP5562_PWRSAVE_EN               0x20
+#define LP5562_CLK_INT                  0x01    /* Internal clock */
+#define LP5562_DEFAULT_CFG              (LP5562_PWM_HF | LP5562_PWRSAVE_EN)
 
 /* RESET Register 0Dh */
 #define LP5562_REG_RESET                0x0D
@@ -280,7 +282,7 @@ static void lp5562_firmware_loaded(struct lp55xx_chip *chip)
 static int lp5562_post_init_device(struct lp55xx_chip *chip)
 {
         int ret;
-        u8 update_cfg = chip->pdata->update_config ? : LP5562_DEFAULT_CFG;
+        u8 cfg = LP5562_DEFAULT_CFG;
 
         /* Set all PWMs to direct control mode */
         ret = lp55xx_write(chip, LP5562_REG_OP_MODE, LP5562_CMD_DIRECT);
@@ -289,7 +291,11 @@ static int lp5562_post_init_device(struct lp55xx_chip *chip)
 
         lp5562_wait_opmode_done();
 
-        ret = lp55xx_write(chip, LP5562_REG_CONFIG, update_cfg);
+        /* Update configuration for the clock setting */
+        if (!lp55xx_is_extclk_used(chip))
+                cfg |= LP5562_CLK_INT;
+
+        ret = lp55xx_write(chip, LP5562_REG_CONFIG, cfg);
         if (ret)
                 return ret;
 
diff --git a/include/linux/platform_data/leds-lp55xx.h b/include/linux/platform_data/leds-lp55xx.h
index 1f1041e8b4fc..202e290faea8 100644
--- a/include/linux/platform_data/leds-lp55xx.h
+++ b/include/linux/platform_data/leds-lp55xx.h
@@ -20,25 +20,6 @@
 #define LP55XX_CLOCK_INT        1
 #define LP55XX_CLOCK_EXT        2
 
-/* Bits in LP5521 CONFIG register. 'update_config' in lp55xx_platform_data */
-#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 */
-
-/* Bits in LP5562 CONFIG register */
-#define LP5562_PWM_HF                   LP5521_PWM_HF
-#define LP5562_PWRSAVE_EN               LP5521_PWRSAVE_EN
-#define LP5562_CLK_SRC_EXT              LP5521_CLK_SRC_EXT
-#define LP5562_CLK_INT                  LP5521_CLK_INT
-#define LP5562_CLK_AUTO                 LP5521_CLK_AUTO
-
 struct lp55xx_led_config {
         const char *name;
         u8 chan_nr;
@@ -86,9 +67,6 @@ struct lp55xx_platform_data {
         /* Predefined pattern data */
         struct lp55xx_predef_pattern *patterns;
         unsigned int num_patterns;
-
-        /* _CONFIG register */
-        u8 update_config;
 };
 
 #endif /* _LEDS_LP55XX_H */