Merge Linux 2.6.23

17 files changed, 62 insertions, 54 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d6145298a325..691aae309c8a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -721,7 +721,8 @@ config LEDS
 
 config LEDS_TIMER
         bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
-                            MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
+                            OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
+                            || MACH_OMAP_PERSEUS2
         depends on LEDS
         depends on !GENERIC_CLOCKEVENTS
         default y if ARCH_EBSA110
@@ -738,7 +739,9 @@ config LEDS_TIMER
 
 config LEDS_CPU
         bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
-                        !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
+                        !ARCH_OMAP) \
+                        || OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
+                        || MACH_OMAP_PERSEUS2
         depends on LEDS
         help
           If you say Y here, the red LED will be used to give a good real
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 240c448ec31c..a2dd930d11ef 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -338,7 +338,7 @@ pbus_assign_bus_resources(struct pci_bus *bus, struct pci_sys_data *root)
  * pcibios_fixup_bus - Called after each bus is probed,
  * but before its children are examined.
  */
-void __devinit pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
 {
         struct pci_sys_data *root = bus->sysdata;
         struct pci_dev *dev;
@@ -419,7 +419,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 /*
  * Convert from Linux-centric to bus-centric addresses for bridge devices.
  */
-void __devinit
+void
 pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
                          struct resource *res)
 {
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 851cc7158ca3..70b2c7801110 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -336,7 +336,7 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type)
         if (line >= 0 && line < 16) {
                 gpio_line_config(line, GPIO_IN);
         } else {
-                gpio_line_config(EP93XX_GPIO_LINE_F(line), GPIO_IN);
+                gpio_line_config(EP93XX_GPIO_LINE_F(line-16), GPIO_IN);
         }
 
         port = line >> 3;
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c
index a58b678006df..4cfc9d3af28a 100644
--- a/arch/arm/mach-imx/generic.c
+++ b/arch/arm/mach-imx/generic.c
@@ -101,10 +101,11 @@ EXPORT_SYMBOL(imx_gpio_mode);
 
 int imx_gpio_request(unsigned gpio, const char *label)
 {
-        if(gpio >= (GPIO_PORT_MAX + 1) * 32)
+        if(gpio >= (GPIO_PORT_MAX + 1) * 32) {
                 printk(KERN_ERR "imx_gpio: Attempt to request nonexistent GPIO %d for \"%s\"\n",
                         gpio, label ? label : "?");
                 return -EINVAL;
+        }
 
         if(test_and_set_bit(gpio, imx_gpio_alloc_map)) {
                 printk(KERN_ERR "imx_gpio: GPIO %d already used. Allocation for \"%s\" failed\n",
@@ -129,7 +130,7 @@ EXPORT_SYMBOL(imx_gpio_free);
 
 int imx_gpio_direction_input(unsigned gpio)
 {
-        imx_gpio_mode(gpio| GPIO_IN);
+        imx_gpio_mode(gpio | GPIO_IN | GPIO_GIUS | GPIO_DR);
         return 0;
 }
 
@@ -138,7 +139,7 @@ EXPORT_SYMBOL(imx_gpio_direction_input);
 int imx_gpio_direction_output(unsigned gpio, int value)
 {
         imx_gpio_set_value(gpio, value);
-        imx_gpio_mode(gpio| GPIO_OUT);
+        imx_gpio_mode(gpio | GPIO_OUT | GPIO_GIUS | GPIO_DR);
         return 0;
 }
 
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 7b260b7c537b..79d4ef4c54d4 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -294,9 +294,11 @@ static int h3_select_irda(struct device *dev, int state)
         return err;
 }
 
-static void set_trans_mode(void *data)
+static void set_trans_mode(struct work_struct *work)
 {
-        int *mode = data;
+        struct omap_irda_config *irda_config =
+                container_of(work, struct omap_irda_config, gpio_expa.work);
+        int mode = irda_config->mode;
         unsigned char expa;
         int err = 0;
 
@@ -306,7 +308,7 @@ static void set_trans_mode(void *data)
 
         expa &= ~0x03;
 
-        if (*mode & IR_SIRMODE) {
+        if (mode & IR_SIRMODE) {
                 expa |= 0x01;
         } else { /* MIR/FIR */
                 expa |= 0x03;
@@ -321,9 +323,9 @@ static int h3_transceiver_mode(struct device *dev, int mode)
 {
         struct omap_irda_config *irda_config = dev->platform_data;
 
+        irda_config->mode = mode;
         cancel_delayed_work(&irda_config->gpio_expa);
-        PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);
-#error this is not permitted - mode is an argument variable
+        PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode);
         schedule_delayed_work(&irda_config->gpio_expa, 0);
 
         return 0;
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index 0cbf1b0071f8..86de303ecab2 100644
--- a/arch/arm/mach-omap1/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -133,13 +133,13 @@ void osk_leds_event(led_event_t evt)
                 mistral_setled();
                 break;
 
-        case led_idle_start:
-                hw_led_state |= IDLE_LED;
+        case led_idle_start:    /* idle == off */
+                hw_led_state &= ~IDLE_LED;
                 mistral_setled();
                 break;
 
         case led_idle_end:
-                hw_led_state &= ~IDLE_LED;
+                hw_led_state |= IDLE_LED;
                 mistral_setled();
                 break;
 
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 5bb348e2e315..2e68be607295 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -57,7 +57,6 @@
 #include <asm/arch/tc.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/tps65010.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/dsp_common.h>
 #include <asm/arch/dmtimer.h>
@@ -250,11 +249,6 @@ void omap_pm_suspend(void)
 
         omap_serial_wake_trigger(1);
 
-        if (machine_is_omap_osk()) {
-                /* Stop LED1 (D9) blink */
-                tps65010_set_led(LED1, OFF);
-        }
-
         if (!cpu_is_omap15xx())
                 omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
 
@@ -447,11 +441,6 @@ void omap_pm_suspend(void)
         omap_serial_wake_trigger(0);
 
         printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev);
-
-        if (machine_is_omap_osk()) {
-                /* Let LED1 (D9) blink again */
-                tps65010_set_led(LED1, BLINK);
-        }
 }
 
 #if defined(DEBUG) && defined(CONFIG_PROC_FS)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 588adb5ab47f..d9af4367f8bb 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -1160,8 +1160,8 @@ int __init omap2_clk_init(void)
         clk_enable(&sync_32k_ick);
         clk_enable(&omapctrl_ick);
 
-        /* Force the APLLs active during bootup to avoid disabling and
-         * enabling them unnecessarily. */
+        /* Force the APLLs always active. The clocks are idled
+         * automatically by hardware. */
         clk_enable(&apll96_ck);
         clk_enable(&apll54_ck);
 
@@ -1174,12 +1174,3 @@ int __init omap2_clk_init(void)
 
         return 0;
 }
-
-static int __init omap2_disable_aplls(void)
-{
-        clk_disable(&apll96_ck);
-        clk_disable(&apll54_ck);
-
-        return 0;
-}
-late_initcall(omap2_disable_aplls);
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index aaa5589e8169..e9c367fc9f61 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -84,7 +84,7 @@ static inline void __init omap_serial_reset(struct plat_serial8250_port *p)
         serial_write_reg(p, UART_OMAP_MDR1, 0x07);
         serial_write_reg(p, UART_OMAP_SCR, 0x08);
         serial_write_reg(p, UART_OMAP_MDR1, 0x00);
-        serial_write_reg(p, UART_OMAP_SYSC, 0x01);
+        serial_write_reg(p, UART_OMAP_SYSC, (0x02 << 3) | (1 << 2) | (1 << 0));
 }
 
 void __init omap_serial_init()
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 4b867b0789d5..ae2ae08032d7 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -365,7 +365,7 @@ void __init pxa_init_irq_gpio(int gpio_nr)
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
-        for (irq = IRQ_GPIO(2); irq <= IRQ_GPIO(gpio_nr); irq++) {
+        for (irq = IRQ_GPIO(2); irq < IRQ_GPIO(gpio_nr); irq++) {
                 set_irq_chip(irq, &pxa_muxed_gpio_chip);
                 set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 3dba666151db..ecec2f85c4cd 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -165,7 +165,7 @@ static void __init gic_init_irq(void)
 #endif
         gic_dist_init(0, __io_address(REALVIEW_GIC_DIST_BASE), 29);
         gic_cpu_init(0, __io_address(REALVIEW_GIC_CPU_BASE));
-#ifdef CONFIG_REALVIEW_MPCORE
+#if defined(CONFIG_REALVIEW_MPCORE) && !defined(CONFIG_REALVIEW_MPCORE_REVB)
         gic_dist_init(1, __io_address(REALVIEW_GIC1_DIST_BASE), 64);
         gic_cpu_init(1, __io_address(REALVIEW_GIC1_CPU_BASE));
         gic_cascade_irq(1, IRQ_EB_IRQ1);
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 0ba7e9060c7b..c326983f4a8f 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -276,7 +276,21 @@ static unsigned char pm_osiris_ctrl0;
 
 static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
 {
+        unsigned int tmp;
+
         pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);
+        tmp = pm_osiris_ctrl0 & ~OSIRIS_CTRL0_NANDSEL;
+
+        /* ensure correct NAND slot is selected on resume */
+        if ((pm_osiris_ctrl0 & OSIRIS_CTRL0_BOOT_INT) == 0)
+                tmp |= 2;
+
+        __raw_writeb(tmp, OSIRIS_VA_CTRL0);
+
+        /* ensure that an nRESET is not generated on resume. */
+        s3c2410_gpio_setpin(S3C2410_GPA21, 1);
+        s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT);
+
         return 0;
 }
 
