Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)
  ARM: DMA: add support for DMA debugging
  ARM: PL011: add DMA burst threshold support for ST variants
  ARM: PL011: Add support for transmit DMA
  ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
  ARM: PL011: Separate hardware FIFO size from TTY FIFO size
  ARM: PL011: Allow better handling of vendor data
  ARM: PL011: Ensure error flags are clear at startup
  ARM: PL011: include revision number in boot-time port printk
  ARM: vexpress: add sched_clock() for Versatile Express
  ARM i.MX53: Make MX53 EVK bootable
  ARM i.MX53: Some bug fix about MX53 MSL code
  ARM: 6607/1: sa1100: Update platform device registration
  ARM: 6606/1: sa1100: Fix platform device registration
  ARM i.MX51: rename IPU irqs
  ARM i.MX51: Add ipu clock support
  ARM: imx/mx27_3ds: Add PMIC support
  ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
  mx51: fix usb clock support
  MX51: Add support for usb host 2
  arch/arm/plat-mxc/ehci.c: fix errors/typos
  ...

6 files changed, 269 insertions, 137 deletions

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index c6454cca0447..9e7f259346e1 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -18,6 +18,7 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/resource.h>
+#include <linux/regulator/consumer.h>
 
 #define AMBA_NR_IRQS    2
 #define AMBA_CID        0xb105f00d
@@ -28,6 +29,7 @@ struct amba_device {
         struct device           dev;
         struct resource         res;
         struct clk              *pclk;
+        struct regulator        *vcore;
         u64                     dma_mask;
         unsigned int            periphid;
         unsigned int            irq[AMBA_NR_IRQS];
@@ -71,6 +73,12 @@ void amba_release_regions(struct amba_device *);
 #define amba_pclk_disable(d)    \
         do { if (!IS_ERR((d)->pclk)) clk_disable((d)->pclk); } while (0)
 
+#define amba_vcore_enable(d)    \
+        (IS_ERR((d)->vcore) ? 0 : regulator_enable((d)->vcore))
+
+#define amba_vcore_disable(d)   \
+        do { if (!IS_ERR((d)->vcore)) regulator_disable((d)->vcore); } while (0)
+
 /* Some drivers don't use the struct amba_device */
 #define AMBA_CONFIG_BITS(a) (((a) >> 24) & 0xff)
 #define AMBA_REV_BITS(a) (((a) >> 20) & 0x0f)
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index 6021588ba0a8..5479fdc849e9 100644
--- a/include/linux/amba/serial.h
+++ b/include/linux/amba/serial.h
@@ -113,6 +113,21 @@
 #define UART01x_LCRH_PEN        0x02
 #define UART01x_LCRH_BRK        0x01
 
+#define ST_UART011_DMAWM_RX_1   (0 << 3)
+#define ST_UART011_DMAWM_RX_2   (1 << 3)
+#define ST_UART011_DMAWM_RX_4   (2 << 3)
+#define ST_UART011_DMAWM_RX_8   (3 << 3)
+#define ST_UART011_DMAWM_RX_16  (4 << 3)
+#define ST_UART011_DMAWM_RX_32  (5 << 3)
+#define ST_UART011_DMAWM_RX_48  (6 << 3)
+#define ST_UART011_DMAWM_TX_1   0
+#define ST_UART011_DMAWM_TX_2   1
+#define ST_UART011_DMAWM_TX_4   2
+#define ST_UART011_DMAWM_TX_8   3
+#define ST_UART011_DMAWM_TX_16  4
+#define ST_UART011_DMAWM_TX_32  5
+#define ST_UART011_DMAWM_TX_48  6
+
 #define UART010_IIR_RTIS        0x08
 #define UART010_IIR_TIS         0x04
 #define UART010_IIR_RIS         0x02
@@ -180,6 +195,13 @@ struct amba_device; /* in uncompress this is included but amba/bus.h is not */
 struct amba_pl010_data {
         void (*set_mctrl)(struct amba_device *dev, void __iomem *base, unsigned int mctrl);
 };
+
+struct dma_chan;
+struct amba_pl011_data {
+        bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
+        void *dma_rx_param;
+        void *dma_tx_param;
+};
 #endif
 
 #endif
diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
new file mode 100644
index 000000000000..457bcb0a310a
--- /dev/null
+++ b/include/linux/clkdev.h
@@ -0,0 +1,36 @@
+/*
+ *  include/linux/clkdev.h
+ *
+ *  Copyright (C) 2008 Russell King.
+ *
+ * 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.
+ *
+ * Helper for the clk API to assist looking up a struct clk.
+ */
+#ifndef __CLKDEV_H
+#define __CLKDEV_H
+
+#include <asm/clkdev.h>
+
+struct clk;
+struct device;
+
+struct clk_lookup {
+        struct list_head        node;
+        const char              *dev_id;
+        const char              *con_id;
+        struct clk              *clk;
+};
+
+struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
+        const char *dev_fmt, ...);
+
+void clkdev_add(struct clk_lookup *cl);
+void clkdev_drop(struct clk_lookup *cl);
+
+void clkdev_add_table(struct clk_lookup *, size_t);
+int clk_add_alias(const char *, const char *, char *, struct device *);
+
+#endif
diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
index 0026f267da20..088cd4ace4ef 100644
--- a/include/linux/crash_dump.h
+++ b/include/linux/crash_dump.h
@@ -20,7 +20,14 @@ extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
 #define vmcore_elf_check_arch_cross(x) 0
 #endif
 
