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

Commit 0cc0a441 authored by David Brownell's avatar David Brownell Committed by Tony Lindgren
Browse files

ARM: OMAP1: omap h3 regression and build fix 



Get rid of build warnings and errors in mainline for H3 boards; not
all the H3 updates were correct, it seems like the OMAP1 boards are
not getting proper build testing.

Also, commit e27a93a9 introduced a
regression related to the tps65013 chip.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9be401a2

arch/arm/mach-omap1/board-h3.c

+22 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>

#include <linux/input.h>

#include <linux/spi/spi.h>

#include <linux/i2c/tps65010.h>



#include <asm/setup.h>
@@ -51,6 +52,8 @@ 
#include <asm/arch/mcbsp.h>

#include <asm/arch/omap-alsa.h>



#define H3_TS_GPIO	48



static int h3_keymap[] = {

	KEY(0, 0, KEY_LEFT),

	KEY(0, 1, KEY_RIGHT),
@@ -373,6 +376,17 @@ static struct platform_device h3_lcd_device = { 
	.id		= -1,

};



static struct spi_board_info h3_spi_board_info[] __initdata = {

	[0] = {

		.modalias	= "tsc2101",

		.bus_num	= 2,

		.chip_select	= 0,

		.irq		= OMAP_GPIO_IRQ(H3_TS_GPIO),

		.max_speed_hz	= 16000000,

		/* .platform_data	= &tsc_platform_data, */

	},

};



static struct omap_mcbsp_reg_cfg mcbsp_regs = {

	.spcr2 = FREE | FRST | GRST | XRST | XINTM(3),

	.spcr1 = RINTM(3) | RRST,
@@ -457,6 +471,14 @@ static struct omap_board_config_kernel h3_config[] __initdata = { 
	{ OMAP_TAG_LCD,		&h3_lcd_config },

};



static struct i2c_board_info __initdata h3_i2c_board_info[] = {

       {

               I2C_BOARD_INFO("tps65010", 0x48),

               .type           = "tps65013",

               /* .irq         = OMAP_GPIO_IRQ(??), */

       },

};



static struct omap_gpio_switch h3_gpio_switches[] __initdata = {

	{

		.name			= "mmc_slot",

include/asm-arm/arch-omap/board-h3.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


#define NR_IRQS				(MAXIRQNUM + 1)



extern void __init h3_mmc_init(void);

extern void h3_mmc_init(void);

extern void h3_mmc_slot_cover_handler(void *arg, int state);



#endif /*  __ASM_ARCH_OMAP_H3_H */