The patch titled mfd: twl4030: add twl4030-pwrbutton as our child has been added to the -mm tree. Its filename is mfd-twl4030-add-twl4030-pwrbutton-as-our-child.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mfd: twl4030: add twl4030-pwrbutton as our child From: Felipe Balbi <felipe.balbi@xxxxxxxxx> Make the twl4030-pwrbutton.c driver probe with current child creation api for twl4030. Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxx> Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mfd/twl4030-core.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff -puN drivers/mfd/twl4030-core.c~mfd-twl4030-add-twl4030-pwrbutton-as-our-child drivers/mfd/twl4030-core.c --- a/drivers/mfd/twl4030-core.c~mfd-twl4030-add-twl4030-pwrbutton-as-our-child +++ a/drivers/mfd/twl4030-core.c @@ -101,6 +101,12 @@ #define twl_has_usb() false #endif +#if defined(CONFIG_INPUT_TWL4030_PWRBUTTON) \ + || defined(CONFIG_INPUT_TWL4030_PWBUTTON_MODULE) +#define twl_has_pwrbutton() true +#else +#define twl_has_pwrbutton() false +#endif /* Triton Core internal information (BEGIN) */ @@ -526,6 +532,13 @@ add_children(struct twl4030_platform_dat usb_transceiver = child; } + if (twl_has_pwrbutton()) { + child = add_child(1, "twl4030_pwrbutton", + NULL, 0, true, pdata->irq_base + 8 + 0, 0); + if (IS_ERR(child)) + return PTR_ERR(child); + } + if (twl_has_regulator()) { /* child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1); _ Patches currently in -mm which might be from felipe.balbi@xxxxxxxxx are linux-next.patch input-keyboard-introduce-lm8323-driver.patch input-keyboard-introduce-lm8323-driver-checkpatch-fixes.patch input-misc-add-twl4030-pwrbutton-driver.patch mfd-twl4030-add-twl4030-pwrbutton-as-our-child.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html