Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Pull MFD changes from Samuel Ortiz:
 "MFD bits for the 3.7 merge window.

  As usual we have a few new drivers:

   - TI LP8788
   - TI OMAP USB TLL
   - Maxim MAX8907
   - SMSC ECE1099
   - Dialog Semiconductor DA9055
   - A simpler syscon driver that allow us to get rid of the anatop one.

  Drivers are also gradually getting Device Tree and IRQ domain support.

  The following drivers got DT support:
   - palmas, 88pm860x, tc3589x and twl4030-audio

  And those ones now use the IRQ domain APIs:
   - 88pm860x, tc3589x, db8500_prcmu

  Also some other interesting changes:
   - Intel's ICH LPC now supports Lynx Point
   - TI's twl4030-audio added a GPO child
   - tps6527 enabled its backlight subdevice
   - The twl6030 pwm driver moved to the new PWM subsystem

  And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x,
  palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family."

Fix up various annoying conflicts: the DT and IRQ domain support came in
twice and was already in 3.6. And then it was apparently rebased.

Guys, DON'T REBASE!

* tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits)
  ARM: dts: Enable 88pm860x pmic
  mfd: 88pm860x: Move gpadc init into touch
  mfd: 88pm860x: Device tree support
  mfd: 88pm860x: Use irqdomain
  mfd: smsc: Add support for smsc gpio io/keypad driver
  backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe
  mfd: DA9055 core driver
  mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list
  mfd: wm5110: Add register patches for revision B
  mfd: wm5110: Disable control interface error report for WM5110 rev B
  mfd: max8907: Remove regulator-compatible from DT docs
  backlight: Add TPS65217 WLED driver
  mfd: Add backlight as subdevice to the tps65217
  mfd: Provide the PRCMU with its own IRQ domain
  mfd: Fix max8907 sparse warning
  mfd: Add lp8788 mfd driver
  mfd: dbx500: Provide a more accurate smp_twd clock
  mfd: rc5t583: Fix warning messages
  regulator: palmas: Add DT support
  mfd: palmas: Change regulator defns to better suite DT
  ...

1 files changed, 64 insertions, 92 deletions

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 9d3a0bc1a65f..4ae642320205 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -63,70 +63,6 @@
 
 #define DRIVER_NAME                     "twl"
 
-#if defined(CONFIG_KEYBOARD_TWL4030) || defined(CONFIG_KEYBOARD_TWL4030_MODULE)
-#define twl_has_keypad()        true
-#else
-#define twl_has_keypad()        false
-#endif
-
-#if defined(CONFIG_GPIO_TWL4030) || defined(CONFIG_GPIO_TWL4030_MODULE)
-#define twl_has_gpio()  true
-#else
-#define twl_has_gpio()  false
-#endif
-
-#if defined(CONFIG_REGULATOR_TWL4030) \
-        || defined(CONFIG_REGULATOR_TWL4030_MODULE)
-#define twl_has_regulator()     true
-#else
-#define twl_has_regulator()     false
-#endif
-
-#if defined(CONFIG_TWL4030_MADC) || defined(CONFIG_TWL4030_MADC_MODULE)
-#define twl_has_madc()  true
-#else
-#define twl_has_madc()  false
-#endif
-
-#ifdef CONFIG_TWL4030_POWER
-#define twl_has_power()        true
-#else
-#define twl_has_power()        false
-#endif
-
-#if defined(CONFIG_RTC_DRV_TWL4030) || defined(CONFIG_RTC_DRV_TWL4030_MODULE)
-#define twl_has_rtc()   true
-#else
-#define twl_has_rtc()   false
-#endif
-
-#if defined(CONFIG_TWL4030_USB) || defined(CONFIG_TWL4030_USB_MODULE) ||\
-        defined(CONFIG_TWL6030_USB) || defined(CONFIG_TWL6030_USB_MODULE)
-#define twl_has_usb()   true
-#else
-#define twl_has_usb()   false
-#endif
-
-#if defined(CONFIG_TWL4030_WATCHDOG) || \
-        defined(CONFIG_TWL4030_WATCHDOG_MODULE)
-#define twl_has_watchdog()        true
-#else
-#define twl_has_watchdog()        false
-#endif
-
-#if defined(CONFIG_MFD_TWL4030_AUDIO) || \
-        defined(CONFIG_MFD_TWL4030_AUDIO_MODULE)
-#define twl_has_codec() true
-#else
-#define twl_has_codec() false
-#endif
-
-#if defined(CONFIG_CHARGER_TWL4030) || defined(CONFIG_CHARGER_TWL4030_MODULE)
-#define twl_has_bci()   true
-#else
-#define twl_has_bci()   false
-#endif
-
 /* Triton Core internal information (BEGIN) */
 
 /* Last - for index max*/
