Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
  [ARM] Acorn: move the i2c bus driver into drivers/i2c
  [ARM] ARM SCSI: Don't try to dma_map_sg too many scatterlist entries
  [ARM] ARM FAS216: don't modify scsi_cmnd request_bufflen
  [ARM] rtc-pcf8583: Final fixes for this RTC on RiscPC
  [ARM] rtc-pcf8583: correct month and year offsets
  [ARM] rtc-pcf8583: don't use BCD_TO_BIN/BIN_TO_BCD
  [ARM] EBSA110: Work around build errors
  [ARM] 4241/1: Define mb() as compiler barrier on a uniprocessor system
  [ARM] 4239/1: S3C24XX: Update kconfig entries for PM
  [ARM] 4238/1: S3C24XX: docs: update suspend and resume
  [ARM] 4237/2: oprofile: Always allow backtraces on ARM
  [ARM] Yet more asm/apm-emulation.h stuff
  ARM: OMAP: Add missing get_irqnr_preamble and arch_ret_to_user for omap2
  ARM: OMAP: Use linux/delay.h not asm/delay.h
  ARM: OMAP: Remove obsolete alsa typedefs
  ARM: OMAP: omap1510->15xx conversions needed for sx1
  ARM: OMAP: Add missing includes to board-nokia770
  ARM: OMAP: Workqueue changes for board-h4.c
  ARM: OMAP: dmtimer.c omap1 register fix
  ARM: OMAP: board-nokia770: correct lcd name
  ...

17 files changed, 73 insertions, 51 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d75879d9dde..ac2ffdcfbbb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -190,6 +190,7 @@ config ARCH_CO285
 config ARCH_EBSA110
         bool "EBSA-110"
         select ISA
+        select NO_IOPORT
         help
           This is an evaluation board for the StrongARM processor available
           from Digital. It has limited hardware on-board, including an
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index cbe909bad79..70014f751bc 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -16,6 +16,8 @@
 
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/workqueue.h>
+#include <linux/delay.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
@@ -103,7 +105,7 @@ static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata =
 
 static struct spi_board_info nokia770_spi_board_info[] __initdata = {
         [0] = {
-                .modalias       = "lcd_lph8923",
+                .modalias               = "lcd_mipid",
                 .bus_num        = 2,
                 .chip_select    = 3,
                 .max_speed_hz   = 12000000,
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 638490e62d5..f625f6dd228 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -432,8 +432,7 @@ static int omap1_clk_enable(struct clk *clk)
                         }
 
                         if (clk->flags & CLOCK_NO_IDLE_PARENT)
-                                if (!cpu_is_omap24xx())
-                                        omap1_clk_deny_idle(clk->parent);
+                                omap1_clk_deny_idle(clk->parent);
                 }
 
                 ret = clk->enable(clk);
@@ -454,8 +453,7 @@ static void omap1_clk_disable(struct clk *clk)
                 if (likely(clk->parent)) {
                         omap1_clk_disable(clk->parent);
                         if (clk->flags & CLOCK_NO_IDLE_PARENT)
-                                if (!cpu_is_omap24xx())
-                                        omap1_clk_allow_idle(clk->parent);
+                                omap1_clk_allow_idle(clk->parent);
                 }
         }
 }
@@ -471,7 +469,7 @@ static int omap1_clk_enable_generic(struct clk *clk)
         if (unlikely(clk->enable_reg == 0)) {
                 printk(KERN_ERR "clock.c: Enable for %s without enable code\n",
                        clk->name);
-                return 0;
+                return -EINVAL;
         }
 
         if (clk->flags & ENABLE_REG_32BIT) {
@@ -651,10 +649,18 @@ int __init omap1_clk_init(void)
         int crystal_type = 0; /* Default 12 MHz */
         u32 reg;
 
+#ifdef CONFIG_DEBUG_LL
+        /* Resets some clocks that may be left on from bootloader,
+         * but leaves serial clocks on.
+         */
+        omap_writel(0x3 << 29, MOD_CONF_CTRL_0);
+#endif
+
         /* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */
         reg = omap_readw(SOFT_REQ_REG) & (1 << 4);
         omap_writew(reg, SOFT_REQ_REG);
-        omap_writew(0, SOFT_REQ_REG2);
+        if (!cpu_is_omap15xx())
+                omap_writew(0, SOFT_REQ_REG2);
 
         clk_init(&omap1_clk_functions);
 
@@ -685,7 +691,7 @@ int __init omap1_clk_init(void)
 
         info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config);
         if (info != NULL) {
-                if (!cpu_is_omap1510())
+                if (!cpu_is_omap15xx())
                         crystal_type = info->system_clock_type;
         }
 
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 6383a12ad97..410d3e78dd0 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -238,7 +238,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 --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 4834758d340..49efe903dac 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -256,7 +256,8 @@ void omap_pm_suspend(void)
                 tps65010_set_led(LED1, OFF);
         }
 
