From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753990Ab1HEHFv (ORCPT ); Fri, 5 Aug 2011 03:05:51 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:49106 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752165Ab1HEHFt (ORCPT ); Fri, 5 Aug 2011 03:05:49 -0400 Subject: [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Colin Cross , John Bonesio , "Jean Delvare (PC drivers, core)" , "Ben Dooks (embedded platforms)" , Grant Likely , linux-i2c@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Date: Fri, 05 Aug 2011 15:05:21 +0800 Message-ID: <1312527921.21955.2.camel@phoenix> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The device tree bits need to be protected by CONFIG_OF guards. This patch fixes below build error with "make tegra_defconfig;make". CC drivers/i2c/busses/i2c-tegra.o drivers/i2c/busses/i2c-tegra.c: In function 'tegra_i2c_probe': drivers/i2c/busses/i2c-tegra.c:615: error: implicit declaration of function 'of_get_property' drivers/i2c/busses/i2c-tegra.c:616: warning: assignment makes pointer from integer without a cast make[3]: *** [drivers/i2c/busses/i2c-tegra.o] Error 1 make[2]: *** [drivers/i2c/busses] Error 2 make[1]: *** [drivers/i2c] Error 2 make: *** [drivers] Error 2 Signed-off-by: Axel Lin --- drivers/i2c/busses/i2c-tegra.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 0c6e840..1bfe85e 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -548,7 +548,6 @@ static int tegra_i2c_probe(struct platform_device *pdev) struct resource *iomem; struct clk *clk; struct clk *i2c_clk; - const unsigned int *prop; void *base; int irq; int ret = 0; @@ -611,11 +610,15 @@ static int tegra_i2c_probe(struct platform_device *pdev) if (pdata) { i2c_dev->bus_clk_rate = pdata->bus_clk_rate; +#ifdef CONFIG_OF } else if (i2c_dev->dev->of_node) { /* if there is a device tree node ... */ + const unsigned int *prop; + prop = of_get_property(i2c_dev->dev->of_node, "clock-frequency", NULL); if (prop) i2c_dev->bus_clk_rate = be32_to_cpup(prop); +#endif } if (pdev->id == 3) -- 1.7.4.1