diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-06-27 13:13:36 -0500 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 13:00:00 +0200 |
| commit | ec106a8a9d1ce883057a432a2891aab768ed8d67 (patch) | |
| tree | db92780d9627071d94f3acb15446fa02bf79fc8e /drivers/mfd | |
| parent | aca0906b8a11f139c0914ec9b121212d36cbcc4c (diff) | |
| download | kernel_samsung_tuna-ec106a8a9d1ce883057a432a2891aab768ed8d67.tar.gz kernel_samsung_tuna-ec106a8a9d1ce883057a432a2891aab768ed8d67.tar.bz2 kernel_samsung_tuna-ec106a8a9d1ce883057a432a2891aab768ed8d67.zip | |
[Blaze] Add power button support for the twl6030
Add the power button support for the twl6030
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl-core.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 96383d1bc66..24c64675b4e 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -137,6 +137,13 @@ #define twl_has_pwrbutton() false #endif +#if defined(CONFIG_INPUT_TWL6030_PWRBUTTON) \ + || defined(CONFIG_INPUT_TWL6030_PWRBUTTON_MODULE) +#define twl6030_has_pwrbutton() true +#else +#define twl6030_has_pwrbutton() false +#endif + #define SUB_CHIP_ID0 0 #define SUB_CHIP_ID1 1 #define SUB_CHIP_ID2 2 @@ -830,6 +837,13 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) return PTR_ERR(child); } + if (twl6030_has_pwrbutton()) { + child = add_child(1, "twl6030_pwrbutton", + NULL, 0, true, pdata->irq_base, 0); + if (IS_ERR(child)) + return PTR_ERR(child); + } + if (twl_has_codec() && pdata->codec && twl_class_is_4030()) { sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid; child = add_child(sub_chip_id, "twl4030-audio", |