diff -pNaur -X b/Documentation/dontdiff a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig --- a/arch/arm/mach-omap1/Kconfig 2006-07-16 02:31:16.000000000 +0200 +++ b/arch/arm/mach-omap1/Kconfig 2006-07-16 03:54:35.000000000 +0200 @@ -74,11 +74,10 @@ config MACH_OMAP_PALMTE bool "Palm Tungsten E" depends on ARCH_OMAP1 && ARCH_OMAP15XX help - Support for the Palm Tungsten E PDA. Currently only the LCD panel - is supported. To boot the kernel, you'll need a PalmOS compatible - bootloader; check out http://palmtelinux.sourceforge.net for more - informations. - Say Y here if you have such a PDA, say NO otherwise. + Support for the Palm Tungsten E PDA. To boot the kernel, you'll + need a PalmOS compatible bootloader; check out + http://palmtelinux.sourceforge.net/ for more information. + Say Y here if you have this PDA model, say N otherwise. config MACH_NOKIA770 bool "Nokia 770" diff -pNaur -X b/Documentation/dontdiff a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c --- a/arch/arm/mach-omap1/board-palmte.c 2006-07-16 02:32:15.000000000 +0200 +++ b/arch/arm/mach-omap1/board-palmte.c 2006-07-16 04:03:03.000000000 +0200 @@ -32,10 +32,11 @@ #include #include -static void __init omap_generic_init_irq(void) +static void __init omap_palmte_init_irq(void) { omap1_init_common_hw(); omap_init_irq(); + omap_gpio_init(); } static struct platform_device palmte_lcd_device = { @@ -48,9 +49,9 @@ static struct platform_device *devices[] }; static struct omap_usb_config palmte_usb_config __initdata = { - .register_dev = 1, + .register_dev = 1, /* Mini-B only receptacle */ .hmc_mode = 0, - .pins[0] = 3, + .pins[0] = 2, }; static struct omap_mmc_config palmte_mmc_config __initdata = { @@ -68,12 +69,12 @@ static struct omap_lcd_config palmte_lcd }; static struct omap_board_config_kernel palmte_config[] = { - { OMAP_TAG_USB, &palmte_usb_config }, - { OMAP_TAG_MMC, &palmte_mmc_config }, - { OMAP_TAG_LCD, &palmte_lcd_config }, + { OMAP_TAG_USB, &palmte_usb_config }, + { OMAP_TAG_MMC, &palmte_mmc_config }, + { OMAP_TAG_LCD, &palmte_lcd_config }, }; -static void __init omap_generic_init(void) +static void __init omap_palmte_init(void) { omap_board_config = palmte_config; omap_board_config_size = ARRAY_SIZE(palmte_config); @@ -81,7 +82,7 @@ static void __init omap_generic_init(voi platform_add_devices(devices, ARRAY_SIZE(devices)); } -static void __init omap_generic_map_io(void) +static void __init omap_palmte_map_io(void) { omap1_map_common_io(); } @@ -90,8 +91,8 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 base .phys_io = 0xfff00000, .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, .boot_params = 0x10000100, - .map_io = omap_generic_map_io, - .init_irq = omap_generic_init_irq, - .init_machine = omap_generic_init, + .map_io = omap_palmte_map_io, + .init_irq = omap_palmte_init_irq, + .init_machine = omap_palmte_init, .timer = &omap_timer, MACHINE_END diff -pNaur -X b/Documentation/dontdiff a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c --- a/arch/arm/mach-omap1/irq.c 2006-07-16 02:30:11.000000000 +0200 +++ b/arch/arm/mach-omap1/irq.c 2006-07-16 04:05:39.000000000 +0200 @@ -153,9 +153,13 @@ static struct omap_irq_bank omap1510_irq { .base_reg = OMAP_IH1_BASE, .trigger_map = 0xb3febfff }, { .base_reg = OMAP_IH2_BASE, .trigger_map = 0xffbfffed }, }; +static struct omap_irq_bank omap5910_irq_banks[] = { + { .base_reg = OMAP_IH1_BASE, .trigger_map = 0xb3faefc3 }, + { .base_reg = OMAP_IH2_BASE, .trigger_map = 0x65b3c061 }, +}; static struct omap_irq_bank omap310_irq_banks[] = { - { .base_reg = OMAP_IH1_BASE, .trigger_map = 0xb3faefc3 }, - { .base_reg = OMAP_IH2_BASE, .trigger_map = 0x65b3c061 }, + { .base_reg = OMAP_IH1_BASE, .trigger_map = 0x0040cc23 }, + { .base_reg = OMAP_IH2_BASE, .trigger_map = 0x77b3c063 }, }; #endif @@ -238,7 +242,7 @@ void __init omap_init_irq(void) if (cpu_is_omap730()) omap_unmask_irq(INT_730_IH2_IRQ); - else if (cpu_is_omap1510()) + else if (cpu_is_omap15xx()) omap_unmask_irq(INT_1510_IH2_IRQ); else if (cpu_is_omap16xx()) omap_unmask_irq(INT_1610_IH2_IRQ); diff -pNaur -X b/Documentation/dontdiff a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c --- a/arch/arm/plat-omap/mux.c 2006-07-16 02:30:11.000000000 +0200 +++ b/arch/arm/plat-omap/mux.c 2006-07-16 04:08:15.000000000 +0200 @@ -117,7 +117,7 @@ int __init_or_module omap_cfg_reg(const } /* Check for pull up or pull down selection on 1610 */ - if (!cpu_is_omap1510()) { + if (!cpu_is_omap15xx()) { if (cfg->pu_pd_reg && cfg->pull_val) { spin_lock_irqsave(&mux_spin_lock, flags); pu_pd_orig = omap_readl(cfg->pu_pd_reg); @@ -173,7 +173,7 @@ int __init_or_module omap_cfg_reg(const printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n", cfg->mux_reg_name, cfg->mux_reg, reg_orig, reg); - if (!cpu_is_omap1510()) { + if (!cpu_is_omap15xx()) { if (cfg->pu_pd_reg && cfg->pull_val) { printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n", cfg->pu_pd_name, cfg->pu_pd_reg, diff -pNaur -X b/Documentation/dontdiff a/include/asm-arm/arch-omap/board-palmte.h b/include/asm-arm/arch-omap/board-palmte.h --- a/include/asm-arm/arch-omap/board-palmte.h 1970-01-01 01:00:00.000000000 +0100 +++ b/include/asm-arm/arch-omap/board-palmte.h 2006-07-16 04:10:59.000000000 +0200 @@ -0,0 +1,23 @@ +/* + * linux/include/asm-arm/arch-omap/board-palmte.h + * + * Hardware definitions for the Palm Tungsten E device. + * + * Maintainters : http://palmtelinux.sf.net + * palmtelinux-developpers@lists.sf.net + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __OMAP_BOARD_PALMTE_H +#define __OMAP_BOARD_PALMTE_H + +#define PALMTE_USBDETECT_GPIO 0 +#define PALMTE_CABLE_GPIO 1 +#define PALMTE_PINTDAV_GPIO 6 +#define PALMTE_MMC_WP_GPIO 8 +#define PALMTE_HDQ_GPIO 11 + +#endif /* __OMAP_BOARD_PALMTE_H */ diff -pNaur -X b/Documentation/dontdiff a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h --- a/include/asm-arm/arch-omap/hardware.h 2006-03-22 18:45:00.000000000 +0100 +++ b/include/asm-arm/arch-omap/hardware.h 2006-07-16 04:12:00.000000000 +0200 @@ -318,6 +318,10 @@ #include "board-voiceblue.h" #endif +#ifdef CONFIG_MACH_OMAP_PALMTE +#include "board-palmte.h" +#endif + #endif /* !__ASSEMBLER__ */ #endif /* __ASM_ARCH_OMAP_HARDWARE_H */