From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Mon, 3 Oct 2011 10:56:08 -0700 Subject: [PATCH 08/30] ARM: omap2+: fix building without i2c In-Reply-To: <1443629.oeLM18uNcs@wuerfel> References: <1317566760-25681-1-git-send-email-arnd@arndb.de> <1317566760-25681-9-git-send-email-arnd@arndb.de> <1443629.oeLM18uNcs@wuerfel> Message-ID: <20111003175608.GS6324@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Arnd Bergmann [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 > > 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 . > > Ok, looks better. You should also drop patch 6 "ARM: omap: fix build with > CONFIG_I2C_OMAP disabled" then. > > Acked-by: Arnd Bergmann Arnd I suggest you replace your patch with this in your branch. Acked-by: Tony Lindgren