@@ -285,6 +299,10 @@ static int osiris_pm_resume(struct sys_device *sd)
         if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)
                 __raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);
 
+        __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0);
+
+        s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT);
+
         return 0;
 }
 
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index b4e9b734e0bd..76b800a95191 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -57,7 +57,17 @@ static void l2x0_inv_range(unsigned long start, unsigned long end)
 {
         unsigned long addr;
 
-        start &= ~(CACHE_LINE_SIZE - 1);
+        if (start & (CACHE_LINE_SIZE - 1)) {
+                start &= ~(CACHE_LINE_SIZE - 1);
+                sync_writel(start, L2X0_CLEAN_INV_LINE_PA, 1);
+                start += CACHE_LINE_SIZE;
+        }
+
+        if (end & (CACHE_LINE_SIZE - 1)) {
+                end &= ~(CACHE_LINE_SIZE - 1);
+                sync_writel(end, L2X0_CLEAN_INV_LINE_PA, 1);
+        }
+
         for (addr = start; addr < end; addr += CACHE_LINE_SIZE)
                 sync_writel(addr, L2X0_INV_LINE_PA, 1);
         cache_sync();
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 7987aa6e95f8..4f0f9c4e938e 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -172,7 +172,7 @@ console_initcall(omap_add_serial_console);
 #if defined(CONFIG_ARCH_OMAP16XX)
 #define TIMER_32K_SYNCHRONIZED          0xfffbc410
 #elif defined(CONFIG_ARCH_OMAP24XX)
-#define TIMER_32K_SYNCHRONIZED          0x48004010
+#define TIMER_32K_SYNCHRONIZED          (OMAP24XX_32KSYNCT_BASE + 0x10)
 #endif
 
 #ifdef  TIMER_32K_SYNCHRONIZED
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 36073dfaa4db..3856f5aedfc1 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -271,11 +271,6 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
 
 #if defined(CONFIG_ARCH_OMAP1)
 
-struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
-{
-        BUG();
-}
-
 /**
  * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR
  * @inputmask: current value of idlect mask
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c
index b0af014b0e2c..ea76f1979a3d 100644
--- a/arch/arm/plat-omap/timer32k.c
+++ b/arch/arm/plat-omap/timer32k.c
@@ -71,7 +71,7 @@ struct sys_timer omap_timer;
 #if defined(CONFIG_ARCH_OMAP16XX)
 #define TIMER_32K_SYNCHRONIZED          0xfffbc410
 #elif defined(CONFIG_ARCH_OMAP24XX)
-#define TIMER_32K_SYNCHRONIZED          0x48004010
+#define TIMER_32K_SYNCHRONIZED          (OMAP24XX_32KSYNCT_BASE + 0x10)
 #else
 #error OMAP 32KHz timer does not currently work on 15XX!
 #endif
@@ -147,14 +147,15 @@ static inline void omap_32k_timer_ack_irq(void)
 static void omap_32k_timer_set_mode(enum clock_event_mode mode,
                                     struct clock_event_device *evt)
 {
+        omap_32k_timer_stop();
+
         switch (mode) {
-        case CLOCK_EVT_MODE_ONESHOT:
         case CLOCK_EVT_MODE_PERIODIC:
                 omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);
                 break;
+        case CLOCK_EVT_MODE_ONESHOT:
         case CLOCK_EVT_MODE_UNUSED:
         case CLOCK_EVT_MODE_SHUTDOWN:
-                omap_32k_timer_stop();
                 break;
         case CLOCK_EVT_MODE_RESUME:
                 break;
@@ -194,8 +195,6 @@ omap_32k_ticks_to_nsecs(unsigned long ticks_32k)
         return (unsigned long long) ticks_32k * 1000 * 5*5*5*5*5*5 >> 9;
 }
 
-static unsigned long omap_32k_last_tick = 0;
-
 /*
  * Returns current time from boot in nsecs. It's OK for this to wrap
  * around for now, as it's just a relative time stamp.
@@ -225,7 +224,6 @@ static __init void omap_init_32k_timer(void)
 {
         if (cpu_class_is_omap1())
                 setup_irq(INT_OS_TIMER, &omap_32k_timer_irq);
-        omap_32k_last_tick = omap_32k_sync_timer_read();
 
 #ifdef CONFIG_ARCH_OMAP2
         /* REVISIT: Check 24xx TIOCP_CFG settings after idle works */
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 04ddab2bd876..eea3f50743d5 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -323,6 +323,7 @@ static int __init vfp_init(void)
          * we just need to read the VFPSID register.
          */
         vfp_vector = vfp_testing_entry;
+        barrier();
         vfpsid = fmrx(FPSID);
         barrier();
         vfp_vector = vfp_null_entry;