Merge with /home/tmlind/src/kernel/linux-2.6

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index dd3f75c4ef2c6cd3b572a3b91a167ca59a0bf038,fbfc14a56b965a9ed20f1bda358b6ebc37d43088..80ccb869cc72b39f00a796e8cf054fb9d18d851b
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -54,10 -54,15 +54,15 @@@ tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm
  tune-$(CONFIG_CPU_SA110)      :=-mtune=strongarm110
  tune-$(CONFIG_CPU_SA1100)     :=-mtune=strongarm1100
  tune-$(CONFIG_CPU_XSCALE)     :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
 -tune-$(CONFIG_CPU_V6)         :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
 +tune-$(CONFIG_CPU_V6)         :=$(call cc-option,-mtune=arm1136jf-s,-mtune=arm1136jfs)
  
- # Need -Uarm for gcc < 3.x
+ ifeq ($(CONFIG_AEABI),y)
+ CFLAGS_ABI    :=-mabi=aapcs -mno-thumb-interwork
+ else
  CFLAGS_ABI    :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
+ endif
+ 
+ # Need -Uarm for gcc < 3.x
  CFLAGS                +=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
  AFLAGS                +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float
  

diff --cc arch/arm/boot/compressed/Makefile
index f9b05d80a0825b089ea8d0338251a8596142b0cd,35ffe0f4ece78720c15a448061e0ad55d55af235..60e306eff77976ad1bf810de7878306c7e20bdf0
--- 1/arch/arm/boot/compressed/Makefile
--- 2/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@@ -50,12 -46,12 +46,16 @@@ ifeq ($(CONFIG_PXA_SHARPSL),y
  OBJS          += head-sharpsl.o
  endif
  
+ ifeq ($(CONFIG_ARCH_AT91RM9200),y)
+ OBJS          += head-at91rm9200.o
+ endif
+ 
  ifeq ($(CONFIG_DEBUG_ICEDCC),y)
 -OBJS            += ice-dcc.o
 +OBJS          += ice-dcc.o
 +endif
 +
 +ifeq ($(CONFIG_MACH_OMAP_PERSEUS2),y)
 +OBJS          += head-omap.o
  endif
  
  ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc arch/arm/configs/omap_h2_1610_defconfig
Simple merge

diff --cc arch/arm/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/arm/mach-omap1/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/board-innovator.c
Simple merge

diff --cc arch/arm/mach-omap1/board-netstar.c
index 0000000000000000000000000000000000000000,58f783930d45486536d5c08c6b7212175693e2a3..0448fa7de8a416a48cd1977f29858be54e67c078
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/mach-omap1/board-netstar.c
+++ b/arch/arm/mach-omap1/board-netstar.c
@@@ -1,0 -1,159 +1,160 @@@
+ /*
+  * Modified from board-generic.c
+  *
+  * Copyright (C) 2004 2N Telekomunikace, Ladislav Michl <michl@2n.cz>
+  *
+  * Code for Netstar OMAP board.
+  *
+  * 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.
+  */
+ 
+ #include <linux/delay.h>
+ #include <linux/platform_device.h>
+ #include <linux/interrupt.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/notifier.h>
+ #include <linux/reboot.h>
+ 
+ #include <asm/hardware.h>
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+ #include <asm/mach/map.h>
+ 
+ #include <asm/arch/gpio.h>
+ #include <asm/arch/mux.h>
+ #include <asm/arch/usb.h>
+ #include <asm/arch/common.h>
+ 
+ extern void __init omap_init_time(void);
+ extern int omap_gpio_init(void);
+ 
+ static struct resource netstar_smc91x_resources[] = {
+       [0] = {
+               .start  = OMAP_CS1_PHYS + 0x300,
+               .end    = OMAP_CS1_PHYS + 0x300 + 16,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = OMAP_GPIO_IRQ(8),
+               .end    = OMAP_GPIO_IRQ(8),
+               .flags  = IORESOURCE_IRQ,
+       },
+ };
+ 
+ static struct platform_device netstar_smc91x_device = {
+       .name           = "smc91x",
+       .id             = 0,
+       .num_resources  = ARRAY_SIZE(netstar_smc91x_resources),
+       .resource       = netstar_smc91x_resources,
+ };
+ 
+ static struct platform_device *netstar_devices[] __initdata = {
+       &netstar_smc91x_device,
+ };
+ 
+ static struct omap_uart_config netstar_uart_config __initdata = {
+       .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
+ };
+ 
+ static struct omap_board_config_kernel netstar_config[] = {
+       { OMAP_TAG_UART,        &netstar_uart_config },
+ };
+ 
+ static void __init netstar_init_irq(void)
+ {
+       omap_init_irq();
+       omap_gpio_init();
+ }
+ 
+ static void __init netstar_init(void)
+ {
+       /* green LED */
+       omap_request_gpio(4);
+       omap_set_gpio_direction(4, 0);
+       /* smc91x reset */
+       omap_request_gpio(7);
+       omap_set_gpio_direction(7, 0);
+       omap_set_gpio_dataout(7, 1);
+       udelay(2);      /* wait at least 100ns */
+       omap_set_gpio_dataout(7, 0);
+       mdelay(50);     /* 50ms until PHY ready */
+       /* smc91x interrupt pin */
+       omap_request_gpio(8);
+ 
+       omap_request_gpio(12);
+       omap_request_gpio(13);
+       omap_request_gpio(14);
+       omap_request_gpio(15);
+       set_irq_type(OMAP_GPIO_IRQ(12), IRQT_FALLING);
+       set_irq_type(OMAP_GPIO_IRQ(13), IRQT_FALLING);
+       set_irq_type(OMAP_GPIO_IRQ(14), IRQT_FALLING);
+       set_irq_type(OMAP_GPIO_IRQ(15), IRQT_FALLING);
+ 
+       platform_add_devices(netstar_devices, ARRAY_SIZE(netstar_devices));
+ 
+       /* Switch on green LED */
+       omap_set_gpio_dataout(4, 0);
+       /* Switch off red LED */
+       omap_writeb(0x00, OMAP_LPG1_PMR);       /* Disable clock */
+       omap_writeb(0x80, OMAP_LPG1_LCR);
+ 
+       omap_board_config = netstar_config;
+       omap_board_config_size = ARRAY_SIZE(netstar_config);
+       omap_serial_init();
+ }
+ 
+ static void __init netstar_map_io(void)
+ {
+       omap_map_common_io();
+ }
+ 
+ #define MACHINE_PANICED               1
+ #define MACHINE_REBOOTING     2
+ #define MACHINE_REBOOT                4
+ static unsigned long machine_state;
+ 
+ static int panic_event(struct notifier_block *this, unsigned long event,
+        void *ptr)
+ {
+       if (test_and_set_bit(MACHINE_PANICED, &machine_state))
+               return NOTIFY_DONE;
+ 
+       /* Switch off green LED */
+       omap_set_gpio_dataout(4, 1);
+       /* Flash red LED */
+       omap_writeb(0x78, OMAP_LPG1_LCR);
+       omap_writeb(0x01, OMAP_LPG1_PMR);       /* Enable clock */
+ 
+       return NOTIFY_DONE;
+ }
+ 
+ static struct notifier_block panic_block = {
+       .notifier_call  = panic_event,
+ };
+ 
+ static int __init netstar_late_init(void)
+ {
+       /* TODO: Setup front panel switch here */
+ 
+       /* Setup panic notifier */
+       notifier_chain_register(&panic_notifier_list, &panic_block);
+ 
+       return 0;
+ }
+ 
+ postcore_initcall(netstar_late_init);
+ 
+ MACHINE_START(NETSTAR, "NetStar OMAP5910")
+       /* Maintainer: Ladislav Michl <michl@2n.cz> */
++      .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = netstar_map_io,
+       .init_irq       = netstar_init_irq,
+       .init_machine   = netstar_init,
+       .timer          = &omap_timer,
+ MACHINE_END

diff --cc arch/arm/mach-omap1/board-osk.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmte.c
Simple merge

diff --cc arch/arm/mach-omap1/board-perseus2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-voiceblue.c
Simple merge

diff --cc arch/arm/mach-omap1/clock.c
Simple merge

diff --cc arch/arm/mach-omap1/serial.c
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/clock.c
index 74786a45edec2e632a20ccaf321a4054d5734936,5407b954915011ca62d5c46d4c5c0dace238867b..72eb4bf571acf11abb6cafe89e65fcfa2274c2e2
--- 1/arch/arm/mach-omap2/clock.c
--- 2/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@@ -25,12 -26,10 +26,11 @@@
  
  #include <asm/io.h>
  
- #include <asm/hardware/clock.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/sram.h>
 -#include <asm/arch/prcm.h>
  
 +#include "prcm-regs.h"
 +#include "memory.h"
  #include "clock.h"
  
  //#define DOWN_VARIABLE_DPLL 1                        /* Experimental */

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc arch/arm/mach-omap2/timer-gp.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/clock.c
Simple merge

diff --cc arch/arm/plat-omap/common.c
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc arch/arm/plat-omap/gpio.c
Simple merge

diff --cc arch/arm/plat-omap/mcbsp.c
Simple merge

diff --cc arch/arm/plat-omap/ocpi.c
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/char/Makefile
Simple merge

diff --cc drivers/char/watchdog/Kconfig
Simple merge

diff --cc drivers/char/watchdog/Makefile
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Makefile
Simple merge

diff --cc drivers/i2c/chips/isp1301_omap.c
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/keyboard/Makefile
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Makefile
Simple merge

diff --cc drivers/media/video/Kconfig
index 5614835a6a385661afcb98e62d34f549ae153d2d,d82c8a30ba44373e137ba43b7fe8f0067d156119..f33a35d207a9fbbfe521d5cfc31359614fc74f53
--- 1/drivers/media/video/Kconfig
--- 2/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -342,8 -351,6 +351,8 @@@ config VIDEO_DECODE
        depends on VIDEO_DEV && I2C && EXPERIMENTAL
        ---help---
          Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
-         video  decoders.
+         video decoders.
  
 +source drivers/media/video/omap/Kconfig
 +
  endmenu

diff --cc drivers/media/video/Makefile
Simple merge

diff --cc drivers/mmc/mmc.c
Simple merge

diff --cc drivers/net/irda/Kconfig
Simple merge

diff --cc drivers/net/irda/Makefile
index 494b0f857531efd134251f786fa4e316c10a78d5,72cbfdc9cfcc1e90c8d6716ce0760fc4423f8eb5..df619ebdc49d64d2d895df066daa7112694b852c
--- 1/drivers/net/irda/Makefile
--- 2/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@@ -43,8 -43,6 +43,8 @@@ obj-$(CONFIG_OLD_BELKIN_DONGLE)       += old_
  obj-$(CONFIG_MCP2120_DONGLE)  += mcp2120-sir.o
  obj-$(CONFIG_ACT200L_DONGLE)  += act200l-sir.o
  obj-$(CONFIG_MA600_DONGLE)    += ma600-sir.o
 +obj-$(CONFIG_OMAP_IR)         += omap-ir.o
 +
  
  # The SIR helper module
- sir-dev-objs := sir_core.o sir_dev.o sir_dongle.o sir_kthread.o
+ sir-dev-objs := sir_dev.o sir_dongle.o sir_kthread.o

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/net/smc91x.h
index 5d630b7e9b223692acd36fb7b077d68dd797cc3f,e0efd1964e72fc78f384da66e7260158375035fd..a91a8a03ddccc22029ee55edfb49c38d3a030636
--- 1/drivers/net/smc91x.h
--- 2/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@@ -185,12 -185,11 +185,12 @@@ SMC_outw(u16 val, void __iomem *ioaddr
  #include <asm/mach-types.h>
  #include <asm/arch/cpu.h>
  
- #define       SMC_IRQ_TRIGGER_TYPE (( \
+ #define       SMC_IRQ_FLAGS (( \
                   machine_is_omap_h2() \
                || machine_is_omap_h3() \
 +              || machine_is_omap_h4() \
                || (machine_is_omap_innovator() && !cpu_is_omap1510()) \
-       ) ? IRQT_FALLING : IRQT_RISING)
+       ) ? SA_TRIGGER_FALLING : SA_TRIGGER_RISING)
  
  
  #elif defined(CONFIG_SH_SH4202_MICRODEV)

diff --cc drivers/serial/8250.c
Simple merge

diff --cc drivers/usb/host/ohci-omap.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc include/asm-arm/arch-omap/dma.h
Simple merge

diff --cc include/asm-arm/arch-omap/system.h
index 2e2a76deef83635244b780863ac37b7ec1367c15,6724a81bd10bbecd841851e47ac9d5d899d4aa84..67970d1a2020b213a32d6b9c36f7bdc9ccb42014
--- 1/include/asm-arm/arch-omap/system.h
--- 2/include/asm-arm/arch-omap/system.h
+++ b/include/asm-arm/arch-omap/system.h
@@@ -5,8 -5,11 +5,10 @@@
  #ifndef __ASM_ARCH_SYSTEM_H
  #define __ASM_ARCH_SYSTEM_H
  #include <linux/config.h>
+ #include <linux/clk.h>
+ 
  #include <asm/mach-types.h>
  #include <asm/hardware.h>
 -#include <asm/arch/prcm.h>
  
  #ifndef CONFIG_MACH_VOICEBLUE
  #define voiceblue_reset()             do {} while (0)

diff --cc include/linux/fb.h
Simple merge

diff --cc include/linux/input.h
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc sound/arm/Kconfig
Simple merge