Commit b25c4607 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'cleanup-fixes-for-v3.7' of... 

Merge tag 'cleanup-fixes-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:

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.

* tag 'cleanup-fixes-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3
  ARM: OMAP2+: Enable pinctrl dummy states
  mfd: Fix compile for twl-core.c by removing cpu_is_omap usage
parents 3a839ce4 de6ca33a

arch/arm/mach-omap1/board-h2.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/i2c/tps65010.h>

#include <linux/smc91x.h>

#include <linux/omapfb.h>

#include <linux/platform_data/gpio-omap.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-omap1/board-h3.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/i2c/tps65010.h>

#include <linux/smc91x.h>

#include <linux/omapfb.h>

#include <linux/platform_data/gpio-omap.h>



#include <asm/setup.h>

#include <asm/page.h>

arch/arm/mach-omap2/clock2430_data.c

+1 −0
Original line number Diff line number Diff line
@@ -1856,6 +1856,7 @@ static struct omap_clk omap2430_clks[] = { 
	CLK(NULL,	"func_32k_ck",	&func_32k_ck,	CK_243X),

	CLK(NULL,	"secure_32k_ck", &secure_32k_ck, CK_243X),

	CLK(NULL,	"osc_ck",	&osc_ck,	CK_243X),

	CLK("twl",	"fck",		&osc_ck,	CK_243X),

	CLK(NULL,	"sys_ck",	&sys_ck,	CK_243X),

	CLK(NULL,	"alt_ck",	&alt_ck,	CK_243X),

	CLK(NULL,	"mcbsp_clks",	&mcbsp_clks,	CK_243X),

arch/arm/mach-omap2/clock3xxx_data.c

+1 −0
Original line number Diff line number Diff line
@@ -3226,6 +3226,7 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"virt_26000000_ck",	&virt_26000000_ck,	CK_3XXX),

	CLK(NULL,	"virt_38_4m_ck", &virt_38_4m_ck, CK_3XXX),

	CLK(NULL,	"osc_sys_ck",	&osc_sys_ck,	CK_3XXX),

	CLK("twl",	"fck",		&osc_sys_ck,	CK_3XXX),

	CLK(NULL,	"sys_ck",	&sys_ck,	CK_3XXX),

	CLK(NULL,	"sys_altclk",	&sys_altclk,	CK_3XXX),

	CLK(NULL,	"mcbsp_clks",	&mcbsp_clks,	CK_3XXX),

arch/arm/mach-omap2/devices.c

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/err.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/pinctrl/machine.h>

#include <linux/platform_data/omap4-keypad.h>



#include <asm/mach-types.h>
@@ -627,6 +628,10 @@ static inline void omap_init_vout(void) {} 


static int __init omap2_init_devices(void)

{

	/* Enable dummy states for those platforms without pinctrl support */

	if (!of_have_populated_dt())

		pinctrl_provide_dummies();



	/*

	 * please keep these calls, and their implementations above,

	 * in alphabetical order so they're easier to sort through.

CRA Git | Maintained and supported by SUSTech CRA and CCSE