Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6510e13e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Remove extra ifdefs for board-generic 



We need just one ifdef for each ARCH_OMAP2/3/4.

Also remove the comment about i2c & twl driver as it's
pretty obvious that we still need some platform data
until drivers are converted to device tree.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 75a57fe9

arch/arm/mach-omap2/board-generic.c

+32 −44
Original line number Diff line number Diff line
@@ -43,34 +43,6 @@ static void __init omap_init_irq(void) 
	of_irq_init(irq_match);

}



/*

 * XXX: Still needed to boot until the i2c & twl driver is adapted to

 * device-tree

 */

#ifdef CONFIG_ARCH_OMAP4

static struct twl4030_platform_data sdp4430_twldata = {

	.irq_base	= TWL6030_IRQ_BASE,

	.irq_end	= TWL6030_IRQ_END,

};



static void __init omap4_i2c_init(void)

{

	omap4_pmic_init("twl6030", &sdp4430_twldata);

}

#endif



#ifdef CONFIG_ARCH_OMAP3

static struct twl4030_platform_data beagle_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,

};



static void __init omap3_i2c_init(void)

{

	omap3_pmic_init("twl4030", &beagle_twldata);

}

#endif



static struct of_device_id omap_dt_match_table[] __initdata = {

	{ .compatible = "simple-bus", },

	{ .compatible = "ti,omap-infra", },
@@ -84,22 +56,6 @@ static void __init omap_generic_init(void) 
	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);

}



#ifdef CONFIG_ARCH_OMAP4

static void __init omap4_init(void)

{

	omap4_i2c_init();

	omap_generic_init();

}

#endif



#ifdef CONFIG_ARCH_OMAP3

static void __init omap3_init(void)

{

	omap3_i2c_init();

	omap_generic_init();

}

#endif



#ifdef CONFIG_SOC_OMAP2420

static const char *omap242x_boards_compat[] __initdata = {

	"ti,omap2420",
@@ -139,6 +95,22 @@ MACHINE_END 
#endif



#ifdef CONFIG_ARCH_OMAP3

static struct twl4030_platform_data beagle_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,

};



static void __init omap3_i2c_init(void)

{

	omap3_pmic_init("twl4030", &beagle_twldata);

}



static void __init omap3_init(void)

{

	omap3_i2c_init();

	omap_generic_init();

}



static const char *omap3_boards_compat[] __initdata = {

	"ti,omap3",

	NULL,
@@ -158,6 +130,22 @@ MACHINE_END 
#endif



#ifdef CONFIG_ARCH_OMAP4

static struct twl4030_platform_data sdp4430_twldata = {

	.irq_base	= TWL6030_IRQ_BASE,

	.irq_end	= TWL6030_IRQ_END,

};



static void __init omap4_i2c_init(void)

{

	omap4_pmic_init("twl6030", &sdp4430_twldata);

}



static void __init omap4_init(void)

{

	omap4_i2c_init();

	omap_generic_init();

}



static const char *omap4_boards_compat[] __initdata = {

	"ti,omap4",

	NULL,