| Message ID | 20120918022856.GN11762@atomide.com |
|---|---|
| State | New |
| Headers | show |
Hi, On Mon, Sep 17, 2012 at 7:28 PM, Tony Lindgren <tony@atomide.com> wrote: > Hi Arnd & Olof, > > Here is the fix for the twl-core compile on non-omap > platforms and few other fixes. > > This will probably cause a minor merge conflicts with > the led changes merged in the arm-soc next/drivers branch > as both linux/leds.h and linux/platform_data/gpio-omap.h > now need to be included. > > Regards, > > Tony > > > The following changes since commit 68cb700c59fae6cd539c9dc1e9f2584f671935a0: > > ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 (2012-09-12 18:06:31 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/cleanup-fixes-for-v3.7 Thanks, pulled in on top of next/cleanup. We might have missed the -next train for the day though. -Olof
Hi Arnd & Olof, Here is the fix for the twl-core compile on non-omap platforms and few other fixes. This will probably cause a minor merge conflicts with the led changes merged in the arm-soc next/drivers branch as both linux/leds.h and linux/platform_data/gpio-omap.h now need to be included. Regards, Tony The following changes since commit 68cb700c59fae6cd539c9dc1e9f2584f671935a0: ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 (2012-09-12 18:06:31 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/cleanup-fixes-for-v3.7 for you to fetch changes up to de6ca33a96a6bf61fcb91d3d399703e19ead9d1e: ARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3 (2012-09-17 16:28:03 -0700) ---------------------------------------------------------------- These fixes are needed to fix non-omap build breakage for twl-core driver and to fix omap1_defconfig compile when led driver changes and omap sparse IRQ changes are merged together. Also fix warnings for omaps not using pinctrl framework yet. ---------------------------------------------------------------- Matt Porter (1): ARM: OMAP2+: Enable pinctrl dummy states Tony Lindgren (2): mfd: Fix compile for twl-core.c by removing cpu_is_omap usage ARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3 arch/arm/mach-omap1/board-h2.c | 1 + arch/arm/mach-omap1/board-h3.c | 1 + arch/arm/mach-omap2/clock2430_data.c | 1 + arch/arm/mach-omap2/clock3xxx_data.c | 1 + arch/arm/mach-omap2/devices.c | 5 +++ drivers/mfd/twl-core.c | 56 ++++++++++++++++++---------------- 6 files changed, 39 insertions(+), 26 deletions(-)