ab8500-bm: Add support for the new ab8540 platform

Provide AB8540 platform specific information required to run the
Battery Management subsystem on AB8540 based devices. For this to
happen we see the introduction of separate platform specific data
structures and a means in which to process them.

Signed-off-by: Lee Jones <lee.jones@linaro.org>

2 files changed, 13 insertions, 2 deletions

diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index cd71d8eadf50..33b0253569a3 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -246,7 +246,11 @@ struct abx500_bm_charger_parameters {
  * @interval_not_charging charge alg cycle period time when not charging (sec)
  * @temp_hysteresis     temperature hysteresis
  * @gnd_lift_resistance Battery ground to phone ground resistance (mOhm)
- * @maxi:               maximization parameters
+ * @n_chg_out_curr              number of elements in array chg_output_curr
+ * @n_chg_in_curr               number of elements in array chg_input_curr
+ * @chg_output_curr     charger output current level map
+ * @chg_input_curr              charger input current level map
+ * @maxi                maximization parameters
  * @cap_levels          capacity in percent for the different capacity levels
  * @bat_type            table of supported battery types
  * @chg_params          charger parameters
@@ -281,6 +285,10 @@ struct abx500_bm_data {
         int interval_not_charging;
         int temp_hysteresis;
         int gnd_lift_resistance;
+        int n_chg_out_curr;
+        int n_chg_in_curr;
+        int *chg_output_curr;
+        int *chg_input_curr;
         const struct abx500_maxim_parameters *maxi;
         const struct abx500_bm_capacity_levels *cap_levels;
         struct abx500_battery_type *bat_type;
diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h
index 0ebf0c5d1f88..ee1c1626c886 100644
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@ -33,7 +33,7 @@
 #define AB8500_CH_STATUS2_REG           0x01
 #define AB8500_CH_USBCH_STAT1_REG       0x02
 #define AB8500_CH_USBCH_STAT2_REG       0x03
-#define AB8500_CH_FSM_STAT_REG          0x04
+#define AB8540_CH_USBCH_STAT3_REG       0x04
 #define AB8500_CH_STAT_REG              0x05
 
 /*
@@ -157,6 +157,7 @@
 #define CH_OP_CUR_LVL_1P4               0x0D
 #define CH_OP_CUR_LVL_1P5               0x0E
 #define CH_OP_CUR_LVL_1P6               0x0F
+#define CH_OP_CUR_LVL_2P                0x3F
 
 /* BTEMP High thermal limits */
 #define BTEMP_HIGH_TH_57_0              0x00
@@ -246,6 +247,8 @@ enum bup_vch_sel {
 #define BAT_CTRL_20U_ENA                0x02
 #define BAT_CTRL_18U_ENA                0x01
 #define BAT_CTRL_16U_ENA                0x02
+#define BAT_CTRL_60U_ENA                0x01
+#define BAT_CTRL_120U_ENA               0x02
 #define BAT_CTRL_CMP_ENA                0x04
 #define FORCE_BAT_CTRL_CMP_HIGH         0x08
 #define BAT_CTRL_PULL_UP_ENA            0x10