devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Dmitry Torokhov <dtor@mail.ru>,
	Grant Likely <grant.likely@secretlab.ca>,
	Rob Herring <rob.herring@calxeda.com>
Cc: Tero Kristo <t-kristo@ti.com>,
	alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	devicetree-discuss@lists.ozlabs.org,
	Benoit Cousson <b-cousson@ti.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v3 08/14] Input: twl4030-vibra: Support for DT booted kernel
Date: Thu,  6 Sep 2012 15:12:15 +0300	[thread overview]
Message-ID: <1346933541-21547-9-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1346933541-21547-1-git-send-email-peter.ujfalusi@ti.com>

Add support when the kernel has been booted with DT blob. In this case the
pdata is NULL, we need to reach up to the core node and check if the codec
part has been enabled to determine if we need to coexist with the codec or
not.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 drivers/input/misc/twl4030-vibra.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index fc0ed9b..15620f8 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/workqueue.h>
 #include <linux/i2c/twl.h>
 #include <linux/mfd/twl4030-audio.h>
@@ -194,13 +195,28 @@ static int twl4030_vibra_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
 			 twl4030_vibra_suspend, twl4030_vibra_resume);
 
+static bool twl4030_vibra_check_coexist(struct twl4030_vibra_data *pdata,
+			      struct device_node *node)
+{
+	if (pdata && pdata->coexist)
+		return true;
+
+#ifdef CONFIG_OF
+	if (of_find_node_by_name(node, "codec"))
+		return true;
+#endif
+
+	return false;
+}
+
 static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
 {
 	struct twl4030_vibra_data *pdata = pdev->dev.platform_data;
+	struct device_node *twl4030_core_node = pdev->dev.parent->of_node;
 	struct vibra_info *info;
 	int ret;
 
-	if (!pdata) {
+	if (!pdata && !twl4030_core_node) {
 		dev_dbg(&pdev->dev, "platform_data not available\n");
 		return -EINVAL;
 	}
@@ -210,7 +226,7 @@ static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	info->dev = &pdev->dev;
-	info->coexist = pdata->coexist;
+	info->coexist = twl4030_vibra_check_coexist(pdata, twl4030_core_node);
 	INIT_WORK(&info->play_work, vibra_play_work);
 
 	info->input_dev = input_allocate_device();
-- 
1.7.12


  parent reply	other threads:[~2012-09-06 12:12 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-06 12:12 [PATCH v3 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 01/14] MFD: twl4030-audio: Clean up MODULE_* and platform_driver part Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 03/14] MFD: twl4030-audio: Rearange and clean-up the probe function Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 04/14] MFD: twl-core: Add API to query the HFCLK rate Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 05/14] MFD: twl4030-audio: Get audio MCLK via twl-core API instead of pdata Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 06/14] dt: Add empty of_find_node_by_name() function Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 07/14] MFD: twl4030-audio: Add DT support Peter Ujfalusi
2012-09-06 12:12 ` Peter Ujfalusi [this message]
2012-09-06 16:19   ` [PATCH v3 08/14] Input: twl4030-vibra: Support for DT booted kernel Dmitry Torokhov
2012-09-07 13:35     ` Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 09/14] ASoC: twl4030: Move hs_extmute GPIO handling to driver Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 10/14] ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO Peter Ujfalusi
2012-09-06 21:02   ` Tony Lindgren
2012-09-06 12:12 ` [PATCH v3 11/14] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 12/14] ASoC: twl4030: Convert to use devm_kzalloc Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 13/14] ASoC: twl4030: Add pointer to pdata within the private data Peter Ujfalusi
2012-09-06 12:12 ` [PATCH v3 14/14] ASoC: twl4030: Support for DT booted kernel Peter Ujfalusi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1346933541-21547-9-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=b-cousson@ti.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=dtor@mail.ru \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=rob.herring@calxeda.com \
    --cc=sameo@linux.intel.com \
    --cc=t-kristo@ti.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).