From: Li Yang <leoli@freescale.com>
To: Wolfram Sang <wsa@the-dreams.de>
CC: <linux-i2c@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>, Li Yang <leoli@freescale.com>,
        "Gao Pan" <b54642@freescale.com>
Subject: [PATCH] i2c: imx: fix build issue for platforms without pinctrl
Date: Tue, 17 Nov 2015 15:11:15 -0600
Message-ID: <1447794675-19411-1-git-send-email-leoli@freescale.com>
MIME-Version: 1.0
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2015 21:27:39.5340
 (UTC)
X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB0855
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2729
Lines: 96

With commit 1c4b6c3b (i2c: imx: implement bus recovery) the driver
starts to use pinctrl to do i2c bus recovery.  But this breaks build
for platforms that don't implement pinctrl, such as ls1021a and
ls1043a.

This patch fix the problem by only compiling the bus recovery code
when CONFIG_PINCTRL is enabled.

Reported-by: Ren Xiaofeng <xiaofeng.ren@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Cc: Gao Pan <b54642@freescale.com>
---
 drivers/i2c/busses/i2c-imx.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 1e4d99d..614253a 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -208,11 +208,13 @@ struct imx_i2c_struct {
 	unsigned int		cur_clk;
 	unsigned int		bitrate;
 	const struct imx_i2c_hwdata	*hwdata;
+#ifdef CONFIG_PINCTRL
 	struct i2c_bus_recovery_info rinfo;
 
 	struct pinctrl *pinctrl;
 	struct pinctrl_state *pinctrl_pins_default;
 	struct pinctrl_state *pinctrl_pins_gpio;
+#endif
 
 	struct imx_i2c_dma	*dma;
 };
@@ -902,12 +904,14 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter,
 
 	/* Start I2C transfer */
 	result = i2c_imx_start(i2c_imx);
+#ifdef CONFIG_PINCTRL
 	if (result) {
 		if (i2c_imx->adapter.bus_recovery_info) {
 			i2c_recover_bus(&i2c_imx->adapter);
 			result = i2c_imx_start(i2c_imx);
 		}
 	}
+#endif
 
 	if (result)
 		goto fail0;
@@ -969,6 +973,7 @@ fail0:
 	return (result < 0) ? result : num;
 }
 
+#ifdef CONFIG_PINCTRL
 static void i2c_imx_prepare_recovery(struct i2c_adapter *adap)
 {
 	struct imx_i2c_struct *i2c_imx;
@@ -1017,6 +1022,7 @@ static void i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx,
 	rinfo->recover_bus = i2c_generic_gpio_recovery;
 	i2c_imx->adapter.bus_recovery_info = rinfo;
 }
+#endif
 
 static u32 i2c_imx_func(struct i2c_adapter *adapter)
 {
@@ -1086,11 +1092,13 @@ static int i2c_imx_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+#ifdef CONFIG_PINCTRL
 	i2c_imx->pinctrl = devm_pinctrl_get(&pdev->dev);
 	if (IS_ERR(i2c_imx->pinctrl)) {
 		ret = PTR_ERR(i2c_imx->pinctrl);
 		goto clk_disable;
 	}
+#endif
 
 	/* Request IRQ */
 	ret = devm_request_irq(&pdev->dev, irq, i2c_imx_isr, 0,
@@ -1125,7 +1133,9 @@ static int i2c_imx_probe(struct platform_device *pdev)
 		goto clk_disable;
 	}
 
+#ifdef CONFIG_PINCTRL
 	i2c_imx_init_recovery_info(i2c_imx, pdev);
+#endif
 
 	/* Set up platform driver data */
 	platform_set_drvdata(pdev, i2c_imx);
-- 
2.3.3

--
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/