3 files changed, 84 insertions, 57 deletions

diff --git a/include/linux/platform_data/lm3630_bl.h b/include/linux/platform_data/lm3630_bl.h
deleted file mode 100644
index 9176dd3f2d63..000000000000
--- a/include/linux/platform_data/lm3630_bl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* Simple driver for Texas Instruments LM3630 LED Flash driver chip
-* Copyright (C) 2012 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.
-*
-*/
-
-#ifndef __LINUX_LM3630_H
-#define __LINUX_LM3630_H
-
-#define LM3630_NAME "lm3630_bl"
-
-enum lm3630_pwm_ctrl {
-        PWM_CTRL_DISABLE = 0,
-        PWM_CTRL_BANK_A,
-        PWM_CTRL_BANK_B,
-        PWM_CTRL_BANK_ALL,
-};
-
-enum lm3630_pwm_active {
-        PWM_ACTIVE_HIGH = 0,
-        PWM_ACTIVE_LOW,
-};
-
-enum lm3630_bank_a_ctrl {
-        BANK_A_CTRL_DISABLE = 0x0,
-        BANK_A_CTRL_LED1 = 0x4,
-        BANK_A_CTRL_LED2 = 0x1,
-        BANK_A_CTRL_ALL = 0x5,
-};
-
-enum lm3630_bank_b_ctrl {
-        BANK_B_CTRL_DISABLE = 0,
-        BANK_B_CTRL_LED2,
-};
-
-struct lm3630_platform_data {
-
-        /* maximum brightness */
-        int max_brt_led1;
-        int max_brt_led2;
-
-        /* initial on brightness */
-        int init_brt_led1;
-        int init_brt_led2;
-        enum lm3630_pwm_ctrl pwm_ctrl;
-        enum lm3630_pwm_active pwm_active;
-        enum lm3630_bank_a_ctrl bank_a_ctrl;
-        enum lm3630_bank_b_ctrl bank_b_ctrl;
-        unsigned int pwm_period;
-        void (*pwm_set_intensity) (int brightness, int max_brightness);
-};
-
-#endif /* __LINUX_LM3630_H */
diff --git a/include/linux/platform_data/lm3630a_bl.h b/include/linux/platform_data/lm3630a_bl.h
new file mode 100644
index 000000000000..7538e38e270b
--- /dev/null
+++ b/include/linux/platform_data/lm3630a_bl.h
@@ -0,0 +1,65 @@
+/*
+* Simple driver for Texas Instruments LM3630A LED Flash driver chip
+* Copyright (C) 2012 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.
+*
+*/
+
+#ifndef __LINUX_LM3630A_H
+#define __LINUX_LM3630A_H
+
+#define LM3630A_NAME "lm3630a_bl"
+
+enum lm3630a_pwm_ctrl {
+        LM3630A_PWM_DISABLE = 0x00,
+        LM3630A_PWM_BANK_A,
+        LM3630A_PWM_BANK_B,
+        LM3630A_PWM_BANK_ALL,
+        LM3630A_PWM_BANK_A_ACT_LOW = 0x05,
+        LM3630A_PWM_BANK_B_ACT_LOW,
+        LM3630A_PWM_BANK_ALL_ACT_LOW,
+};
+
+enum lm3630a_leda_ctrl {
+        LM3630A_LEDA_DISABLE = 0x00,
+        LM3630A_LEDA_ENABLE = 0x04,
+        LM3630A_LEDA_ENABLE_LINEAR = 0x14,
+};
+
+enum lm3630a_ledb_ctrl {
+        LM3630A_LEDB_DISABLE = 0x00,
+        LM3630A_LEDB_ON_A = 0x01,
+        LM3630A_LEDB_ENABLE = 0x02,
+        LM3630A_LEDB_ENABLE_LINEAR = 0x0A,
+};
+
+#define LM3630A_MAX_BRIGHTNESS 255
+/*
+ *@leda_init_brt : led a init brightness. 4~255
+ *@leda_max_brt  : led a max brightness.  4~255
+ *@leda_ctrl     : led a disable, enable linear, enable exponential
+ *@ledb_init_brt : led b init brightness. 4~255
+ *@ledb_max_brt  : led b max brightness.  4~255
+ *@ledb_ctrl     : led b disable, enable linear, enable exponential
+ *@pwm_period    : pwm period
+ *@pwm_ctrl      : pwm disable, bank a or b, active high or low
+ */
+struct lm3630a_platform_data {
+
+        /* led a config.  */
+        int leda_init_brt;
+        int leda_max_brt;
+        enum lm3630a_leda_ctrl leda_ctrl;
+        /* led b config. */
+        int ledb_init_brt;
+        int ledb_max_brt;
+        enum lm3630a_ledb_ctrl ledb_ctrl;
+        /* pwm config. */
+        unsigned int pwm_period;
+        enum lm3630a_pwm_ctrl pwm_ctrl;
+};
+
+#endif /* __LINUX_LM3630A_H */
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h
index ea3200527dd3..1b2ba24e4e03 100644
--- a/include/linux/platform_data/lp855x.h
+++ b/include/linux/platform_data/lp855x.h
@@ -40,6 +40,17 @@
 #define LP8553_PWM_CONFIG       LP8550_PWM_CONFIG
 #define LP8553_I2C_CONFIG       LP8550_I2C_CONFIG
 
+/* CONFIG register - LP8555 */
+#define LP8555_PWM_STANDBY      BIT(7)
+#define LP8555_PWM_FILTER       BIT(6)
+#define LP8555_RELOAD_EPROM     BIT(3)  /* use it if EPROMs should be reset
+                                           when the backlight turns on */
+#define LP8555_OFF_OPENLEDS     BIT(2)
+#define LP8555_PWM_CONFIG       LP8555_PWM_ONLY
+#define LP8555_I2C_CONFIG       LP8555_I2C_ONLY
+#define LP8555_COMB1_CONFIG     LP8555_COMBINED1
+#define LP8555_COMB2_CONFIG     LP8555_COMBINED2
+
 /* DEVICE CONTROL register - LP8556 */
 #define LP8556_PWM_CONFIG       (LP8556_PWM_ONLY << BRT_MODE_SHFT)
 #define LP8556_COMB1_CONFIG     (LP8556_COMBINED1 << BRT_MODE_SHFT)
@@ -65,6 +76,7 @@ enum lp855x_chip_id {
         LP8551,
         LP8552,
         LP8553,
+        LP8555,
         LP8556,
         LP8557,
 };
@@ -89,6 +101,13 @@ enum lp8553_brighntess_source {
         LP8553_I2C_ONLY = LP8550_I2C_ONLY,
 };
 
+enum lp8555_brightness_source {
+        LP8555_PWM_ONLY,
+        LP8555_I2C_ONLY,
+        LP8555_COMBINED1,       /* Brightness register with shaped PWM */
+        LP8555_COMBINED2,       /* PWM with shaped brightness register */
+};
+
 enum lp8556_brightness_source {
         LP8556_PWM_ONLY,
         LP8556_COMBINED1,       /* pwm + i2c before the shaper block */