* [PATCH] mfd: twl4030: Enabling twl4030_wdt and pwrbutton only for Triton
@ 2011-02-23 10:56 Keerthy
2011-02-28 1:05 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: Keerthy @ 2011-02-23 10:56 UTC (permalink / raw)
To: sameo; +Cc: linux-omap, j-keerthy
Enabling twl4030_wdt and twl4030_pwrbutton only for Triton i.e for
TWL4030 and TWL5030. This is to be excluded for Phoenix TWL6030.
Tested OMAP4 blaze, OMAP2430, OMAP3630 boot up.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Balaji T K <balajitk@ti.com>
---
drivers/mfd/twl-core.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index a35fa7d..8051346 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -721,13 +721,13 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
}
- if (twl_has_watchdog()) {
+ if (twl_has_watchdog() && twl_class_is_4030()) {
child = add_child(0, "twl4030_wdt", NULL, 0, false, 0, 0);
if (IS_ERR(child))
return PTR_ERR(child);
}
- if (twl_has_pwrbutton()) {
+ if (twl_has_pwrbutton() && twl_class_is_4030()) {
child = add_child(1, "twl4030_pwrbutton",
NULL, 0, true, pdata->irq_base + 8 + 0, 0);
if (IS_ERR(child))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mfd: twl4030: Enabling twl4030_wdt and pwrbutton only for Triton
2011-02-23 10:56 [PATCH] mfd: twl4030: Enabling twl4030_wdt and pwrbutton only for Triton Keerthy
@ 2011-02-28 1:05 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2011-02-28 1:05 UTC (permalink / raw)
To: Keerthy; +Cc: linux-omap
Hi Keerthy,
On Wed, Feb 23, 2011 at 04:26:54PM +0530, Keerthy wrote:
> Enabling twl4030_wdt and twl4030_pwrbutton only for Triton i.e for
> TWL4030 and TWL5030. This is to be excluded for Phoenix TWL6030.
> Tested OMAP4 blaze, OMAP2430, OMAP3630 boot up.
Patch applied, thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-28 1:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-23 10:56 [PATCH] mfd: twl4030: Enabling twl4030_wdt and pwrbutton only for Triton Keerthy
2011-02-28 1:05 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox