tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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 e27a93a944a5ba6a0112750c8243abba86d56e94 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>
authored by
David Brownell
and committed by
Tony Lindgren
0cc0a441
9be401a2
+23
-1
+22
arch/arm/mach-omap1/board-h3.c
+22
arch/arm/mach-omap1/board-h3.c
···
26
26
#include <linux/mtd/nand.h>
27
27
#include <linux/mtd/partitions.h>
28
28
#include <linux/input.h>
29
+
#include <linux/spi/spi.h>
29
30
#include <linux/i2c/tps65010.h>
30
31
31
32
#include <asm/setup.h>
···
51
50
#include <asm/arch/common.h>
52
51
#include <asm/arch/mcbsp.h>
53
52
#include <asm/arch/omap-alsa.h>
53
+
54
+
#define H3_TS_GPIO 48
54
55
55
56
static int h3_keymap[] = {
56
57
KEY(0, 0, KEY_LEFT),
···
376
373
.id = -1,
377
374
};
378
375
376
+
static struct spi_board_info h3_spi_board_info[] __initdata = {
377
+
[0] = {
378
+
.modalias = "tsc2101",
379
+
.bus_num = 2,
380
+
.chip_select = 0,
381
+
.irq = OMAP_GPIO_IRQ(H3_TS_GPIO),
382
+
.max_speed_hz = 16000000,
383
+
/* .platform_data = &tsc_platform_data, */
384
+
},
385
+
};
386
+
379
387
static struct omap_mcbsp_reg_cfg mcbsp_regs = {
380
388
.spcr2 = FREE | FRST | GRST | XRST | XINTM(3),
381
389
.spcr1 = RINTM(3) | RRST,
···
469
455
{ OMAP_TAG_MMC, &h3_mmc_config },
470
456
{ OMAP_TAG_UART, &h3_uart_config },
471
457
{ OMAP_TAG_LCD, &h3_lcd_config },
458
+
};
459
+
460
+
static struct i2c_board_info __initdata h3_i2c_board_info[] = {
461
+
{
462
+
I2C_BOARD_INFO("tps65010", 0x48),
463
+
.type = "tps65013",
464
+
/* .irq = OMAP_GPIO_IRQ(??), */
465
+
},
472
466
};
473
467
474
468
static struct omap_gpio_switch h3_gpio_switches[] __initdata = {