-        omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
+        if (!cpu_is_omap15xx())
+                omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
 
         /*
          * Step 1: turn off interrupts (FIXME: NOTE: already disabled)
@@ -434,7 +435,8 @@ void omap_pm_suspend(void)
                 MPUI1610_RESTORE(OMAP_IH2_3_MIR);
         }
 
-        omap_writew(0, ULPD_SOFT_DISABLE_REQ_REG);
+        if (!cpu_is_omap15xx())
+                omap_writew(0, ULPD_SOFT_DISABLE_REQ_REG);
 
         /*
          * Reenable interrupts
@@ -704,6 +706,8 @@ static struct pm_ops omap_pm_ops ={
 
 static int __init omap_pm_init(void)
 {
+        int error;
+
         printk("Power Management for TI OMAP.\n");
 
         /*
@@ -760,7 +764,9 @@ static int __init omap_pm_init(void)
         omap_pm_init_proc();
 #endif
 
-        subsys_create_file(&power_subsys, &sleep_while_idle_attr);
+        error = subsys_create_file(&power_subsys, &sleep_while_idle_attr);
+        if (error)
+                printk(KERN_ERR "subsys_create_file failed: %d\n", error);
 
         if (cpu_is_omap16xx()) {
                 /* configure LOW_PWR pin */
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 4cc98a578e4..10a4fe88b2f 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -1,7 +1,7 @@
 /*
  * linux/arch/arm/mach-omap1/serial.c
  *
- * OMAP1 CPU identification code
+ * OMAP1 serial support.
  *
  * 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
@@ -59,7 +59,7 @@ static void __init omap_serial_reset(struct plat_serial8250_port *p)
         omap_serial_outp(p, UART_OMAP_SCR, 0x08);       /* TX watermark */
         omap_serial_outp(p, UART_OMAP_MDR1, 0x00);      /* enable UART */
 
-        if (!cpu_is_omap1510()) {
+        if (!cpu_is_omap15xx()) {
                 omap_serial_outp(p, UART_OMAP_SYSC, 0x01);
                 while (!(omap_serial_in(p, UART_OMAP_SYSC) & 0x01));
         }
@@ -121,7 +121,7 @@ void __init omap_serial_init(void)
                 serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
         }
 
