This way, we can add custom flags for VDD1 and VDD2 regulators that get passed all the way to regulator init. This is needed for SMPS regulator support to select used controller mode for these regulators (either voltage processor or default.) Signed-off-by: Tero Kristo <t-kristo@xxxxxx> Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> --- drivers/mfd/twl-core.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 01ecfee..af93fce 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -846,12 +846,14 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) return PTR_ERR(child); child = add_regulator(TWL4030_REG_VDD1, pdata->vdd1, - features); + features | + (u32)pdata->vdd1->driver_data); if (IS_ERR(child)) return PTR_ERR(child); child = add_regulator(TWL4030_REG_VDD2, pdata->vdd2, - features); + features | + (u32)pdata->vdd2->driver_data); if (IS_ERR(child)) return PTR_ERR(child); -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html