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

Commit 829ae273 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-for-linus' of... 

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (33 commits)
  OMAP3: PM: Boot message is not an error, and not helpful, remove it
  OMAP3: cpuidle: change the power domains modes determination logic
  OMAP3: cpuidle: code rework for improved readability
  OMAP3: cpuidle: re-organize the C-states data
  OMAP3: clean-up mach specific cpuidle data structures
  OMAP3 cpuidle: remove useless SDP specific timings
  usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled
  usb: otg: OMAP4430: Fixing the omap4430_phy_init function
  usb: musb: am35x: fix compile error when building am35x
  usb: musb: OMAP4430: Power down the PHY during board init
  omap: drop board-igep0030.c
  omap: igep0020: add support for IGEP3
  omap: igep0020: minor refactoring
  omap: igep0020: name refactoring for future merge with IGEP3
  omap: Remove support for omap2evm
  arm: omap2plus: GPIO cleanup
  omap: musb: introduce default board config
  omap: move detection of NAND CS to common-board-devices
  omap: use common initialization for PMIC i2c bus
  omap: consolidate touch screen initialization among different boards
  ...
parents 6ddb4518 9b28b11e

arch/arm/configs/omap2plus_defconfig

+7 −76
Original line number Diff line number Diff line
@@ -21,58 +21,22 @@ CONFIG_MODVERSIONS=y 
CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_OMAP=y

CONFIG_ARCH_OMAP2=y

CONFIG_ARCH_OMAP3=y

CONFIG_ARCH_OMAP4=y

CONFIG_OMAP_RESET_CLOCKS=y

CONFIG_OMAP_MUX_DEBUG=y

CONFIG_OMAP_32K_TIMER=y

CONFIG_MACH_OMAP_GENERIC=y

CONFIG_ARCH_OMAP2420=y

CONFIG_ARCH_OMAP2430=y

CONFIG_ARCH_OMAP3430=y

CONFIG_MACH_OMAP_H4=y

CONFIG_MACH_OMAP_APOLLON=y

CONFIG_MACH_OMAP_2430SDP=y

CONFIG_MACH_OMAP3_BEAGLE=y

CONFIG_MACH_DEVKIT8000=y

CONFIG_MACH_OMAP_LDP=y

CONFIG_MACH_OVERO=y

CONFIG_MACH_OMAP3EVM=y

CONFIG_MACH_OMAP3517EVM=y

CONFIG_MACH_OMAP3_PANDORA=y

CONFIG_MACH_OMAP3_TOUCHBOOK=y

CONFIG_MACH_OMAP_3430SDP=y

CONFIG_MACH_NOKIA_N8X0=y

CONFIG_MACH_NOKIA_RX51=y

CONFIG_MACH_OMAP_ZOOM2=y

CONFIG_MACH_OMAP_ZOOM3=y

CONFIG_MACH_CM_T35=y

CONFIG_MACH_IGEP0020=y

CONFIG_MACH_SBC3530=y

CONFIG_MACH_OMAP_3630SDP=y

CONFIG_MACH_OMAP_4430SDP=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_ARM_ERRATA_411920=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

# CONFIG_LOCAL_TIMERS is not set

CONFIG_AEABI=y

CONFIG_LEDS=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"

CONFIG_KEXEC=y

CONFIG_FPE_NWFPE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_BINFMT_MISC=y

CONFIG_PM=y

CONFIG_PM_DEBUG=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -89,14 +53,6 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_BT=m

CONFIG_BT_L2CAP=m

CONFIG_BT_SCO=m

CONFIG_BT_RFCOMM=y

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=m

CONFIG_BT_BNEP_MC_FILTER=y

CONFIG_BT_BNEP_PROTO_FILTER=y

CONFIG_BT_HIDP=m

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_H4=y

CONFIG_BT_HCIUART_BCSP=y
@@ -107,11 +63,9 @@ CONFIG_CFG80211=m 
CONFIG_MAC80211=m

CONFIG_MAC80211_RC_PID=y

CONFIG_MAC80211_RC_DEFAULT_PID=y

CONFIG_MAC80211_LEDS=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=y

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y
@@ -127,7 +81,6 @@ CONFIG_MTD_UBI=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_EEPROM_LEGACY=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y
@@ -158,19 +111,15 @@ CONFIG_TOUCHSCREEN_ADS7846=y 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_TWL4030_PWRBUTTON=y

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_DETECT_IRQ=y

