All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Samuel Ortiz <sameo@linux.intel.com>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
	Dmitry Torokhov <dtor@mail.ru>
Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	devicetree-discuss@lists.ozlabs.org,
	Benoit Cousson <b-cousson@ti.com>
Subject: [PATCH 05/11] Input: twl4030-vibra: Support for DT booted kernel
Date: Wed,  8 Aug 2012 12:41:21 +0300	[thread overview]
Message-ID: <1344418887-5262-6-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1344418887-5262-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 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index d1e1a7e..2cfc6c7 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.8.6


WARNING: multiple messages have this Message-ID (diff)
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Samuel Ortiz <sameo@linux.intel.com>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
	Dmitry Torokhov <dtor@mail.ru>
Cc: alsa-devel@alsa-project.org, Benoit Cousson <b-cousson@ti.com>,
	devicetree-discuss@lists.ozlabs.org,
	linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
	linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/11] Input: twl4030-vibra: Support for DT booted kernel
Date: Wed,  8 Aug 2012 12:41:21 +0300	[thread overview]
Message-ID: <1344418887-5262-6-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1344418887-5262-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 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index d1e1a7e..2cfc6c7 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.8.6

WARNING: multiple messages have this Message-ID (diff)
From: peter.ujfalusi@ti.com (Peter Ujfalusi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/11] Input: twl4030-vibra: Support for DT booted kernel
Date: Wed,  8 Aug 2012 12:41:21 +0300	[thread overview]
Message-ID: <1344418887-5262-6-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1344418887-5262-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 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index d1e1a7e..2cfc6c7 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.8.6

  parent reply	other threads:[~2012-08-08  9:44 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-08  9:41 [PATCH 00/11] MFD/ASoC/Input: twl4030-audio submodule DT support Peter Ujfalusi
2012-08-08  9:41 ` Peter Ujfalusi
2012-08-08  9:41 ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 01/11] MFD: twl4030-audio: Clean up MODULE_* and platform_driver part Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 02/11] MFD: twl4030-audio: Convert to use devm_kzalloc Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 03/11] MFD: twl4030-audio: Rearange and clean-up the probe function Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 04/11] MFD: twl4030-audio: Add DT support Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08 11:50   ` Benoit Cousson
2012-08-08 11:50     ` Benoit Cousson
2012-08-08 11:50     ` Benoit Cousson
2012-08-08 12:43     ` Peter Ujfalusi
2012-08-08 12:43       ` Peter Ujfalusi
2012-08-08 12:43       ` Peter Ujfalusi
2012-08-08 12:52     ` Mark Brown
2012-08-08 12:52       ` Mark Brown
2012-08-08 14:35       ` Peter Ujfalusi
2012-08-08 14:35         ` Peter Ujfalusi
2012-08-08 14:35         ` Peter Ujfalusi
2012-08-08 14:39         ` Mark Brown
2012-08-08 14:39           ` Mark Brown
2012-08-08 14:39           ` Mark Brown
2012-08-08 15:41         ` Benoit Cousson
2012-08-08 15:41           ` Benoit Cousson
2012-08-08 15:41           ` Benoit Cousson
2012-08-08 13:13   ` Mark Brown
2012-08-08 13:13     ` Mark Brown
2012-08-08 13:43     ` Peter Ujfalusi
2012-08-08 13:43       ` Peter Ujfalusi
2012-08-08 13:43       ` Peter Ujfalusi
2012-08-08 13:52       ` Mark Brown
2012-08-08 13:52         ` Mark Brown
2012-08-08 13:52         ` Mark Brown
2012-08-08 14:16         ` Peter Ujfalusi
2012-08-08 14:16           ` Peter Ujfalusi
2012-08-08 14:16           ` Peter Ujfalusi
2012-08-08 14:18           ` Mark Brown
2012-08-08 14:18             ` Mark Brown
2012-08-08 14:18             ` Mark Brown
2012-08-08 14:31             ` Peter Ujfalusi
2012-08-08 14:31               ` Peter Ujfalusi
2012-08-08 14:49               ` Mark Brown
2012-08-08 14:49                 ` Mark Brown
2012-08-08 14:49                 ` Mark Brown
2012-08-09 10:18                 ` Peter Ujfalusi
2012-08-09 10:18                   ` Peter Ujfalusi
2012-08-09 10:18                   ` Peter Ujfalusi
2012-08-09 10:36                   ` Mark Brown
2012-08-09 10:36                     ` Mark Brown
2012-08-09 10:36                     ` Mark Brown
2012-08-09 13:53                     ` Peter Ujfalusi
2012-08-09 13:53                       ` Peter Ujfalusi
2012-08-09 13:53                       ` Peter Ujfalusi
2012-08-12 18:50                       ` Mark Brown
2012-08-12 18:50                         ` Mark Brown
2012-08-12 18:50                         ` Mark Brown
2012-08-08  9:41 ` Peter Ujfalusi [this message]
2012-08-08  9:41   ` [PATCH 05/11] Input: twl4030-vibra: Support for DT booted kernel Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 06/11] ASoC: twl4030: Move hs_extmute GPIO handling to driver Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 07/11] ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-10  6:28   ` Tony Lindgren
2012-08-10  6:28     ` Tony Lindgren
2012-08-08  9:41 ` [PATCH 08/11] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 09/11] ASoC: twl4030: Convert to use devm_kzalloc Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 10/11] ASoC: twl4030: Add pointer to pdata within the private data Peter Ujfalusi
2012-08-08  9:41   ` Peter Ujfalusi
2012-08-08  9:41 ` [PATCH 11/11] ASoC: twl4030: Support for DT booted kernel Peter Ujfalusi
2012-08-08  9:41   ` 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=1344418887-5262-6-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=linux-arm-kernel@lists.infradead.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=sameo@linux.intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.