1 files changed, 24 insertions, 18 deletions

diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index c34f6c0371c4..c8a288ae1d5b 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -251,7 +251,6 @@ static int twl6040_vibra_suspend(struct device *dev)
 
         return 0;
 }
-
 #endif
 
 static SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops, twl6040_vibra_suspend, NULL);
@@ -259,13 +258,19 @@ static SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops, twl6040_vibra_suspend, NULL);
 static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
 {
         struct twl6040_vibra_data *pdata = pdev->dev.platform_data;
-        struct device_node *node = pdev->dev.of_node;
+        struct device *twl6040_core_dev = pdev->dev.parent;
+        struct device_node *twl6040_core_node = NULL;
         struct vibra_info *info;
         int vddvibl_uV = 0;
         int vddvibr_uV = 0;
         int ret;
 
-        if (!pdata && !node) {
+#ifdef CONFIG_OF
+        twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node,
+                                                 "vibra");
+#endif
+
+        if (!pdata && !twl6040_core_node) {
                 dev_err(&pdev->dev, "platform_data not available\n");
                 return -EINVAL;
         }
@@ -287,14 +292,18 @@ static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
                 vddvibl_uV = pdata->vddvibl_uV;
                 vddvibr_uV = pdata->vddvibr_uV;
         } else {
-                of_property_read_u32(node, "vibldrv_res", &info->vibldrv_res);
-                of_property_read_u32(node, "vibrdrv_res", &info->vibrdrv_res);
-                of_property_read_u32(node, "viblmotor_res",
+                of_property_read_u32(twl6040_core_node, "ti,vibldrv-res",
+                                     &info->vibldrv_res);
+                of_property_read_u32(twl6040_core_node, "ti,vibrdrv-res",
+                                     &info->vibrdrv_res);
+                of_property_read_u32(twl6040_core_node, "ti,viblmotor-res",
                                      &info->viblmotor_res);
-                of_property_read_u32(node, "vibrmotor_res",
+                of_property_read_u32(twl6040_core_node, "ti,vibrmotor-res",
                                      &info->vibrmotor_res);
-                of_property_read_u32(node, "vddvibl_uV", &vddvibl_uV);
-                of_property_read_u32(node, "vddvibr_uV", &vddvibr_uV);
+                of_property_read_u32(twl6040_core_node, "ti,vddvibl-uV",
+                                     &vddvibl_uV);
+                of_property_read_u32(twl6040_core_node, "ti,vddvibr-uV",
+                                     &vddvibr_uV);
         }
 
         if ((!info->vibldrv_res && !info->viblmotor_res) ||
@@ -351,8 +360,12 @@ static int __devinit twl6040_vibra_probe(struct platform_device *pdev)
 
         info->supplies[0].supply = "vddvibl";
         info->supplies[1].supply = "vddvibr";
-        ret = regulator_bulk_get(info->dev, ARRAY_SIZE(info->supplies),
-                                 info->supplies);
+        /*
+         * When booted with Device tree the regulators are attached to the
+         * parent device (twl6040 MFD core)
+         */
+        ret = regulator_bulk_get(pdata ? info->dev : twl6040_core_dev,
+                                 ARRAY_SIZE(info->supplies), info->supplies);
         if (ret) {
                 dev_err(info->dev, "couldn't get regulators %d\n", ret);
                 goto err_regulator;
@@ -418,12 +431,6 @@ static int __devexit twl6040_vibra_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct of_device_id twl6040_vibra_of_match[] = {
-        {.compatible = "ti,twl6040-vibra", },
-        { },
-};
-MODULE_DEVICE_TABLE(of, twl6040_vibra_of_match);
-
 static struct platform_driver twl6040_vibra_driver = {
         .probe          = twl6040_vibra_probe,
         .remove         = __devexit_p(twl6040_vibra_remove),
@@ -431,7 +438,6 @@ static struct platform_driver twl6040_vibra_driver = {
                 .name   = "twl6040-vibra",
                 .owner  = THIS_MODULE,
                 .pm     = &twl6040_vibra_pm_ops,
-                .of_match_table = twl6040_vibra_of_match,
         },
 };
 module_platform_driver(twl6040_vibra_driver);