diff options
Diffstat (limited to 'drivers/input/misc/twl4030-vibra.c')
-rw-r--r-- | drivers/input/misc/twl4030-vibra.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index fc0ed9b43424..2194a3c7236a 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/jiffies.h> | 27 | #include <linux/jiffies.h> |
28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
29 | #include <linux/of.h> | ||
29 | #include <linux/workqueue.h> | 30 | #include <linux/workqueue.h> |
30 | #include <linux/i2c/twl.h> | 31 | #include <linux/i2c/twl.h> |
31 | #include <linux/mfd/twl4030-audio.h> | 32 | #include <linux/mfd/twl4030-audio.h> |
@@ -194,13 +195,26 @@ static int twl4030_vibra_resume(struct device *dev) | |||
194 | static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, | 195 | static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, |
195 | twl4030_vibra_suspend, twl4030_vibra_resume); | 196 | twl4030_vibra_suspend, twl4030_vibra_resume); |
196 | 197 | ||
198 | static bool twl4030_vibra_check_coexist(struct twl4030_vibra_data *pdata, | ||
199 | struct device_node *node) | ||
200 | { | ||
201 | if (pdata && pdata->coexist) | ||
202 | return true; | ||
203 | |||
204 | if (of_find_node_by_name(node, "codec")) | ||
205 | return true; | ||
206 | |||
207 | return false; | ||
208 | } | ||
209 | |||
197 | static int __devinit twl4030_vibra_probe(struct platform_device *pdev) | 210 | static int __devinit twl4030_vibra_probe(struct platform_device *pdev) |
198 | { | 211 | { |
199 | struct twl4030_vibra_data *pdata = pdev->dev.platform_data; | 212 | struct twl4030_vibra_data *pdata = pdev->dev.platform_data; |
213 | struct device_node *twl4030_core_node = pdev->dev.parent->of_node; | ||
200 | struct vibra_info *info; | 214 | struct vibra_info *info; |
201 | int ret; | 215 | int ret; |
202 | 216 | ||
203 | if (!pdata) { | 217 | if (!pdata && !twl4030_core_node) { |
204 | dev_dbg(&pdev->dev, "platform_data not available\n"); | 218 | dev_dbg(&pdev->dev, "platform_data not available\n"); |
205 | return -EINVAL; | 219 | return -EINVAL; |
206 | } | 220 | } |
@@ -210,7 +224,7 @@ static int __devinit twl4030_vibra_probe(struct platform_device *pdev) | |||
210 | return -ENOMEM; | 224 | return -ENOMEM; |
211 | 225 | ||
212 | info->dev = &pdev->dev; | 226 | info->dev = &pdev->dev; |
213 | info->coexist = pdata->coexist; | 227 | info->coexist = twl4030_vibra_check_coexist(pdata, twl4030_core_node); |
214 | INIT_WORK(&info->play_work, vibra_play_work); | 228 | INIT_WORK(&info->play_work, vibra_play_work); |
215 | 229 | ||
216 | info->input_dev = input_allocate_device(); | 230 | info->input_dev = input_allocate_device(); |