mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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 e27a93a944
introduced a
regression related to the tps65013 chip.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
9be401a2ae
commit
0cc0a44116
2 changed files with 23 additions and 1 deletions
|
@ -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",
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue