From patchwork Fri Aug 2 10:38:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 2837793 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 996449F479 for ; Fri, 2 Aug 2013 10:39:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A23092054F for ; Fri, 2 Aug 2013 10:39:41 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3765B20527 for ; Fri, 2 Aug 2013 10:39:40 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5Cll-0005u9-GO; Fri, 02 Aug 2013 10:39:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5Clj-0005yP-Bq; Fri, 02 Aug 2013 10:39:35 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5Clf-0005x9-Cg for linux-arm-kernel@lists.infradead.org; Fri, 02 Aug 2013 10:39:32 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1V5Cl7-0005Sv-EV; Fri, 02 Aug 2013 12:38:57 +0200 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1V5Cl6-0000UV-VA; Fri, 02 Aug 2013 12:38:56 +0200 From: Markus Pargmann To: Sascha Hauer Subject: [PATCH 2/7] pinctrl: imx header, conditional probe functions Date: Fri, 2 Aug 2013 12:38:22 +0200 Message-Id: <1375439907-10462-3-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 1.8.4.rc0 In-Reply-To: <1375439907-10462-1-git-send-email-mpa@pengutronix.de> References: <1375439907-10462-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130802_063931_736121_7A4392D1 X-CRM114-Status: GOOD ( 12.28 ) X-Spam-Score: -3.4 (---) Cc: devicetree@vger.kernel.org, Linus Walleij , Rob Herring , Markus Pargmann , Grant Likely , Shawn Guo , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The functions are not available if included by imx1 core driver. Signed-off-by: Markus Pargmann --- drivers/pinctrl/pinctrl-imx.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pinctrl/pinctrl-imx.h b/drivers/pinctrl/pinctrl-imx.h index bcedd99..446fc01 100644 --- a/drivers/pinctrl/pinctrl-imx.h +++ b/drivers/pinctrl/pinctrl-imx.h @@ -89,7 +89,11 @@ struct imx_pinctrl_soc_info { #define IMX_MUX_MASK 0x7 #define IOMUXC_CONFIG_SION (0x1 << 4) +#if IS_ENABLED(PINCTRL_IMX) + int imx_pinctrl_probe(struct platform_device *pdev, struct imx_pinctrl_soc_info *info); int imx_pinctrl_remove(struct platform_device *pdev); + +#endif #endif /* __DRIVERS_PINCTRL_IMX_H */