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

Commit 93651b85 authored by Benoit Cousson's avatar Benoit Cousson
Browse files

ARM: OMAP2+: board-generic: Remove i2c static init 



This mainly reverts the commit that was adding the i2c static init.

Since the i2c and twl nodes are now present, there is no need
for the static initialization anymore.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 5340b51d

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

+2 −35
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/irqdomain.h>

#include <linux/i2c/twl.h>



#include <mach/hardware.h>

#include <asm/hardware/gic.h>
@@ -95,22 +94,6 @@ 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,
@@ -122,7 +105,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.init_early	= omap3430_init_early,

	.init_irq	= omap_init_irq,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap3_init,

	.init_machine	= omap_generic_init,

	.timer		= &omap3_timer,

	.dt_compat	= omap3_boards_compat,

	.restart	= omap_prcm_restart,
@@ -130,22 +113,6 @@ 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,
@@ -157,7 +124,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") 
	.init_early	= omap4430_init_early,

	.init_irq	= omap_init_irq,

	.handle_irq	= gic_handle_irq,

	.init_machine	= omap4_init,

	.init_machine	= omap_generic_init,

	.timer		= &omap4_timer,

	.dt_compat	= omap4_boards_compat,

	.restart	= omap_prcm_restart,