mfd: Add twl4030-pwrbutton as a twl4030 child
authorFelipe Balbi <felipe.balbi@nokia.com>
Mon, 3 Aug 2009 16:16:38 +0000 (18:16 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 17 Sep 2009 07:46:52 +0000 (09:46 +0200)
Make that twl4030-pwrbutton.c driver probe with current
child creation api for twl4030.

Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/twl4030-core.c

index ca54996ffd0e74e4fe10362a50d5941bddd4e42f..1fd2620819d0fffd9c7f06f59f9a017f22b388f5 100644 (file)
 
 #define TWL4030_NUM_SLAVES             4
 
+#if defined(CONFIG_INPUT_TWL4030_PWRBUTTON) \
+       || defined(CONFIG_INPUT_TWL4030_PWBUTTON_MODULE)
+#define twl_has_pwrbutton()    true
+#else
+#define twl_has_pwrbutton()    false
+#endif
 
 /* Base Address defns for twl4030_map[] */
 
@@ -538,6 +544,13 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
                        return PTR_ERR(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);