Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' into next...

diff --combined arch/arm/Kconfig
index 3269576dbfa8dab12d6531996e2e86de2ca309c1,5ebc5d922ea14984e10ef8e10f47d414469efa7c,975b5ddc60e9d3e6458ca5eb982b7e59fe63cbb7,3269576dbfa8dab12d6531996e2e86de2ca309c1..3c47745c7f7baa3539dd1042a7431589af842258
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@ -397,6 -397,6 -397,7 -397,6 +397,7 @@@@@ config ARCH_MX
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
        select HAVE_SCHED_CLOCK
++ +    select MULTI_IRQ_HANDLER
        help
          Support for Freescale MXC/iMX-based family of processors
    
@@@@@ -1271,18 -1271,6 -1272,6 -1271,18 +1272,18 @@@@@ config ARM_ERRATA_75432
          This workaround defines cpu_relax() as smp_mb(), preventing correctly
          written polling loops from denying visibility of updates to memory.
    
 ++ config ARM_ERRATA_364296
 ++     bool "ARM errata: Possible cache data corruption with hit-under-miss enabled"
 ++     depends on CPU_V6 && !SMP
 ++     help
 ++       This options enables the workaround for the 364296 ARM1136
 ++       r0p2 erratum (possible cache data corruption with
 ++       hit-under-miss enabled). It sets the undocumented bit 31 in
 ++       the auxiliary control register and the FI bit in the control
 ++       register, thus disabling hit-under-miss without putting the
 ++       processor into full low interrupt latency mode. ARM11MPCore
 ++       is not affected.
 ++ 
    endmenu
    
    source "arch/arm/common/Kconfig"

diff --combined arch/arm/mach-at91/at91sam9261.c
index 6c8e3b5f669ff7f7a3a885c43b8c1c7710ad2954,176838cf2e78b7c33ff6668edccede7cbb73b922,d522b47e30b5a82322da83f6fed63d7d110dab5a,6c8e3b5f669ff7f7a3a885c43b8c1c7710ad2954..658a5185abfd44cf4671c5d5fa7c6f44b4fc229e
--- 1/arch/arm/mach-at91/at91sam9261.c
--- 2/arch/arm/mach-at91/at91sam9261.c
--- 3/arch/arm/mach-at91/at91sam9261.c
--- 4/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@@@@ -129,6 -129,20 -129,6 -129,6 +129,20 @@@@@ static struct clk lcdc_clk = 
        .type           = CLK_TYPE_PERIPHERAL,
    };
    
+ ++/* HClocks */
+ ++static struct clk hck0 = {
+ ++    .name           = "hck0",
+ ++    .pmc_mask       = AT91_PMC_HCK0,
+ ++    .type           = CLK_TYPE_SYSTEM,
+ ++    .id             = 0,
+ ++};
+ ++static struct clk hck1 = {
+ ++    .name           = "hck1",
+ ++    .pmc_mask       = AT91_PMC_HCK1,
+ ++    .type           = CLK_TYPE_SYSTEM,
+ ++    .id             = 1,
+ ++};
+ ++
    static struct clk *periph_clocks[] __initdata = {
        &pioA_clk,
        &pioB_clk,
@@@@@ -157,10 -171,11 -157,10 -157,10 +171,11 @@@@@ static struct clk_lookup periph_clocks_
        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
        CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),
 --     CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc1_clk),
 ++     CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
        CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
        CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
        CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
+ ++    CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
    };
    
    static struct clk_lookup usart_clocks_lookups[] = {
@@@@@ -199,20 -214,6 -199,20 -199,20 +214,6 @@@@@ static struct clk pck3 = 
        .id             = 3,
    };
    
