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

Commit ca5742bd authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: mux: Add new style init functions to omap3 board-*.c files 



Add new style mux init functions to omap3 board-*.c files

So far Beagle has been confirmed to be a CBB package,
and CM-T35 a CUS package.

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

arch/arm/mach-omap2/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -61,14 +61,17 @@ config MACH_OMAP_2430SDP 
config MACH_OMAP3_BEAGLE

	bool "OMAP3 BEAGLE board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OMAP_LDP

	bool "OMAP3 LDP board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OVERO

	bool "Gumstix Overo board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OMAP3EVM

	bool "OMAP 3530 EVM board"
@@ -77,14 +80,17 @@ config MACH_OMAP3EVM 
config MACH_OMAP3517EVM

	bool "OMAP3517/ AM3517 EVM board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OMAP3_PANDORA

	bool "OMAP3 Pandora"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OMAP_3430SDP

	bool "OMAP 3430 SDP board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_NOKIA_N800

       bool
@@ -105,10 +111,12 @@ config MACH_NOKIA_N8X0 
config MACH_NOKIA_RX51

	bool "Nokia RX-51 board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OMAP_ZOOM2

	bool "OMAP3 Zoom2 board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OMAP_ZOOM3

	bool "OMAP3630 Zoom3 board"
@@ -117,10 +125,12 @@ config MACH_OMAP_ZOOM3 
config MACH_CM_T35

	bool "CompuLab CM-T35 module"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CUS



config MACH_IGEP0020

	bool "IGEP0020"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OMAP_3630SDP

	bool "OMAP3630 SDP board"

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

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

#include <plat/gpmc-smc91x.h>



#include "mux.h"

#include "sdram-qimonda-hyb18m512160af-6.h"

#include "mmc-twl4030.h"
@@ -640,8 +641,17 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { 
	.reset_gpio_port[2]  = -EINVAL

};



#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_3430sdp_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap3430_i2c_init();

	platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));

	if (omap_rev() > OMAP3430_REV_ES1_0)

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

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <plat/common.h>

#include <plat/usb.h>



#include "mux.h"



/*

 * Board initialization

 */
@@ -60,8 +62,17 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = { 
	.reset_gpio_port[2]  = -EINVAL

};



#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 am3517_evm_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	platform_add_devices(am3517_evm_devices,

				ARRAY_SIZE(am3517_evm_devices));

arch/arm/mach-omap2/board-cm-t35.c

+10 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 


#include <mach/hardware.h>



#include "mux.h"

#include "sdram-micron-mt46h32m32lf-6.h"

#include "mmc-twl4030.h"
@@ -482,8 +483,17 @@ static void __init cm_t35_map_io(void) 
	omap2_map_common_io();

}



#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 cm_t35_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CUS);

	omap_serial_init();

	cm_t35_init_i2c();

	cm_t35_init_nand();

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

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

#include <plat/usb.h>



#include "mux.h"

#include "mmc-twl4030.h"



#define IGEP2_SMSC911X_CS       5
@@ -203,8 +204,17 @@ static int __init igep2_i2c_init(void) 
	return 0;

}



#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 igep2_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	igep2_i2c_init();

	omap_serial_init();

	usb_musb_init();