projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f40dff9
)
mfd: Enabling twl4030_wdt and pwrbutton only for Triton
author
Keerthy
<
[email protected]
>
Wed, 23 Feb 2011 10:56:54 +0000
(16:26 +0530)
committer
Samuel Ortiz
<
[email protected]
>
Wed, 23 Mar 2011 09:41:49 +0000
(10:41 +0100)
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 <
[email protected]
>
Reviewed-by: Balaji T K <
[email protected]
>
Signed-off-by: Samuel Ortiz <
[email protected]
>
drivers/mfd/twl-core.c
patch
|
blob
|
history
diff --git
a/drivers/mfd/twl-core.c
b/drivers/mfd/twl-core.c
index 7d909cc8670d0a050a66a7279246269086a13477..960b5bed7f5237afdd769583db90908ed7a45fca 100644
(file)
--- 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))