- --/* HClocks */
- --static struct clk hck0 = {
- --    .name           = "hck0",
- --    .pmc_mask       = AT91_PMC_HCK0,
- --    .type           = CLK_TYPE_SYSTEM,
- --    .id             = 0,
- --};
- --static struct clk hck1 = {
- --    .name           = "hck1",
- --    .pmc_mask       = AT91_PMC_HCK1,
- --    .type           = CLK_TYPE_SYSTEM,
- --    .id             = 1,
- --};
- --
    static void __init at91sam9261_register_clocks(void)
    {
        int i;

diff --combined arch/arm/mach-imx/mach-cpuimx27.c
index f851fe903687dc09c45c51228dcb06d3606679a0,87887ac5806b43612c8bba200e3f57df83be0c24,b0cd62d6a3cd702be8c00ec1ee09a757fbdd55f6,f851fe903687dc09c45c51228dcb06d3606679a0..a8364cc52b4df2d9029ce55cebb158e618622920
--- 1/arch/arm/mach-imx/mach-cpuimx27.c
--- 2/arch/arm/mach-imx/mach-cpuimx27.c
--- 3/arch/arm/mach-imx/mach-cpuimx27.c
--- 4/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@@@ -310,11 -310,11 -310,12 -310,11 +310,12 @@@@@ static struct sys_timer eukrea_cpuimx27
        .init = eukrea_cpuimx27_timer_init,
    };
    
 -- MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
 ++ MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")
        .boot_params = MX27_PHYS_OFFSET + 0x100,
        .map_io = mx27_map_io,
        .init_early = imx27_init_early,
        .init_irq = mx27_init_irq,
++ +    .handle_irq = imx27_handle_irq,
        .timer = &eukrea_cpuimx27_timer,
        .init_machine = eukrea_cpuimx27_init,
    MACHINE_END

diff --combined arch/arm/mach-imx/mach-cpuimx35.c
index 4bd083ba9af218077aae1381b5fbef716aa625e6,f39a478ba1a63540a26783a4713033b37121d4f3,bd4dbeaeabe9f530038e52a605182a2f7f97b379,4bd083ba9af218077aae1381b5fbef716aa625e6..fc4fea1d3fc72fe79db472805a955137bfca67d8
--- 1/arch/arm/mach-imx/mach-cpuimx35.c
--- 2/arch/arm/mach-imx/mach-cpuimx35.c
--- 3/arch/arm/mach-imx/mach-cpuimx35.c
--- 4/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@@@@ -66,7 -66,7 -66,7 -66,7 +66,7 @@@@@ static struct i2c_board_info eukrea_cpu
                I2C_BOARD_INFO("tsc2007", 0x48),
                .type           = "tsc2007",
                .platform_data  = &tsc2007_info,
-- -            .irq            = gpio_to_irq(TSC2007_IRQGPIO),
++ +            .irq            = IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO),
        },
    };
    
@@@@@ -192,12 -192,12 -192,13 -192,12 +192,13 @@@@@ struct sys_timer eukrea_cpuimx35_timer 
        .init   = eukrea_cpuimx35_timer_init,
    };
    
 -- MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
 ++ MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")
        /* Maintainer: Eukrea Electromatique */
        .boot_params = MX3x_PHYS_OFFSET + 0x100,
        .map_io = mx35_map_io,
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,
++ +    .handle_irq = imx35_handle_irq,
        .timer = &eukrea_cpuimx35_timer,
        .init_machine = eukrea_cpuimx35_init,
    MACHINE_END

diff --combined arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index 2442d5da883d075259d8add3e927c9ad270b9314,da36da52969db2bc82e5da006e7085df21a3482a,e2343c8594fc5649e3914fc367ad230d4e4fc0d9,2442d5da883d075259d8add3e927c9ad270b9314..b05de09b1a6ec0b38402ab19a04081a5c88ae622
--- 1/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
--- 2/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
--- 3/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
--- 4/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@@@@ -161,12 -161,12 -161,13 -161,12 +161,13 @@@@@ static struct sys_timer eukrea_cpuimx25
        .init   = eukrea_cpuimx25_timer_init,
    };
    
 -- MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
 ++ MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
        /* Maintainer: Eukrea Electromatique */
        .boot_params = MX25_PHYS_OFFSET + 0x100,
        .map_io = mx25_map_io,
        .init_early = imx25_init_early,
        .init_irq = mx25_init_irq,
++ +    .handle_irq = imx25_handle_irq,
        .timer = &eukrea_cpuimx25_timer,
        .init_machine = eukrea_cpuimx25_init,
    MACHINE_END