linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: Tero Kristo <t-kristo@ti.com>, <linux-omap@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: [PATCH 01/13] MFD: twl-core: Register twl4030-madc child only for twl4030 class
Date: Tue, 13 Nov 2012 09:28:42 +0100	[thread overview]
Message-ID: <1352795334-7406-2-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1352795334-7406-1-git-send-email-peter.ujfalusi@ti.com>

twl4030-madc driver can only handle twl4030 class MADC. The newer revisions
of twl does not have MADC, instead they have different IP called GPADC which
is not backward compatible.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 drivers/mfd/twl-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index a071a86..d7577cb 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -646,7 +646,8 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
 			return PTR_ERR(child);
 	}
 
-	if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc) {
+	if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc &&
+	    twl_class_is_4030()) {
 		child = add_child(2, "twl4030_madc",
 				pdata->madc, sizeof(*pdata->madc),
 				true, irq_base + MADC_INTR_OFFSET, 0);
-- 
1.8.0


  reply	other threads:[~2012-11-13  8:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-13  8:28 [PATCH 00/13] MFD: twl drivers: Convert to regmap IO and cleanups Peter Ujfalusi
2012-11-13  8:28 ` Peter Ujfalusi [this message]
2012-11-13  8:28 ` [PATCH 02/13] MFD: twl-core: Support for proper PWM drivers Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 03/13] MFD: twl-core: Convert to use regmap for I/O Peter Ujfalusi
2012-11-13  8:32   ` Mark Brown
2012-11-13  8:28 ` [PATCH 04/13] MFD/rtc/gpio: twl: No need to allocate bigger buffer for write Peter Ujfalusi
2012-11-15 14:08   ` Linus Walleij
2012-11-13  8:28 ` [PATCH 05/13] MFD: twl-core: Clean up and correct child registration Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 06/13] mfd: twl: Remove unused TWL_MODULE definitions Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 07/13] mfd: twl: Convert module id definitions to enums Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 08/13] mfd: twl: Use decimal numbers for TWL6030_MODULE_IDs Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 09/13] MFD: twl-core: re-group the twl_mapping table for easier reading Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 10/13] mfd: twl4030-madc: Change TWL4030_MODULE_* ids to TWL_MODULE_* Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 11/13] mfd: twl4030-power: " Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 12/13] mfd: twl4030-irq: " Peter Ujfalusi
2012-11-13  8:28 ` [PATCH 13/13] mfd: twl-core: " Peter Ujfalusi
2012-11-16 14:44 ` [PATCH 00/13] MFD: twl drivers: Convert to regmap IO and cleanups Tero Kristo
2012-11-21 14:54 ` Samuel Ortiz

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=1352795334-7406-2-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    --cc=t-kristo@ti.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).