CONFIG_SERIAL_8250_RSA=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_OMAP=y

CONFIG_SPI=y

CONFIG_SPI_OMAP24XX=y

CONFIG_DEBUG_GPIO=y
@@ -181,10 +130,6 @@ CONFIG_POWER_SUPPLY=y 
CONFIG_WATCHDOG=y

CONFIG_OMAP_WATCHDOG=y

CONFIG_TWL4030_WATCHDOG=y

CONFIG_MENELAUS=y

CONFIG_TWL4030_CORE=y

CONFIG_TWL4030_POWER=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TWL4030=y

CONFIG_REGULATOR_TPS65023=y

CONFIG_REGULATOR_TPS6507X=y
@@ -208,7 +153,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y 
CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_PLATFORM=y

CONFIG_DISPLAY_SUPPORT=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_FONTS=y
@@ -217,25 +161,20 @@ CONFIG_FONT_8x16=y 
CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_VERBOSE_PRINTK=y

CONFIG_SND_DEBUG=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_SOC=y

CONFIG_SND_OMAP_SOC=y

CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y

CONFIG_SND_USB_AUDIO=m

CONFIG_SND_SOC=m

CONFIG_SND_OMAP_SOC=m

CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m

CONFIG_USB=y

CONFIG_USB_DEBUG=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_SUSPEND=y

# CONFIG_USB_OTG_WHITELIST is not set

CONFIG_USB_MON=y

# CONFIG_USB_MUSB_HDRC is not set

# CONFIG_USB_MUSB_OTG is not set

# CONFIG_USB_GADGET_MUSB_HDRC is not set

CONFIG_USB_MUSB_DEBUG=y

CONFIG_USB_WDM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_LIBUSUAL=y
@@ -250,18 +189,12 @@ CONFIG_MMC_UNSAFE_RESUME=y 
CONFIG_SDIO_UART=y

CONFIG_MMC_OMAP=y

CONFIG_MMC_OMAP_HS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_TWL92330=y

CONFIG_RTC_DRV_TWL4030=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_INOTIFY=y

CONFIG_QUOTA=y

CONFIG_QFMT_V2=y

CONFIG_MSDOS_FS=y
@@ -285,12 +218,10 @@ CONFIG_NLS_CODEPAGE_437=y 
CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_PROVE_LOCKING=y

# CONFIG_LOCK_STAT is not set

CONFIG_DEBUG_SPINLOCK_SLEEP=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ config MACH_IGEP0030 
	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB

	select MACH_IGEP0020



config MACH_SBC3530

	bool "OMAP3 SBC STALKER board"

arch/arm/mach-omap2/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ 
obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o

obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o \

					   hsmmc.o

obj-$(CONFIG_MACH_IGEP0030)		+= board-igep0030.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \
@@ -270,3 +268,5 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o 


disp-$(CONFIG_OMAP2_DSS)		:= display.o

obj-y					+= $(disp-m) $(disp-y)



obj-y					+= common-board-devices.o

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

+5 −22
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#include "mux.h"

#include "hsmmc.h"

#include "common-board-devices.h"



#define SDP2430_CS0_BASE	0x04000000

#define SECONDARY_LCD_GPIO		147
@@ -180,15 +181,6 @@ static struct twl4030_platform_data sdp2430_twldata = { 
	.vmmc1		= &sdp2430_vmmc1,

};



static struct i2c_board_info __initdata sdp2430_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl4030", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = INT_24XX_SYS_NIRQ,

		.platform_data = &sdp2430_twldata,

	},

};



static struct i2c_board_info __initdata sdp2430_i2c1_boardinfo[] = {

	{

		I2C_BOARD_INFO("isp1301_omap", 0x2D),
@@ -201,8 +193,7 @@ static int __init omap2430_i2c_init(void) 
{

	omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,

			ARRAY_SIZE(sdp2430_i2c1_boardinfo));

	omap_register_i2c_bus(2, 2600, sdp2430_i2c_boardinfo,

			ARRAY_SIZE(sdp2430_i2c_boardinfo));

	omap2_pmic_init("twl4030", &sdp2430_twldata);

	return 0;

}
@@ -217,11 +208,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { 
	{}	/* Terminator */

};



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 100,

};

