From patchwork Wed Feb 23 10:56:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J, KEERTHY" X-Patchwork-Id: 583911 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1NAtHws017901 for ; Wed, 23 Feb 2011 10:57:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753646Ab1BWK5S (ORCPT ); Wed, 23 Feb 2011 05:57:18 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:44280 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753356Ab1BWK5R (ORCPT ); Wed, 23 Feb 2011 05:57:17 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p1NAvDEO027005 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 23 Feb 2011 04:57:16 -0600 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p1NAvB70014068; Wed, 23 Feb 2011 16:27:12 +0530 (IST) From: Keerthy To: sameo@linux.intel.com Cc: linux-omap@vger.kernel.org, j-keerthy@ti.com Subject: [PATCH] mfd: twl4030: Enabling twl4030_wdt and pwrbutton only for Triton Date: Wed, 23 Feb 2011 16:26:54 +0530 Message-Id: <1298458614-22366-1-git-send-email-j-keerthy@ti.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Feb 2011 10:57:19 +0000 (UTC) diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index a35fa7d..8051346 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -721,13 +721,13 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) } - if (twl_has_watchdog()) { + if (twl_has_watchdog() && twl_class_is_4030()) { child = add_child(0, "twl4030_wdt", NULL, 0, false, 0, 0); if (IS_ERR(child)) return PTR_ERR(child); } - if (twl_has_pwrbutton()) { + if (twl_has_pwrbutton() && twl_class_is_4030()) { child = add_child(1, "twl4030_pwrbutton", NULL, 0, true, pdata->irq_base + 8 + 0, 0); if (IS_ERR(child))