mfd: twl-core: Clean up module by removing twl603x pdata handling

Since currently nobody uses TWL603x platform data and all new
users will supply it through device tree, handling of these
data within twl-core will never be used, so remove it.

Signed-off-by: Ruslan Ruslichenko <ruslan.ruslichenko@globallogic.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 29473c2..c3c28b9 100644 (file)
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -701,62 +701,6 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                        usb3v1[0].dev_name = dev_name(child);
                }
        }
-       if (IS_ENABLED(CONFIG_TWL6030_USB) && pdata->usb &&
-           twl_class_is_6030()) {
-
-               static struct regulator_consumer_supply usb3v3;
-               int regulator;
-
-               if (IS_ENABLED(CONFIG_REGULATOR_TWL4030)) {
-                       /* this is a template that gets copied */
-                       struct regulator_init_data usb_fixed = {
-                               .constraints.valid_modes_mask =
-                                       REGULATOR_MODE_NORMAL
-                                       | REGULATOR_MODE_STANDBY,
-                               .constraints.valid_ops_mask =
-                                       REGULATOR_CHANGE_MODE
-                                       | REGULATOR_CHANGE_STATUS,
-                       };
-
-                       if (features & TWL6032_SUBCLASS) {
-                               usb3v3.supply = "ldousb";
-                               regulator = TWL6032_REG_LDOUSB;
-                       } else {
-                               usb3v3.supply = "vusb";
-                               regulator = TWL6030_REG_VUSB;
-                       }
-                       child = add_regulator_linked(regulator, &usb_fixed,
-                                                       &usb3v3, 1,
-                                                       features);
-                       if (IS_ERR(child))
-                               return PTR_ERR(child);
-               }
-
-               pdata->usb->features = features;
-
-               child = add_child(TWL_MODULE_USB, "twl6030_usb",
-                       pdata->usb, sizeof(*pdata->usb), true,
-                       /* irq1 = VBUS_PRES, irq0 = USB ID */
-                       irq_base + USBOTG_INTR_OFFSET,
-                       irq_base + USB_PRES_INTR_OFFSET);
-
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-               /* we need to connect regulators to this transceiver */
-               if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && child)
-                       usb3v3.dev_name = dev_name(child);
-       } else if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) &&
-                  twl_class_is_6030()) {
-               if (features & TWL6032_SUBCLASS)
-                       child = add_regulator(TWL6032_REG_LDOUSB,
-                                               pdata->ldousb, features);
-               else
-                       child = add_regulator(TWL6030_REG_VUSB,
-                                               pdata->vusb, features);
-
-                       if (IS_ERR(child))
-                                       return PTR_ERR(child);
-       }
 
        if (IS_ENABLED(CONFIG_TWL4030_WATCHDOG) && twl_class_is_4030()) {
                child = add_child(TWL_MODULE_PM_RECEIVER, "twl4030_wdt", NULL,
@@ -870,148 +814,6 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                        return PTR_ERR(child);
        }
 
-       /* twl6030 regulators */
-       if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030() &&
-                       !(features & TWL6032_SUBCLASS)) {
-               child = add_regulator(TWL6030_REG_VDD1, pdata->vdd1,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VDD2, pdata->vdd2,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VDD3, pdata->vdd3,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_V1V8, pdata->v1v8,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_V2V1, pdata->v2v1,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VMMC, pdata->vmmc,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VPP, pdata->vpp,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VUSIM, pdata->vusim,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VCXIO, pdata->vcxio,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VDAC, pdata->vdac,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VAUX1_6030, pdata->vaux1,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VAUX2_6030, pdata->vaux2,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_VAUX3_6030, pdata->vaux3,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6030_REG_CLK32KG, pdata->clk32kg,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-       }
-
-       /* 6030 and 6025 share this regulator */
-       if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030()) {
-               child = add_regulator(TWL6030_REG_VANA, pdata->vana,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-       }
-
-       /* twl6032 regulators */
-       if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030() &&
-                       (features & TWL6032_SUBCLASS)) {
-               child = add_regulator(TWL6032_REG_LDO5, pdata->ldo5,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_LDO1, pdata->ldo1,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_LDO7, pdata->ldo7,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_LDO6, pdata->ldo6,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_LDOLN, pdata->ldoln,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_LDO2, pdata->ldo2,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_LDO4, pdata->ldo4,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_LDO3, pdata->ldo3,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_SMPS3, pdata->smps3,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_SMPS4, pdata->smps4,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-               child = add_regulator(TWL6032_REG_VIO, pdata->vio6025,
-                                       features);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
-       }
-
        if (IS_ENABLED(CONFIG_CHARGER_TWL4030) && pdata->bci &&
                        !(features & (TPS_SUBSET | TWL5031))) {
                child = add_child(TWL_MODULE_MAIN_CHARGE, "twl4030_bci",