projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
arch
/
arm
/
mach-omap1
/
board-innovator.c
diff --git
a/arch/arm/mach-omap1/board-innovator.c
b/arch/arm/mach-omap1/board-innovator.c
index
fd9183f
..
a04e433
100644
(file)
--- a/
arch/arm/mach-omap1/board-innovator.c
+++ b/
arch/arm/mach-omap1/board-innovator.c
@@
-18,7
+18,7
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/delay.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/delay.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@
-36,8
+36,6
@@
#include <asm/arch/usb.h>
#include <asm/arch/common.h>
#include <asm/arch/usb.h>
#include <asm/arch/common.h>
-static int __initdata innovator_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
-
static struct mtd_partition innovator_partitions[] = {
/* bootloader (U-Boot, etc) in first sector */
{
static struct mtd_partition innovator_partitions[] = {
/* bootloader (U-Boot, etc) in first sector */
{
@@
-99,7
+97,7
@@
static struct platform_device innovator_flash_device = {
.resource = &innovator_flash_resource,
};
.resource = &innovator_flash_resource,
};
-#ifdef CONFIG_ARCH_OMAP15
10
+#ifdef CONFIG_ARCH_OMAP15
XX
/* Only FPGA needs to be mapped here. All others are done with ioremap */
static struct map_desc innovator1510_io_desc[] __initdata = {
/* Only FPGA needs to be mapped here. All others are done with ioremap */
static struct map_desc innovator1510_io_desc[] __initdata = {
@@
-136,7
+134,7
@@
static struct platform_device *innovator1510_devices[] __initdata = {
&innovator1510_smc91x_device,
};
&innovator1510_smc91x_device,
};
-#endif /* CONFIG_ARCH_OMAP15
10
*/
+#endif /* CONFIG_ARCH_OMAP15
XX
*/
#ifdef CONFIG_ARCH_OMAP16XX
#ifdef CONFIG_ARCH_OMAP16XX
@@
-183,9
+181,10
@@
static void __init innovator_init_smc91x(void)
void innovator_init_irq(void)
{
void innovator_init_irq(void)
{
+ omap1_init_common_hw();
omap_init_irq();
omap_gpio_init();
omap_init_irq();
omap_gpio_init();
-#ifdef CONFIG_ARCH_OMAP15
10
+#ifdef CONFIG_ARCH_OMAP15
XX
if (cpu_is_omap1510()) {
omap1510_fpga_init_irq();
}
if (cpu_is_omap1510()) {
omap1510_fpga_init_irq();
}
@@
-193,7
+192,7
@@
void innovator_init_irq(void)
innovator_init_smc91x();
}
innovator_init_smc91x();
}
-#ifdef CONFIG_ARCH_OMAP15
10
+#ifdef CONFIG_ARCH_OMAP15
XX
static struct omap_usb_config innovator1510_usb_config __initdata = {
/* for bundled non-standard host and peripheral cables */
.hmc_mode = 4,
static struct omap_usb_config innovator1510_usb_config __initdata = {
/* for bundled non-standard host and peripheral cables */
.hmc_mode = 4,
@@
-205,6
+204,11
@@
static struct omap_usb_config innovator1510_usb_config __initdata = {
.register_dev = 1,
.pins[0] = 2,
};
.register_dev = 1,
.pins[0] = 2,
};
+
+static struct omap_lcd_config innovator1510_lcd_config __initdata = {
+ .panel_name = "inn1510",
+ .ctrl_name = "internal",
+};
#endif
#ifdef CONFIG_ARCH_OMAP16XX
#endif
#ifdef CONFIG_ARCH_OMAP16XX
@@
-222,6
+226,11
@@
static struct omap_usb_config h2_usb_config __initdata = {
.pins[1] = 3,
};
.pins[1] = 3,
};
+
+static struct omap_lcd_config innovator1610_lcd_config __initdata = {
+ .panel_name = "inn1610",
+ .ctrl_name = "internal",
+};
#endif
static struct omap_mmc_config innovator_mmc_config __initdata = {
#endif
static struct omap_mmc_config innovator_mmc_config __initdata = {
@@
-234,14
+243,20
@@
static struct omap_mmc_config innovator_mmc_config __initdata = {
},
};
},
};
+static struct omap_uart_config innovator_uart_config __initdata = {
+ .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
+};
+
static struct omap_board_config_kernel innovator_config[] = {
{ OMAP_TAG_USB, NULL },
static struct omap_board_config_kernel innovator_config[] = {
{ OMAP_TAG_USB, NULL },
+ { OMAP_TAG_LCD, NULL },
{ OMAP_TAG_MMC, &innovator_mmc_config },
{ OMAP_TAG_MMC, &innovator_mmc_config },
+ { OMAP_TAG_UART, &innovator_uart_config },
};
static void __init innovator_init(void)
{
};
static void __init innovator_init(void)
{
-#ifdef CONFIG_ARCH_OMAP15
10
+#ifdef CONFIG_ARCH_OMAP15
XX
if (cpu_is_omap1510()) {
platform_add_devices(innovator1510_devices, ARRAY_SIZE(innovator1510_devices));
}
if (cpu_is_omap1510()) {
platform_add_devices(innovator1510_devices, ARRAY_SIZE(innovator1510_devices));
}
@@
-252,23
+267,28
@@
static void __init innovator_init(void)
}
#endif
}
#endif
-#ifdef CONFIG_ARCH_OMAP15
10
- if (cpu_is_omap1510())
+#ifdef CONFIG_ARCH_OMAP15
XX
+ if (cpu_is_omap1510())
{
innovator_config[0].data = &innovator1510_usb_config;
innovator_config[0].data = &innovator1510_usb_config;
+ innovator_config[1].data = &innovator1510_lcd_config;
+ }
#endif
#ifdef CONFIG_ARCH_OMAP16XX
#endif
#ifdef CONFIG_ARCH_OMAP16XX
- if (cpu_is_omap1610())
+ if (cpu_is_omap1610())
{
innovator_config[0].data = &h2_usb_config;
innovator_config[0].data = &h2_usb_config;
+ innovator_config[1].data = &innovator1610_lcd_config;
+ }
#endif
omap_board_config = innovator_config;
omap_board_config_size = ARRAY_SIZE(innovator_config);
#endif
omap_board_config = innovator_config;
omap_board_config_size = ARRAY_SIZE(innovator_config);
+ omap_serial_init();
}
static void __init innovator_map_io(void)
{
}
static void __init innovator_map_io(void)
{
- omap_map_common_io();
+ omap
1
_map_common_io();
-#ifdef CONFIG_ARCH_OMAP15
10
+#ifdef CONFIG_ARCH_OMAP15
XX
if (cpu_is_omap1510()) {
iotable_init(innovator1510_io_desc, ARRAY_SIZE(innovator1510_io_desc));
udelay(10); /* Delay needed for FPGA */
if (cpu_is_omap1510()) {
iotable_init(innovator1510_io_desc, ARRAY_SIZE(innovator1510_io_desc));
udelay(10); /* Delay needed for FPGA */
@@
-280,12
+300,10
@@
static void __init innovator_map_io(void)
fpga_read(OMAP1510_FPGA_BOARD_REV));
}
#endif
fpga_read(OMAP1510_FPGA_BOARD_REV));
}
#endif
- omap_serial_init(innovator_serial_ports);
}
MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
/* Maintainer: MontaVista Software, Inc. */
}
MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
/* Maintainer: MontaVista Software, Inc. */
- .phys_ram = 0x10000000,
.phys_io = 0xfff00000,
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
.boot_params = 0x10000100,
.phys_io = 0xfff00000,
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
.boot_params = 0x10000100,