* [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits @ 2011-08-05 7:05 Axel Lin 2011-08-05 7:24 ` Sam Ravnborg 2011-08-05 8:14 ` Ben Dooks 0 siblings, 2 replies; 5+ messages in thread From: Axel Lin @ 2011-08-05 7:05 UTC (permalink / raw) To: linux-kernel Cc: Colin Cross, John Bonesio, Jean Delvare (PC drivers, core), Ben Dooks (embedded platforms), Grant Likely, linux-i2c 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 <axel.lin@gmail.com> --- 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits 2011-08-05 7:05 [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits Axel Lin @ 2011-08-05 7:24 ` Sam Ravnborg 2011-08-05 8:14 ` Ben Dooks 1 sibling, 0 replies; 5+ messages in thread From: Sam Ravnborg @ 2011-08-05 7:24 UTC (permalink / raw) To: Axel Lin Cc: linux-kernel, Colin Cross, John Bonesio, Jean Delvare (PC drivers, core), Ben Dooks (embedded platforms), Grant Likely, linux-i2c On Fri, Aug 05, 2011 at 03:05:21PM +0800, Axel Lin wrote: > 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 <axel.lin@gmail.com> > --- > 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) It would be better to add a dummy implementation of of_get_property() in of.h. Thus we do not need the ifdeffery and all users benefits from this. Sam ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits 2011-08-05 7:05 [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits Axel Lin 2011-08-05 7:24 ` Sam Ravnborg @ 2011-08-05 8:14 ` Ben Dooks 2011-08-05 15:55 ` Stephen Warren 2011-08-05 22:33 ` Stephen Warren 1 sibling, 2 replies; 5+ messages in thread From: Ben Dooks @ 2011-08-05 8:14 UTC (permalink / raw) To: Axel Lin Cc: linux-kernel, Colin Cross, John Bonesio, Jean Delvare (PC drivers, core), Ben Dooks (embedded platforms), Grant Likely, linux-i2c On Fri, Aug 05, 2011 at 03:05:21PM +0800, Axel Lin wrote: > 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 It might be worth asking Grant if providing stubs for the of_ calls are as good idea, I'd like to avoid having #ifdef CONFIG_OF splattered around the place (it leads to errors). > 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 <axel.lin@gmail.com> > --- > 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 > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-i2c" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear. ^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits 2011-08-05 8:14 ` Ben Dooks @ 2011-08-05 15:55 ` Stephen Warren 2011-08-05 22:33 ` Stephen Warren 1 sibling, 0 replies; 5+ messages in thread From: Stephen Warren @ 2011-08-05 15:55 UTC (permalink / raw) To: Ben Dooks, Axel Lin Cc: linux-kernel@vger.kernel.org, Colin Cross, John Bonesio, Jean Delvare (PC drivers, core), Ben Dooks (embedded platforms), Grant Likely, linux-i2c@vger.kernel.org Ben Dooks wrote at Friday, August 05, 2011 2:15 AM: > On Fri, Aug 05, 2011 at 03:05:21PM +0800, Axel Lin wrote: > > 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 I posted essentially this patch (minus the variable move) in mid-July: http://www.spinics.net/lists/linux-i2c/msg05870.html > It might be worth asking Grant if providing stubs for the of_ calls are > as good idea, I'd like to avoid having #ifdef CONFIG_OF splattered around > the place (it leads to errors). > > > 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 <axel.lin@gmail.com> > > --- > > 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 > > > > > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-i2c" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/ > > Large Hadron Colada: A large Pina Colada that makes the universe disappear. > > -- > To unsubscribe from this list: send the line "unsubscribe linux-i2c" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits 2011-08-05 8:14 ` Ben Dooks 2011-08-05 15:55 ` Stephen Warren @ 2011-08-05 22:33 ` Stephen Warren 1 sibling, 0 replies; 5+ messages in thread From: Stephen Warren @ 2011-08-05 22:33 UTC (permalink / raw) To: Ben Dooks, Axel Lin, Grant Likely Cc: linux-kernel@vger.kernel.org, Colin Cross, John Bonesio, Jean Delvare (PC drivers, core), Ben Dooks (embedded platforms), linux-i2c@vger.kernel.org, linux-tegra@vger.kernel.org Ben Dooks wrote at Friday, August 05, 2011 2:15 AM: > On Fri, Aug 05, 2011 at 03:05:21PM +0800, Axel Lin wrote: > > 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 > > It might be worth asking Grant if providing stubs for the of_ calls are > as good idea, I'd like to avoid having #ifdef CONFIG_OF splattered around > the place (it leads to errors). When I first proposed the patch below, Grant said: > ... I've been avoiding creating a > dummy inline of of_get_property(), but not for any particularly strong > reason other than to avoid bloating linux/of.h. I probably would > accept a patch that added it. So, I'll go ahead and whip up a patch to do that instead, since Ben would prefer not to have the ifdefs in the I2C driver. > > 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 <axel.lin@gmail.com> > > --- > > 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 -- nvpublic ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-08-05 22:34 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-08-05 7:05 [PATCH] i2c: tegra: Add CONFIG_OF guards for device tree bits Axel Lin 2011-08-05 7:24 ` Sam Ravnborg 2011-08-05 8:14 ` Ben Dooks 2011-08-05 15:55 ` Stephen Warren 2011-08-05 22:33 ` Stephen Warren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox