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

Commit fb6bf632 authored by Benoit Cousson's avatar Benoit Cousson
Browse files

OMAP4: sdp4430: Select CBL package for ES1 and initialize mux 



Select the CBL package if SDP4430 is enabled during config.
Initialize the mux framework during the board init.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
parent a041a52c

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ config MACH_OMAP_4430SDP 
	bool "OMAP 4430 SDP board"

	default y

	depends on ARCH_OMAP4

	select OMAP_PACKAGE_CBL



config MACH_OMAP4_PANDA

	bool "OMAP4 Panda Board"

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

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <plat/usb.h>

#include <plat/mmc.h>



#include "mux.h"

#include "hsmmc.h"

#include "timer-gp.h"

#include "control.h"
@@ -505,10 +506,19 @@ static void __init omap_sfh7741prox_init(void) 
	}

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else

#define board_mux	NULL

#endif



static void __init omap_4430sdp_init(void)

{

	int status;



	omap4_mux_init(board_mux, OMAP_PACKAGE_CBL);

	omap4_i2c_init();

	omap_sfh7741prox_init();

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));