-#define vmcore_elf_check_arch(x) (elf_check_arch(x) || vmcore_elf_check_arch_cross(x))
+/*
+ * Architecture code can redefine this if there are any special checks
+ * needed for 64-bit ELF vmcores. In case of 32-bit only architecture,
+ * this can be set to zero.
+ */
+#ifndef vmcore_elf64_check_arch
+#define vmcore_elf64_check_arch(x) (elf_check_arch(x) || vmcore_elf_check_arch_cross(x))
+#endif
 
 /*
  * is_kdump_kernel() checks whether this kernel is booting after a panic of
diff --git a/include/linux/mfd/tc35892.h b/include/linux/mfd/tc35892.h
deleted file mode 100644
index eff3094ca84e..000000000000
--- a/include/linux/mfd/tc35892.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License, version 2
- */
-
-#ifndef __LINUX_MFD_TC35892_H
-#define __LINUX_MFD_TC35892_H
-
-#include <linux/device.h>
-
-#define TC35892_RSTCTRL_IRQRST  (1 << 4)
-#define TC35892_RSTCTRL_TIMRST  (1 << 3)
-#define TC35892_RSTCTRL_ROTRST  (1 << 2)
-#define TC35892_RSTCTRL_KBDRST  (1 << 1)
-#define TC35892_RSTCTRL_GPIRST  (1 << 0)
-
-#define TC35892_IRQST           0x91
-
-#define TC35892_MANFCODE_MAGIC  0x03
-#define TC35892_MANFCODE        0x80
-#define TC35892_VERSION         0x81
-#define TC35892_IOCFG           0xA7
-
-#define TC35892_CLKMODE         0x88
-#define TC35892_CLKCFG          0x89
-#define TC35892_CLKEN           0x8A
-
-#define TC35892_RSTCTRL         0x82
-#define TC35892_EXTRSTN         0x83
-#define TC35892_RSTINTCLR       0x84
-
-#define TC35892_GPIOIS0         0xC9
-#define TC35892_GPIOIS1         0xCA
-#define TC35892_GPIOIS2         0xCB
-#define TC35892_GPIOIBE0        0xCC
-#define TC35892_GPIOIBE1        0xCD
-#define TC35892_GPIOIBE2        0xCE
-#define TC35892_GPIOIEV0        0xCF
-#define TC35892_GPIOIEV1        0xD0
-#define TC35892_GPIOIEV2        0xD1
-#define TC35892_GPIOIE0         0xD2
-#define TC35892_GPIOIE1         0xD3
-#define TC35892_GPIOIE2         0xD4
-#define TC35892_GPIORIS0        0xD6
-#define TC35892_GPIORIS1        0xD7
-#define TC35892_GPIORIS2        0xD8
-#define TC35892_GPIOMIS0        0xD9
-#define TC35892_GPIOMIS1        0xDA
-#define TC35892_GPIOMIS2        0xDB
-#define TC35892_GPIOIC0         0xDC
-#define TC35892_GPIOIC1         0xDD
-#define TC35892_GPIOIC2         0xDE
-
-#define TC35892_GPIODATA0       0xC0
-#define TC35892_GPIOMASK0       0xc1
-#define TC35892_GPIODATA1       0xC2
-#define TC35892_GPIOMASK1       0xc3
-#define TC35892_GPIODATA2       0xC4
-#define TC35892_GPIOMASK2       0xC5
-
-#define TC35892_GPIODIR0        0xC6
-#define TC35892_GPIODIR1        0xC7
-#define TC35892_GPIODIR2        0xC8
-
-#define TC35892_GPIOSYNC0       0xE6
-#define TC35892_GPIOSYNC1       0xE7
-#define TC35892_GPIOSYNC2       0xE8
-
-#define TC35892_GPIOWAKE0       0xE9
-#define TC35892_GPIOWAKE1       0xEA
-#define TC35892_GPIOWAKE2       0xEB
-
-#define TC35892_GPIOODM0        0xE0
-#define TC35892_GPIOODE0        0xE1
-#define TC35892_GPIOODM1        0xE2
-#define TC35892_GPIOODE1        0xE3
-#define TC35892_GPIOODM2        0xE4
-#define TC35892_GPIOODE2        0xE5
-
-#define TC35892_INT_GPIIRQ      0
-#define TC35892_INT_TI0IRQ      1
-#define TC35892_INT_TI1IRQ      2
-#define TC35892_INT_TI2IRQ      3
-#define TC35892_INT_ROTIRQ      5
-#define TC35892_INT_KBDIRQ      6
-#define TC35892_INT_PORIRQ      7
-
-#define TC35892_NR_INTERNAL_IRQS        8
-#define TC35892_INT_GPIO(x)     (TC35892_NR_INTERNAL_IRQS + (x))
-
-struct tc35892 {
-        struct mutex lock;
-        struct device *dev;
-        struct i2c_client *i2c;
-
-        int irq_base;
-        int num_gpio;
-        struct tc35892_platform_data *pdata;
-};
-
-extern int tc35892_reg_write(struct tc35892 *tc35892, u8 reg, u8 data);
-extern int tc35892_reg_read(struct tc35892 *tc35892, u8 reg);
-extern int tc35892_block_read(struct tc35892 *tc35892, u8 reg, u8 length,
-                              u8 *values);
-extern int tc35892_block_write(struct tc35892 *tc35892, u8 reg, u8 length,
-                               const u8 *values);
-extern int tc35892_set_bits(struct tc35892 *tc35892, u8 reg, u8 mask, u8 val);
-
-/**
- * struct tc35892_gpio_platform_data - TC35892 GPIO platform data
- * @gpio_base: first gpio number assigned to TC35892.  A maximum of
- *             %TC35892_NR_GPIOS GPIOs will be allocated.
- * @setup: callback for board-specific initialization
- * @remove: callback for board-specific teardown
- */
-struct tc35892_gpio_platform_data {
-        int gpio_base;
-        void (*setup)(struct tc35892 *tc35892, unsigned gpio_base);
-        void (*remove)(struct tc35892 *tc35892, unsigned gpio_base);
-};
-
-/**
- * struct tc35892_platform_data - TC35892 platform data
- * @irq_base: base IRQ number.  %TC35892_NR_IRQS irqs will be used.
- * @gpio: GPIO-specific platform data
- */
-struct tc35892_platform_data {
-        int irq_base;
-        struct tc35892_gpio_platform_data *gpio;
-};
-
-#define TC35892_NR_GPIOS        24
-#define TC35892_NR_IRQS         TC35892_INT_GPIO(TC35892_NR_GPIOS)
-
-#endif
diff --git a/include/linux/mfd/tc3589x.h b/include/linux/mfd/tc3589x.h
new file mode 100644
index 000000000000..16c76e124f9c
--- /dev/null
+++ b/include/linux/mfd/tc3589x.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License, version 2
+ */
+
+#ifndef __LINUX_MFD_TC3589x_H
+#define __LINUX_MFD_TC3589x_H
+
+#include <linux/device.h>
+
+enum tx3589x_block {
+        TC3589x_BLOCK_GPIO        = 1 << 0,
+        TC3589x_BLOCK_KEYPAD      = 1 << 1,
+};
+
+#define TC3589x_RSTCTRL_IRQRST  (1 << 4)
+#define TC3589x_RSTCTRL_TIMRST  (1 << 3)
+#define TC3589x_RSTCTRL_ROTRST  (1 << 2)
+#define TC3589x_RSTCTRL_KBDRST  (1 << 1)
+#define TC3589x_RSTCTRL_GPIRST  (1 << 0)
+
+/* Keyboard Configuration Registers */
+#define TC3589x_KBDSETTLE_REG   0x01
+#define TC3589x_KBDBOUNCE       0x02
+#define TC3589x_KBDSIZE         0x03
+#define TC3589x_KBCFG_LSB       0x04
+#define TC3589x_KBCFG_MSB       0x05
+#define TC3589x_KBDIC           0x08
+#define TC3589x_KBDMSK          0x09
+#define TC3589x_EVTCODE_FIFO    0x10
+#define TC3589x_KBDMFS          0x8F
+
+#define TC3589x_IRQST           0x91
+
+#define TC3589x_MANFCODE_MAGIC  0x03
+#define TC3589x_MANFCODE        0x80
+#define TC3589x_VERSION         0x81
+#define TC3589x_IOCFG           0xA7
+
+#define TC3589x_CLKMODE         0x88
+#define TC3589x_CLKCFG          0x89
+#define TC3589x_CLKEN           0x8A
+
+#define TC3589x_RSTCTRL         0x82
+#define TC3589x_EXTRSTN         0x83
+#define TC3589x_RSTINTCLR       0x84
+
+/* Pull up/down configuration registers */
+#define TC3589x_IOCFG           0xA7
+#define TC3589x_IOPULLCFG0_LSB  0xAA
+#define TC3589x_IOPULLCFG0_MSB  0xAB
+#define TC3589x_IOPULLCFG1_LSB  0xAC
+#define TC3589x_IOPULLCFG1_MSB  0xAD
+#define TC3589x_IOPULLCFG2_LSB  0xAE
+
+#define TC3589x_GPIOIS0         0xC9
+#define TC3589x_GPIOIS1         0xCA
+#define TC3589x_GPIOIS2         0xCB
+#define TC3589x_GPIOIBE0        0xCC
+#define TC3589x_GPIOIBE1        0xCD
+#define TC3589x_GPIOIBE2        0xCE
+#define TC3589x_GPIOIEV0        0xCF
+#define TC3589x_GPIOIEV1        0xD0
+#define TC3589x_GPIOIEV2        0xD1
+#define TC3589x_GPIOIE0         0xD2
+#define TC3589x_GPIOIE1         0xD3
+#define TC3589x_GPIOIE2         0xD4
+#define TC3589x_GPIORIS0        0xD6
+#define TC3589x_GPIORIS1        0xD7
+#define TC3589x_GPIORIS2        0xD8
+#define TC3589x_GPIOMIS0        0xD9
+#define TC3589x_GPIOMIS1        0xDA
+#define TC3589x_GPIOMIS2        0xDB
+#define TC3589x_GPIOIC0         0xDC
+#define TC3589x_GPIOIC1         0xDD
+#define TC3589x_GPIOIC2         0xDE
+
+#define TC3589x_GPIODATA0       0xC0
+#define TC3589x_GPIOMASK0       0xc1
+#define TC3589x_GPIODATA1       0xC2
+#define TC3589x_GPIOMASK1       0xc3
+#define TC3589x_GPIODATA2       0xC4
+#define TC3589x_GPIOMASK2       0xC5
+
+#define TC3589x_GPIODIR0        0xC6
+#define TC3589x_GPIODIR1        0xC7
+#define TC3589x_GPIODIR2        0xC8
+
+#define TC3589x_GPIOSYNC0       0xE6
+#define TC3589x_GPIOSYNC1       0xE7
+#define TC3589x_GPIOSYNC2       0xE8
+
+#define TC3589x_GPIOWAKE0       0xE9
+#define TC3589x_GPIOWAKE1       0xEA
+#define TC3589x_GPIOWAKE2       0xEB
+
+#define TC3589x_GPIOODM0        0xE0
+#define TC3589x_GPIOODE0        0xE1
+#define TC3589x_GPIOODM1        0xE2
+#define TC3589x_GPIOODE1        0xE3
+#define TC3589x_GPIOODM2        0xE4
+#define TC3589x_GPIOODE2        0xE5
+
+#define TC3589x_INT_GPIIRQ      0
+#define TC3589x_INT_TI0IRQ      1
+#define TC3589x_INT_TI1IRQ      2
+#define TC3589x_INT_TI2IRQ      3
+#define TC3589x_INT_ROTIRQ      5
+#define TC3589x_INT_KBDIRQ      6
+#define TC3589x_INT_PORIRQ      7
+
+#define TC3589x_NR_INTERNAL_IRQS        8
+#define TC3589x_INT_GPIO(x)     (TC3589x_NR_INTERNAL_IRQS + (x))
+
+struct tc3589x {
+        struct mutex lock;
+        struct device *dev;
+        struct i2c_client *i2c;
+
+        int irq_base;
+        int num_gpio;
+        struct tc3589x_platform_data *pdata;
+};
+
+extern int tc3589x_reg_write(struct tc3589x *tc3589x, u8 reg, u8 data);
+extern int tc3589x_reg_read(struct tc3589x *tc3589x, u8 reg);
+extern int tc3589x_block_read(struct tc3589x *tc3589x, u8 reg, u8 length,
+                              u8 *values);
+extern int tc3589x_block_write(struct tc3589x *tc3589x, u8 reg, u8 length,
+                               const u8 *values);
+extern int tc3589x_set_bits(struct tc3589x *tc3589x, u8 reg, u8 mask, u8 val);
+
+/*
+ * Keypad related platform specific constants
+ * These values may be modified for fine tuning
+ */
+#define TC_KPD_ROWS             0x8
+#define TC_KPD_COLUMNS          0x8
+#define TC_KPD_DEBOUNCE_PERIOD  0xA3
+#define TC_KPD_SETTLE_TIME      0xA3
+
+/**
+ * struct tc35893_platform_data - data structure for platform specific data
+ * @keymap_data:        matrix scan code table for keycodes
+ * @krow:               mask for available rows, value is 0xFF
+ * @kcol:               mask for available columns, value is 0xFF
+ * @debounce_period:    platform specific debounce time
+ * @settle_time:        platform specific settle down time
+ * @irqtype:            type of interrupt, falling or rising edge
+ * @enable_wakeup:      specifies if keypad event can wake up system from sleep
+ * @no_autorepeat:      flag for auto repetition
+ */
+struct tc3589x_keypad_platform_data {
+        const struct matrix_keymap_data *keymap_data;
+        u8                      krow;
+        u8                      kcol;
+        u8                      debounce_period;
+        u8                      settle_time;
+        unsigned long           irqtype;
+        bool                    enable_wakeup;
+        bool                    no_autorepeat;
+};
+
+/**
+ * struct tc3589x_gpio_platform_data - TC3589x GPIO platform data
+ * @gpio_base: first gpio number assigned to TC3589x.  A maximum of
+ *             %TC3589x_NR_GPIOS GPIOs will be allocated.
+ * @setup: callback for board-specific initialization
+ * @remove: callback for board-specific teardown
+ */
+struct tc3589x_gpio_platform_data {
+        int gpio_base;
+        void (*setup)(struct tc3589x *tc3589x, unsigned gpio_base);
+        void (*remove)(struct tc3589x *tc3589x, unsigned gpio_base);
+};
+
+/**
+ * struct tc3589x_platform_data - TC3589x platform data
+ * @block: bitmask of blocks to enable (use TC3589x_BLOCK_*)
+ * @irq_base: base IRQ number.  %TC3589x_NR_IRQS irqs will be used.
+ * @gpio: GPIO-specific platform data
+ * @keypad: keypad-specific platform data
+ */
+struct tc3589x_platform_data {
+        unsigned int block;
+        int irq_base;
+        struct tc3589x_gpio_platform_data *gpio;
+        const struct tc3589x_keypad_platform_data *keypad;
+};
+
+#define TC3589x_NR_GPIOS        24
+#define TC3589x_NR_IRQS         TC3589x_INT_GPIO(TC3589x_NR_GPIOS)
+
+#endif