static struct omap_usb_config sdp2430_usb_config __initdata = {

	.otg		= 1,

#ifdef  CONFIG_USB_GADGET_OMAP
@@ -240,8 +226,6 @@ static struct omap_board_mux board_mux[] __initdata = { 


static void __init omap_2430sdp_init(void)

{

	int ret;



	omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);



	omap_board_config = sdp2430_config;
@@ -255,14 +239,13 @@ static void __init omap_2430sdp_init(void) 
	omap2_usbfs_init(&sdp2430_usb_config);



	omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);

	usb_musb_init(&musb_board_data);

	usb_musb_init(NULL);



	board_smc91x_init();



	/* Turn off secondary LCD backlight */

	ret = gpio_request(SECONDARY_LCD_GPIO, "Secondary LCD backlight");

	if (ret == 0)

		gpio_direction_output(SECONDARY_LCD_GPIO, 0);

	gpio_request_one(SECONDARY_LCD_GPIO, GPIOF_OUT_INIT_LOW,

			 "Secondary LCD backlight");

}



static void __init omap_2430sdp_map_io(void)

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

+23 −128
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/i2c/twl.h>

#include <linux/regulator/machine.h>

#include <linux/io.h>
@@ -48,6 +47,7 @@ 
#include "hsmmc.h"

#include "pm.h"

#include "control.h"

#include "common-board-devices.h"



#define CONFIG_DISABLE_HFCLK 1
@@ -59,24 +59,6 @@ 


#define TWL4030_MSECURE_GPIO 22



/* FIXME: These values need to be updated based on more profiling on 3430sdp*/

static struct cpuidle_params omap3_cpuidle_params_table[] = {

	/* C1 */

	{1, 2, 2, 5},

	/* C2 */

	{1, 10, 10, 30},

	/* C3 */

	{1, 50, 50, 300},

	/* C4 */

	{1, 1500, 1800, 4000},

	/* C5 */

	{1, 2500, 7500, 12000},

	/* C6 */

	{1, 3000, 8500, 15000},

	/* C7 */

	{1, 10000, 30000, 300000},

};



static uint32_t board_keymap[] = {

	KEY(0, 0, KEY_LEFT),

	KEY(0, 1, KEY_RIGHT),
@@ -123,63 +105,14 @@ static struct twl4030_keypad_data sdp3430_kp_data = { 
	.rep		= 1,

};



static int ts_gpio;	/* Needed for ads7846_get_pendown_state */



/**

 * @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq

 *

 * @return - void. If request gpio fails then Flag KERN_ERR.

 */

static void ads7846_dev_init(void)

{

	if (gpio_request(ts_gpio, "ADS7846 pendown") < 0) {

		printk(KERN_ERR "can't get ads746 pen down GPIO\n");

		return;

	}



	gpio_direction_input(ts_gpio);

	gpio_set_debounce(ts_gpio, 310);

}



static int ads7846_get_pendown_state(void)

{

	return !gpio_get_value(ts_gpio);

}



static struct ads7846_platform_data tsc2046_config __initdata = {

	.get_pendown_state	= ads7846_get_pendown_state,

	.keep_vref_on		= 1,

	.wakeup				= true,

};





static struct omap2_mcspi_device_config tsc2046_mcspi_config = {

	.turbo_mode	= 0,

	.single_channel	= 1,	/* 0: slave, 1: master */

};



static struct spi_board_info sdp3430_spi_board_info[] __initdata = {

	[0] = {

		/*

		 * TSC2046 operates at a max freqency of 2MHz, so

		 * operate slightly below at 1.5MHz

		 */

		.modalias		= "ads7846",

		.bus_num		= 1,

		.chip_select		= 0,

		.max_speed_hz		= 1500000,

		.controller_data	= &tsc2046_mcspi_config,

		.irq			= 0,

		.platform_data		= &tsc2046_config,

	},

};





#define SDP3430_LCD_PANEL_BACKLIGHT_GPIO	8

#define SDP3430_LCD_PANEL_ENABLE_GPIO		5



static unsigned backlight_gpio;

static unsigned enable_gpio;

static struct gpio sdp3430_dss_gpios[] __initdata = {

	{SDP3430_LCD_PANEL_ENABLE_GPIO,    GPIOF_OUT_INIT_LOW, "LCD reset"    },

	{SDP3430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD Backlight"},

};



static int lcd_enabled;

static int dvi_enabled;
@@ -187,29 +120,11 @@ static void __init sdp3430_display_init(void) 
{

	int r;



	enable_gpio    = SDP3430_LCD_PANEL_ENABLE_GPIO;

	backlight_gpio = SDP3430_LCD_PANEL_BACKLIGHT_GPIO;

	r = gpio_request_array(sdp3430_dss_gpios,

			       ARRAY_SIZE(sdp3430_dss_gpios));

	if (r)

		printk(KERN_ERR "failed to get LCD control GPIOs\n");



	r = gpio_request(enable_gpio, "LCD reset");

	if (r) {

		printk(KERN_ERR "failed to get LCD reset GPIO\n");

		goto err0;

	}



	r = gpio_request(backlight_gpio, "LCD Backlight");

	if (r) {

		printk(KERN_ERR "failed to get LCD backlight GPIO\n");

		goto err1;

	}



	gpio_direction_output(enable_gpio, 0);

	gpio_direction_output(backlight_gpio, 0);



	return;

err1:

	gpio_free(enable_gpio);

err0:

	return;

}



static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev)
@@ -219,8 +134,8 @@ static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev) 
		return -EINVAL;

	}



	gpio_direction_output(enable_gpio, 1);

	gpio_direction_output(backlight_gpio, 1);

	gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 1);

	gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 1);



	lcd_enabled = 1;
