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

Commit 7203f8a4 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Tony Lindgren
Browse files

arm: mach-omap2: remove NULL board_mux from board files 



If CONFIG_OMAP_MUX is not enabled, we can define board_mux in the header
file instead of forcing every single board to define it.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
[tony@atomide.com: updated for combined board-zoom files]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 52aa8c53

arch/arm/mach-omap2/board-2430sdp.c

+0 −2
Original line number Diff line number Diff line
@@ -218,8 +218,6 @@ static struct omap_usb_config sdp2430_usb_config __initdata = { 
static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



static void __init omap_2430sdp_init(void)

arch/arm/mach-omap2/board-3430sdp.c

+0 −2
Original line number Diff line number Diff line
@@ -663,8 +663,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { 
static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



/*

arch/arm/mach-omap2/board-3630sdp.c

+0 −2
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ static void __init omap_sdp_init_irq(void) 
static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



/*

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

+0 −2
Original line number Diff line number Diff line
@@ -442,8 +442,6 @@ static struct omap_board_mux board_mux[] __initdata = { 
	OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif

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

+0 −2
Original line number Diff line number Diff line
@@ -314,8 +314,6 @@ static void __init apollon_usb_init(void) 
static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



static void __init omap_apollon_init(void)