Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754455Ab2KMI3D (ORCPT ); Tue, 13 Nov 2012 03:29:03 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:60707 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979Ab2KMI27 (ORCPT ); Tue, 13 Nov 2012 03:28:59 -0500 From: Peter Ujfalusi To: Samuel Ortiz CC: Tero Kristo , , Subject: [PATCH 01/13] MFD: twl-core: Register twl4030-madc child only for twl4030 class Date: Tue, 13 Nov 2012 09:28:42 +0100 Message-ID: <1352795334-7406-2-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1352795334-7406-1-git-send-email-peter.ujfalusi@ti.com> References: <1352795334-7406-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1113 Lines: 31 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/