@@ -134,13 +70,6 @@
 
 #define TWL_NUM_SLAVES          4
 
-#if defined(CONFIG_INPUT_TWL4030_PWRBUTTON) \
-        || defined(CONFIG_INPUT_TWL4030_PWRBUTTON_MODULE)
-#define twl_has_pwrbutton()     true
-#else
-#define twl_has_pwrbutton()     false
-#endif
-
 #define SUB_CHIP_ID0 0
 #define SUB_CHIP_ID1 1
 #define SUB_CHIP_ID2 2
@@ -552,6 +481,38 @@ int twl_get_version(void)
 }
 EXPORT_SYMBOL_GPL(twl_get_version);
 
+/**
+ * twl_get_hfclk_rate - API to get TWL external HFCLK clock rate.
+ *
+ * Api to get the TWL HFCLK rate based on BOOT_CFG register.
+ */
+int twl_get_hfclk_rate(void)
+{
+        u8 ctrl;
+        int rate;
+
+        twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &ctrl, R_CFG_BOOT);
+
+        switch (ctrl & 0x3) {
+        case HFCLK_FREQ_19p2_MHZ:
+                rate = 19200000;
+                break;
+        case HFCLK_FREQ_26_MHZ:
+                rate = 26000000;
+                break;
+        case HFCLK_FREQ_38p4_MHZ:
+                rate = 38400000;
+                break;
+        default:
+                pr_err("TWL4030: HFCLK is not configured\n");
+                rate = -EINVAL;
+                break;
+        }
+
+        return rate;
+}
+EXPORT_SYMBOL_GPL(twl_get_hfclk_rate);
+
 static struct device *
 add_numbered_child(unsigned chip, const char *name, int num,
                 void *pdata, unsigned pdata_len,
@@ -669,7 +630,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
         struct device   *child;
         unsigned sub_chip_id;
 
-        if (twl_has_gpio() && pdata->gpio) {
+        if (IS_ENABLED(CONFIG_GPIO_TWL4030) && pdata->gpio) {
                 child = add_child(SUB_CHIP_ID1, "twl4030_gpio",
                                 pdata->gpio, sizeof(*pdata->gpio),
                                 false, irq_base + GPIO_INTR_OFFSET, 0);
@@ -677,7 +638,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                         return PTR_ERR(child);
         }
 
-        if (twl_has_keypad() && pdata->keypad) {
+        if (IS_ENABLED(CONFIG_KEYBOARD_TWL4030) && pdata->keypad) {
                 child = add_child(SUB_CHIP_ID2, "twl4030_keypad",
                                 pdata->keypad, sizeof(*pdata->keypad),
                                 true, irq_base + KEYPAD_INTR_OFFSET, 0);
@@ -685,7 +646,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                         return PTR_ERR(child);
         }
 
-        if (twl_has_madc() && pdata->madc) {
+        if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc) {
                 child = add_child(2, "twl4030_madc",
                                 pdata->madc, sizeof(*pdata->madc),
                                 true, irq_base + MADC_INTR_OFFSET, 0);
@@ -693,7 +654,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                         return PTR_ERR(child);
         }
 
-        if (twl_has_rtc()) {
+        if (IS_ENABLED(CONFIG_RTC_DRV_TWL4030)) {
                 /*
                  * REVISIT platform_data here currently might expose the
                  * "msecure" line ... but for now we just expect board
@@ -709,7 +670,15 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                         return PTR_ERR(child);
         }
 
-        if (twl_has_usb() && pdata->usb && twl_class_is_4030()) {
+        if (IS_ENABLED(CONFIG_PWM_TWL6030) && twl_class_is_6030()) {
+                child = add_child(TWL6030_MODULE_ID1, "twl6030-pwm", NULL, 0,
+                                  false, 0, 0);
+                if (IS_ERR(child))
+                        return PTR_ERR(child);
+        }
+
+        if (IS_ENABLED(CONFIG_TWL4030_USB) && pdata->usb &&
+            twl_class_is_4030()) {
 
                 static struct regulator_consumer_supply usb1v5 = {
                         .supply =       "usb1v5",
@@ -723,7 +692,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                 };
 
         /* First add the regulators so that they can be used by transceiver */
-                if (twl_has_regulator()) {
+                if (IS_ENABLED(CONFIG_REGULATOR_TWL4030)) {
                         /* this is a template that gets copied */
                         struct regulator_init_data usb_fixed = {
                                 .constraints.valid_modes_mask =
@@ -765,18 +734,19 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                         return PTR_ERR(child);
 
                 /* we need to connect regulators to this transceiver */
-                if (twl_has_regulator() && child) {
+                if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && child) {
                         usb1v5.dev_name = dev_name(child);
                         usb1v8.dev_name = dev_name(child);
                         usb3v1[0].dev_name = dev_name(child);
                 }
         }
-        if (twl_has_usb() && pdata->usb && twl_class_is_6030()) {
+        if (IS_ENABLED(CONFIG_TWL6030_USB) && pdata->usb &&
+            twl_class_is_6030()) {
 
                 static struct regulator_consumer_supply usb3v3;
                 int regulator;
 
-                if (twl_has_regulator()) {
+                if (IS_ENABLED(CONFIG_REGULATOR_TWL4030)) {
                         /* this is a template that gets copied */
                         struct regulator_init_data usb_fixed = {
                                 .constraints.valid_modes_mask =
@@ -813,9 +783,10 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                 if (IS_ERR(child))
                         return PTR_ERR(child);
                 /* we need to connect regulators to this transceiver */
-                if (twl_has_regulator() && child)
+                if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && child)
                         usb3v3.dev_name = dev_name(child);
-        } else if (twl_has_regulator() && twl_class_is_6030()) {
+        } else if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) &&
+                   twl_class_is_6030()) {
                 if (features & TWL6025_SUBCLASS)
                         child = add_regulator(TWL6025_REG_LDOUSB,
                                                 pdata->ldousb, features);
@@ -827,20 +798,21 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                                         return PTR_ERR(child);
         }
 
-        if (twl_has_watchdog() && twl_class_is_4030()) {
+        if (IS_ENABLED(CONFIG_TWL4030_WATCHDOG) && twl_class_is_4030()) {
                 child = add_child(0, "twl4030_wdt", NULL, 0, false, 0, 0);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
         }
 
-        if (twl_has_pwrbutton() && twl_class_is_4030()) {
+        if (IS_ENABLED(CONFIG_INPUT_TWL4030_PWRBUTTON) && twl_class_is_4030()) {
                 child = add_child(1, "twl4030_pwrbutton",
                                 NULL, 0, true, irq_base + 8 + 0, 0);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
         }
 
-        if (twl_has_codec() && pdata->audio && twl_class_is_4030()) {
+        if (IS_ENABLED(CONFIG_MFD_TWL4030_AUDIO) && pdata->audio &&
+            twl_class_is_4030()) {
                 sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;
                 child = add_child(sub_chip_id, "twl4030-audio",
                                 pdata->audio, sizeof(*pdata->audio),
@@ -850,7 +822,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
         }
 
         /* twl4030 regulators */
-        if (twl_has_regulator() && twl_class_is_4030()) {
+        if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_4030()) {
                 child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1,
                                         features);
                 if (IS_ERR(child))
@@ -905,7 +877,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
         }
 
         /* maybe add LDOs that are omitted on cost-reduced parts */
-        if (twl_has_regulator() && !(features & TPS_SUBSET)
+        if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && !(features & TPS_SUBSET)
           && twl_class_is_4030()) {
                 child = add_regulator(TWL4030_REG_VPLL2, pdata->vpll2,
                                         features);
@@ -939,7 +911,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
         }
 
         /* twl6030 regulators */
-        if (twl_has_regulator() && twl_class_is_6030() &&
+        if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030() &&
                         !(features & TWL6025_SUBCLASS)) {
                 child = add_regulator(TWL6030_REG_VDD1, pdata->vdd1,
                                         features);
@@ -1013,7 +985,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
         }
 
         /* 6030 and 6025 share this regulator */
-        if (twl_has_regulator() && twl_class_is_6030()) {
+        if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030()) {
                 child = add_regulator(TWL6030_REG_VANA, pdata->vana,
                                         features);
                 if (IS_ERR(child))
@@ -1021,7 +993,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
         }
 
         /* twl6025 regulators */
-        if (twl_has_regulator() && twl_class_is_6030() &&
+        if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030() &&
                         (features & TWL6025_SUBCLASS)) {
                 child = add_regulator(TWL6025_REG_LDO5, pdata->ldo5,
                                         features);
@@ -1080,7 +1052,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
 
         }
 
-        if (twl_has_bci() && pdata->bci &&
+        if (IS_ENABLED(CONFIG_CHARGER_TWL4030) && pdata->bci &&
                         !(features & (TPS_SUBSET | TWL5031))) {
                 child = add_child(3, "twl4030_bci",
                                 pdata->bci, sizeof(*pdata->bci), false,
@@ -1295,7 +1267,7 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
         }
 
         /* load power event scripts */
-        if (twl_has_power() && pdata->power)
+        if (IS_ENABLED(CONFIG_TWL4030_POWER) && pdata->power)
                 twl4030_power_init(pdata->power);
 
         /* Maybe init the T2 Interrupt subsystem */