Re: [PATCH 08/30] ARM: omap2+: fix building without i2c
On Sunday 02 October 2011 19:31:25 Paul Walmsley wrote: Nice catch. I think the bug is different, though. omap_i2c_reset should never be NULL: that code is intended to execute even when CONFIG_I2C_OMAP=n. The idea is to prevent the IP block from interfering with the rest of the kernel even if the driver is not compiled in, no matter how the bootloader or previous OS programmed the IP block. I'd suggest something like the following patch instead. - Paul From: Paul Walmsley p...@pwsan.com Date: Sun, 2 Oct 2011 19:15:10 -0600 Subject: [PATCH] ARM: omap2+: fix build breakage when CONFIG_I2C_OMAP=n arch/arm/mach-omap2/Makefile incorrectly skips compilation of the I2C IP block reset code when CONFIG_I2C_OMAP=n. Fix by unconditionally compiling arch/arm/mach-omap2/i2c.o, which is needed on all OMAP2+ platforms. Problem noted by Arnd Bergmann a...@arndb.de. Ok, looks better. You should also drop patch 6 ARM: omap: fix build with CONFIG_I2C_OMAP disabled then. Acked-by: Arnd Bergmann a...@arndb.de -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 08/30] ARM: omap2+: fix building without i2c
* Arnd Bergmann a...@arndb.de [111003 02:15]: On Sunday 02 October 2011 19:31:25 Paul Walmsley wrote: Nice catch. I think the bug is different, though. omap_i2c_reset should never be NULL: that code is intended to execute even when CONFIG_I2C_OMAP=n. The idea is to prevent the IP block from interfering with the rest of the kernel even if the driver is not compiled in, no matter how the bootloader or previous OS programmed the IP block. I'd suggest something like the following patch instead. - Paul From: Paul Walmsley p...@pwsan.com Date: Sun, 2 Oct 2011 19:15:10 -0600 Subject: [PATCH] ARM: omap2+: fix build breakage when CONFIG_I2C_OMAP=n arch/arm/mach-omap2/Makefile incorrectly skips compilation of the I2C IP block reset code when CONFIG_I2C_OMAP=n. Fix by unconditionally compiling arch/arm/mach-omap2/i2c.o, which is needed on all OMAP2+ platforms. Problem noted by Arnd Bergmann a...@arndb.de. Ok, looks better. You should also drop patch 6 ARM: omap: fix build with CONFIG_I2C_OMAP disabled then. Acked-by: Arnd Bergmann a...@arndb.de Arnd I suggest you replace your patch with this in your branch. Acked-by: Tony Lindgren t...@atomide.com -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 08/30] ARM: omap2+: fix building without i2c
A trivial typo causes build breakage when I2C is disabled
and omap_i2c_reset is set to NULL on OMAP:
omap_hwmod_44xx_data.c:2287:11: error: lvalue required as unary '' operand
Removing the '' character solves this.
Signed-off-by: Arnd Bergmann a...@arndb.de
Cc: Avinash.H.M avinas...@ti.com
Cc: Paul Walmsley p...@pwsan.com
---
arch/arm/mach-omap2/omap_hwmod_2420_data.c |2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c |2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index a015c69..3aa6c62 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -1030,7 +1030,7 @@ static struct omap_hwmod_class i2c_class = {
.name = i2c,
.sysc = i2c_sysc,
.rev= OMAP_I2C_IP_VERSION_1,
- .reset = omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 16743c7..d9ab245 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -1079,7 +1079,7 @@ static struct omap_hwmod_class i2c_class = {
.name = i2c,
.sysc = i2c_sysc,
.rev= OMAP_I2C_IP_VERSION_1,
- .reset = omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 25bf43b..b0a0113 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1309,7 +1309,7 @@ static struct omap_hwmod_class i2c_class = {
.name = i2c,
.sysc = i2c_sysc,
.rev= OMAP_I2C_IP_VERSION_1,
- .reset = omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_hwmod_dma_info omap3xxx_dss_sdma_chs[] = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 6201422..a6d42fc 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2284,7 +2284,7 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class =
{
.name = i2c,
.sysc = omap44xx_i2c_sysc,
.rev= OMAP_I2C_IP_VERSION_2,
- .reset = omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
--
1.7.5.4
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 08/30] ARM: omap2+: fix building without i2c
Hello Arnd, On Sun, 2 Oct 2011, Arnd Bergmann wrote: A trivial typo causes build breakage when I2C is disabled and omap_i2c_reset is set to NULL on OMAP: omap_hwmod_44xx_data.c:2287:11: error: lvalue required as unary '' operand Removing the '' character solves this. Signed-off-by: Arnd Bergmann a...@arndb.de Cc: Avinash.H.M avinas...@ti.com Cc: Paul Walmsley p...@pwsan.com Nice catch. I think the bug is different, though. omap_i2c_reset should never be NULL: that code is intended to execute even when CONFIG_I2C_OMAP=n. The idea is to prevent the IP block from interfering with the rest of the kernel even if the driver is not compiled in, no matter how the bootloader or previous OS programmed the IP block. I'd suggest something like the following patch instead. - Paul From: Paul Walmsley p...@pwsan.com Date: Sun, 2 Oct 2011 19:15:10 -0600 Subject: [PATCH] ARM: omap2+: fix build breakage when CONFIG_I2C_OMAP=n arch/arm/mach-omap2/Makefile incorrectly skips compilation of the I2C IP block reset code when CONFIG_I2C_OMAP=n. Fix by unconditionally compiling arch/arm/mach-omap2/i2c.o, which is needed on all OMAP2+ platforms. Problem noted by Arnd Bergmann a...@arndb.de. Signed-off-by: Paul Walmsley p...@pwsan.com Cc: Avinash.H.M avinas...@ti.com Cc: Arnd Bergmann a...@arndb.de Cc: Tony Lindgren t...@atomide.com --- arch/arm/mach-omap2/Makefile |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index f343365..0951986 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ -common.o gpio.o dma.o wd_timer.o +common.o gpio.o dma.o wd_timer.o i2c.o omap-2-3-common= irq.o sdrc.o hwmod-common = omap_hwmod.o \ @@ -175,9 +175,6 @@ obj-$(CONFIG_OMAP_IOMMU)+= iommu2.o iommu-$(CONFIG_OMAP_IOMMU) := omap-iommu.o obj-y += $(iommu-m) $(iommu-y) -i2c-omap-$(CONFIG_I2C_OMAP):= i2c.o -obj-y += $(i2c-omap-m) $(i2c-omap-y) - ifneq ($(CONFIG_TIDSPBRIDGE),) obj-y += dsp.o endif -- 1.7.6.3 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