-        if (cpu_is_omap1510()) {
+        if (cpu_is_omap15xx()) {
                 serial_platform_data[0].uartclk = OMAP1510_BASE_BAUD * 16;
                 serial_platform_data[1].uartclk = OMAP1510_BASE_BAUD * 16;
                 serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
@@ -147,10 +147,10 @@ void __init omap_serial_init(void)
                                 printk("Could not get uart1_ck\n");
                         else {
                                 clk_enable(uart1_ck);
-                                if (cpu_is_omap1510())
+                                if (cpu_is_omap15xx())
                                         clk_set_rate(uart1_ck, 12000000);
                         }
-                        if (cpu_is_omap1510()) {
+                        if (cpu_is_omap15xx()) {
                                 omap_cfg_reg(UART1_TX);
                                 omap_cfg_reg(UART1_RTS);
                                 if (machine_is_omap_innovator()) {
@@ -167,12 +167,12 @@ void __init omap_serial_init(void)
                                 printk("Could not get uart2_ck\n");
                         else {
                                 clk_enable(uart2_ck);
-                                if (cpu_is_omap1510())
+                                if (cpu_is_omap15xx())
                                         clk_set_rate(uart2_ck, 12000000);
                                 else
                                         clk_set_rate(uart2_ck, 48000000);
                         }
-                        if (cpu_is_omap1510()) {
+                        if (cpu_is_omap15xx()) {
                                 omap_cfg_reg(UART2_TX);
                                 omap_cfg_reg(UART2_RTS);
                                 if (machine_is_omap_innovator()) {
@@ -189,10 +189,10 @@ void __init omap_serial_init(void)
                                 printk("Could not get uart3_ck\n");
                         else {
                                 clk_enable(uart3_ck);
-                                if (cpu_is_omap1510())
+                                if (cpu_is_omap15xx())
                                         clk_set_rate(uart3_ck, 12000000);
                         }
-                        if (cpu_is_omap1510()) {
+                        if (cpu_is_omap15xx()) {
                                 omap_cfg_reg(UART3_TX);
                                 omap_cfg_reg(UART3_RX);
                         }
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 3b1ad1d981a..1e7ed6d22ca 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -39,7 +39,6 @@
 #include "prcm-regs.h"
 
 #include <asm/io.h>
-#include <asm/delay.h>
 
 static unsigned int row_gpios[6] = { 88, 89, 124, 11, 6, 96 };
 static unsigned int col_gpios[7] = { 90, 91, 100, 36, 12, 97, 98 };
@@ -179,9 +178,11 @@ static int h4_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;
 
@@ -191,7 +192,7 @@ static void set_trans_mode(void *data)
 
         expa &= ~0x01;
 
-        if (!(*mode & IR_SIRMODE)) { /* MIR/FIR */
+        if (!(mode & IR_SIRMODE)) { /* MIR/FIR */
                 expa |= 0x01;
         }
 
@@ -204,9 +205,9 @@ static int h4_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-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 973189cd976..45d1aaa51b5 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -24,6 +24,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/irq.h>
 
 #include <asm/mach/time.h>
 #include <asm/arch/dmtimer.h>
@@ -64,7 +65,7 @@ static void __init omap2_gp_timer_init(void)
         BUG_ON(gptimer == NULL);
 
         omap_dm_timer_set_source(gptimer, OMAP_TIMER_SRC_SYS_CLK);
-        tick_period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / 100;
+        tick_period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ;
         tick_period -= 1;
 
         setup_irq(omap_dm_timer_get_irq(gptimer), &omap2_gp_timer_irq);
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index 165017de8d0..392c3871736 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -16,7 +16,8 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <asm/apm-emulation.h>
+#include <linux/apm-emulation.h>
+
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index b97d543d936..745a4dc7acd 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -16,7 +16,8 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <asm/apm-emulation.h>
+#include <linux/apm-emulation.h>
+
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 0a007b931f6..a9de727c932 100644
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -131,6 +131,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         struct op_arm_model_spec *spec = NULL;
         int ret = -ENODEV;
 
+        ops->backtrace = arm_backtrace;
+
 #ifdef CONFIG_CPU_XSCALE
         spec = &op_xscale_spec;
 #endif
@@ -161,7 +163,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
                 ops->start = op_arm_start;
                 ops->stop = op_arm_stop;
                 ops->cpu_type = op_arm_model->name;
-                ops->backtrace = arm_backtrace;
                 printk(KERN_INFO "oprofile: using %s\n", spec->name);
         }
 
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index bb045e5ddbd..f3f84fbf8b8 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -557,7 +557,7 @@ int omap_request_dma(int dev_id, const char *dev_name,
                 omap_enable_channel_irq(free_ch);
                 /* Clear the CSR register and IRQ status register */
                 OMAP_DMA_CSR_REG(free_ch) = OMAP2_DMA_CSR_CLEAR_MASK;
-                omap_writel(~0x0, OMAP_DMA4_IRQSTATUS_L0);
+                omap_writel(1 << free_ch, OMAP_DMA4_IRQSTATUS_L0);
         }
 
         *dma_ch_out = free_ch;
@@ -597,10 +597,7 @@ void omap_free_dma(int lch)
 
                 /* Clear the CSR register and IRQ status register */
                 OMAP_DMA_CSR_REG(lch) = OMAP2_DMA_CSR_CLEAR_MASK;
-
-                val = omap_readl(OMAP_DMA4_IRQSTATUS_L0);
-                val |= 1 << lch;
-                omap_writel(val, OMAP_DMA4_IRQSTATUS_L0);
+                omap_writel(1 << lch, OMAP_DMA4_IRQSTATUS_L0);
 
                 /* Disable all DMA interrupts for the channel. */
                 OMAP_DMA_CICR_REG(lch) = 0;
@@ -927,7 +924,6 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id)
 static int omap2_dma_handle_ch(int ch)
 {
         u32 status = OMAP_DMA_CSR_REG(ch);
-        u32 val;
 
         if (!status)
                 return 0;
@@ -948,11 +944,7 @@ static int omap2_dma_handle_ch(int ch)
                        dma_chan[ch].dev_id);
 
         OMAP_DMA_CSR_REG(ch) = OMAP2_DMA_CSR_CLEAR_MASK;
-
-        val = omap_readl(OMAP_DMA4_IRQSTATUS_L0);
-        /* ch in this function is from 0-31 while in register it is 1-32 */
-        val = 1 << (ch);
-        omap_writel(val, OMAP_DMA4_IRQSTATUS_L0);
+        omap_writel(1 << ch, OMAP_DMA4_IRQSTATUS_L0);
 
         if (likely(dma_chan[ch].callback != NULL))
                 dma_chan[ch].callback(ch, status, dma_chan[ch].data);
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index bcbb8d7392b..45f0439bffb 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -90,8 +90,8 @@ static struct omap_dm_timer dm_timers[] = {
         { .phys_base = 0xfffb2c00, .irq = INT_1610_GPTIMER4 },
         { .phys_base = 0xfffb3400, .irq = INT_1610_GPTIMER5 },
         { .phys_base = 0xfffb3c00, .irq = INT_1610_GPTIMER6 },
-        { .phys_base = 0xfffb4400, .irq = INT_1610_GPTIMER7 },
-        { .phys_base = 0xfffb4c00, .irq = INT_1610_GPTIMER8 },
+        { .phys_base = 0xfffb7400, .irq = INT_1610_GPTIMER7 },
+        { .phys_base = 0xfffbd400, .irq = INT_1610_GPTIMER8 },
 };
 
 #elif defined(CONFIG_ARCH_OMAP2)
@@ -314,6 +314,8 @@ struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
 __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
 {
         BUG();
+
+        return 0;
 }
 
 #endif
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 4f2fd559133..b8c01de208b 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -974,10 +974,11 @@ static struct irq_chip gpio_irq_chip = {
 };
 
 static struct irq_chip mpuio_irq_chip = {
-        .name   = "MPUIO",
-        .ack    = mpuio_ack_irq,
-        .mask   = mpuio_mask_irq,
-        .unmask = mpuio_unmask_irq
+        .name     = "MPUIO",
+        .ack      = mpuio_ack_irq,
+        .mask     = mpuio_mask_irq,
+        .unmask   = mpuio_unmask_irq,
+        .set_type = gpio_irq_type,
 };
 
 static int initialized;
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index ec50008a2df..b8d6f17ff58 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -20,8 +20,8 @@
 #include <linux/interrupt.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/delay.h>
 
-#include <asm/delay.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index 042105ac30b..6c798d28868 100644
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -116,7 +116,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
         }
 
         /* 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);
@@ -172,7 +172,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
                 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 --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index 860869528f4..b972f36d547 100644
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -58,6 +58,11 @@ config S3C2410_PM_CHECK
           going to sleep. The blocks are then checked on resume for any
           errors.
 
+          Note, this can take several seconds depending on memory size
+          and CPU speed.
+
+          See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
+
 config S3C2410_PM_CHECK_CHUNKSIZE
         int "S3C2410 PM Suspend CRC Chunksize (KiB)"
         depends on ARCH_S3C2410 && PM && S3C2410_PM_CHECK
@@ -68,6 +73,8 @@ config S3C2410_PM_CHECK_CHUNKSIZE
           the CRC data block will take more memory, but wil identify any
           faults with better precision.
 
+          See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
+
 config S3C2410_LOWLEVEL_UART_PORT
         int "S3C2410 UART to use for low-level messages"
         default 0