@@ -231,8 +146,8 @@ static void sdp3430_panel_disable_lcd(struct omap_dss_device *dssdev) 
{

	lcd_enabled = 0;



	gpio_direction_output(enable_gpio, 0);

	gpio_direction_output(backlight_gpio, 0);

	gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 0);

	gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 0);

}



static int sdp3430_panel_enable_dvi(struct omap_dss_device *dssdev)
@@ -360,12 +275,10 @@ static int sdp3430_twl_gpio_setup(struct device *dev, 
	omap2_hsmmc_init(mmc);



	/* gpio + 7 is "sub_lcd_en_bkl" (output/PWM1) */

	gpio_request(gpio + 7, "sub_lcd_en_bkl");

	gpio_direction_output(gpio + 7, 0);

	gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "sub_lcd_en_bkl");



	/* gpio + 15 is "sub_lcd_nRST" (output) */

	gpio_request(gpio + 15, "sub_lcd_nRST");

	gpio_direction_output(gpio + 15, 0);

	gpio_request_one(gpio + 15, GPIOF_OUT_INIT_LOW, "sub_lcd_nRST");



	return 0;

}
@@ -580,20 +493,10 @@ static struct twl4030_platform_data sdp3430_twldata = { 
	.vpll2		= &sdp3430_vpll2,

};



static struct i2c_board_info __initdata sdp3430_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl4030", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = INT_34XX_SYS_NIRQ,

		.platform_data = &sdp3430_twldata,

	},

};



static int __init omap3430_i2c_init(void)

{

	/* i2c1 for PMIC only */

	omap_register_i2c_bus(1, 2600, sdp3430_i2c_boardinfo,

			ARRAY_SIZE(sdp3430_i2c_boardinfo));

	omap3_pmic_init("twl4030", &sdp3430_twldata);

	/* i2c2 on camera connector (for sensor control) and optional isp1301 */

	omap_register_i2c_bus(2, 400, NULL, 0);

	/* i2c3 on display connector (for DVI, tfp410) */
@@ -872,30 +775,22 @@ static struct flash_partitions sdp_flash_partitions[] = { 
	},

};



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 100,

};



static void __init omap_3430sdp_init(void)

{

	int gpio_pendown;



	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap3_pm_init_cpuidle(omap3_cpuidle_params_table);

	omap3430_i2c_init();

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)

		ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2;

		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV2;

	else

		ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV1;

	sdp3430_spi_board_info[0].irq = gpio_to_irq(ts_gpio);

	spi_register_board_info(sdp3430_spi_board_info,

				ARRAY_SIZE(sdp3430_spi_board_info));

	ads7846_dev_init();

		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;

	omap_ads7846_init(1, gpio_pendown, 310, NULL);

	board_serial_init();

	usb_musb_init(&musb_board_data);

	usb_musb_init(NULL);

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);

	sdp3430_display_init();