Patched in Tegra support.

7 files changed, 181 insertions, 111 deletions

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 43ec7e247a8..fcbbe71a3cc 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -16,7 +16,6 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/resource.h>
 #include <linux/regulator/consumer.h>
@@ -30,11 +29,18 @@ 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];
 };
 
+struct amba_id {
+        unsigned int            id;
+        unsigned int            mask;
+        void                    *data;
+};
+
 struct amba_driver {
         struct device_driver    drv;
         int                     (*probe)(struct amba_device *, const struct amba_id *);
@@ -59,28 +65,7 @@ extern struct bus_type amba_bustype;
 
 int amba_driver_register(struct amba_driver *);
 void amba_driver_unregister(struct amba_driver *);
-struct amba_device *amba_device_alloc(const char *, resource_size_t, size_t);
-void amba_device_put(struct amba_device *);
-int amba_device_add(struct amba_device *, struct resource *);
 int amba_device_register(struct amba_device *, struct resource *);
-struct amba_device *amba_apb_device_add(struct device *parent, const char *name,
-                                        resource_size_t base, size_t size,
-                                        int irq1, int irq2, void *pdata,
-                                        unsigned int periphid);
-struct amba_device *amba_ahb_device_add(struct device *parent, const char *name,
-                                        resource_size_t base, size_t size,
-                                        int irq1, int irq2, void *pdata,
-                                        unsigned int periphid);
-struct amba_device *
-amba_apb_device_add_res(struct device *parent, const char *name,
-                        resource_size_t base, size_t size, int irq1,
-                        int irq2, void *pdata, unsigned int periphid,
-                        struct resource *resbase);
-struct amba_device *
-amba_ahb_device_add_res(struct device *parent, const char *name,
-                        resource_size_t base, size_t size, int irq1,
-                        int irq2, void *pdata, unsigned int periphid,
-                        struct resource *resbase);
 void amba_device_unregister(struct amba_device *);
 struct amba_device *amba_find_device(const char *, struct device *, unsigned int, unsigned int);
 int amba_request_regions(struct amba_device *, const char *);
@@ -92,6 +77,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)
@@ -103,46 +94,4 @@ void amba_release_regions(struct amba_device *);
 #define amba_manf(d)    AMBA_MANF_BITS((d)->periphid)
 #define amba_part(d)    AMBA_PART_BITS((d)->periphid)
 
-#define __AMBA_DEV(busid, data, mask)                           \
-        {                                                       \
-                .coherent_dma_mask = mask,                      \
-                .init_name = busid,                             \
-                .platform_data = data,                          \
-        }
-
-/*
- * APB devices do not themselves have the ability to address memory,
- * so DMA masks should be zero (much like USB peripheral devices.)
- * The DMA controller DMA masks should be used instead (much like
- * USB host controllers in conventional PCs.)
- */
-#define AMBA_APB_DEVICE(name, busid, id, base, irqs, data)      \
-struct amba_device name##_device = {                            \
-        .dev = __AMBA_DEV(busid, data, 0),                      \
-        .res = DEFINE_RES_MEM(base, SZ_4K),                     \
-        .irq = irqs,                                            \
-        .periphid = id,                                         \
-}
-
-/*
- * AHB devices are DMA capable, so set their DMA masks
- */
-#define AMBA_AHB_DEVICE(name, busid, id, base, irqs, data)      \
-struct amba_device name##_device = {                            \
-        .dev = __AMBA_DEV(busid, data, ~0ULL),                  \
-        .res = DEFINE_RES_MEM(base, SZ_4K),                     \
-        .dma_mask = ~0ULL,                                      \
-        .irq = irqs,                                            \
-        .periphid = id,                                         \
-}
-
-/*
- * module_amba_driver() - Helper macro for drivers that don't do anything
- * special in module init/exit.  This eliminates a lot of boilerplate.  Each
- * module may only use this macro once, and calling it replaces module_init()
- * and module_exit()
- */
-#define module_amba_driver(__amba_drv) \
-        module_driver(__amba_drv, amba_driver_register, amba_driver_unregister)
-
 #endif
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h
index 32a89cf5ec4..60c737f7bda 100644
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.h
@@ -5,19 +5,15 @@
 #define AMBA_MMCI_H
 
 #include <linux/mmc/host.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/sdio_func.h>
 
-
-/*
- * These defines is places here due to access is needed from machine
- * configuration files. The ST Micro version does not have ROD and
- * reuse the voltage registers for direction settings.
- */
-#define MCI_ST_DATA2DIREN       (1 << 2)
-#define MCI_ST_CMDDIREN         (1 << 3)
-#define MCI_ST_DATA0DIREN       (1 << 4)
-#define MCI_ST_DATA31DIREN      (1 << 5)
-#define MCI_ST_FBCLKEN          (1 << 7)
-#define MCI_ST_DATA74DIREN      (1 << 8)
+struct embedded_sdio_data {
+        struct sdio_cis cis;
+        struct sdio_cccr cccr;
+        struct sdio_embedded_func *funcs;
+        int num_funcs;
+};
 
 /* Just some dummy forwarding */
 struct dma_chan;
@@ -31,8 +27,7 @@ struct dma_chan;
  * @ocr_mask: available voltages on the 4 pins from the block, this
  * is ignored if a regulator is used, see the MMC_VDD_* masks in
  * mmc/host.h
- * @ios_handler: a callback function to act on specfic ios changes,
- * used for example to control a levelshifter
+ * @vdd_handler: a callback function to translate a MMC_VDD_*
  * mask into a value to be binary (or set some other custom bits
  * in MMCIPWR) or:ed and written into the MMCIPWR register of the
  * block.  May also control external power based on the power_mode.
@@ -44,9 +39,6 @@ struct dma_chan;
  * @cd_invert: true if the gpio_cd pin value is active low
  * @capabilities: the capabilities of the block as implemented in
  * this platform, signify anything MMC_CAP_* from mmc/host.h
- * @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h
- * @sigdir: a bit field indicating for what bits in the MMC bus the host
- * should enable signal direction indication.
  * @dma_filter: function used to select an appropriate RX and TX
  * DMA channel to be used for DMA, if and only if you're deploying the
  * generic DMA engine
@@ -62,17 +54,19 @@ struct dma_chan;
 struct mmci_platform_data {
         unsigned int f_max;
         unsigned int ocr_mask;
-        int (*ios_handler)(struct device *, struct mmc_ios *);
+        u32 (*vdd_handler)(struct device *, unsigned int vdd,
+                           unsigned char power_mode);
         unsigned int (*status)(struct device *);
         int     gpio_wp;
         int     gpio_cd;
         bool    cd_invert;
         unsigned long capabilities;
-        unsigned long capabilities2;
-        u32 sigdir;
         bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
         void *dma_rx_param;
         void *dma_tx_param;
+        unsigned int status_irq;
+        struct embedded_sdio_data *embedded_sdio;
+        int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
 };
 
 #endif
diff --git a/include/linux/amba/pl022.h b/include/linux/amba/pl022.h
index 854b7294f6c..4ce98f54186 100644
--- a/include/linux/amba/pl022.h
+++ b/include/linux/amba/pl022.h
@@ -25,7 +25,7 @@
 #ifndef _SSP_PL022_H
 #define _SSP_PL022_H
 
-#include <linux/types.h>
+#include <linux/device.h>
 
 /**
  * whether SSP is in loopback mode or not
@@ -231,7 +231,6 @@ enum ssp_chip_select {
 struct dma_chan;
 /**
  * struct pl022_ssp_master - device.platform_data for SPI controller devices.
- * @bus_id: identifier for this bus
  * @num_chipselect: chipselects are used to distinguish individual
  *     SPI slaves, and are numbered from zero to num_chipselects - 1.
  *     each slave has a chipselect signal, but it's common that not
@@ -239,12 +238,6 @@ struct dma_chan;
  * @enable_dma: if true enables DMA driven transfers.
  * @dma_rx_param: parameter to locate an RX DMA channel.
  * @dma_tx_param: parameter to locate a TX DMA channel.
- * @autosuspend_delay: delay in ms following transfer completion before the
- *     runtime power management system suspends the device. A setting of 0
- *     indicates no delay and the device will be suspended immediately.
- * @rt: indicates the controller should run the message pump with realtime
- *     priority to minimise the transfer latency on the bus.
- * @chipselects: list of <num_chipselects> chip select gpios
  */
 struct pl022_ssp_controller {
         u16 bus_id;
@@ -253,22 +246,25 @@ struct pl022_ssp_controller {
         bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
         void *dma_rx_param;
         void *dma_tx_param;
-        int autosuspend_delay;
-        bool rt;
-        int *chipselects;
 };
 
 /**
  * struct ssp_config_chip - spi_board_info.controller_data for SPI
  * slave devices, copied to spi_device.controller_data.
  *
+ * @lbm: used for test purpose to internally connect RX and TX
  * @iface: Interface type(Motorola, TI, Microwire, Universal)
  * @hierarchy: sets whether interface is master or slave
  * @slave_tx_disable: SSPTXD is disconnected (in slave mode only)
  * @clk_freq: Tune freq parameters of SSP(when in master mode)
+ * @endian_rx: Endianess of Data in Rx FIFO
+ * @endian_tx: Endianess of Data in Tx FIFO
+ * @data_size: Width of data element(4 to 32 bits)
  * @com_mode: communication mode: polling, Interrupt or DMA
  * @rx_lev_trig: Rx FIFO watermark level (for IT & DMA mode)
  * @tx_lev_trig: Tx FIFO watermark level (for IT & DMA mode)
+ * @clk_phase: Motorola SPI interface Clock phase
+ * @clk_pol: Motorola SPI interface Clock polarity
  * @ctrl_len: Microwire interface: Control length
  * @wait_state: Microwire interface: Wait state
  * @duplex: Microwire interface: Full/Half duplex
@@ -276,6 +272,8 @@ struct pl022_ssp_controller {
  * before sampling the incoming line
  * @cs_control: function pointer to board-specific function to
  * assert/deassert I/O port to control HW generation of devices chip-select.
+ * @dma_xfer_type: Type of DMA xfer (Mem-to-periph or Periph-to-Periph)
+ * @dma_config: DMA configuration for SSP controller and peripheral
  */
 struct pl022_config_chip {
         enum ssp_interface iface;
diff --git a/include/linux/amba/pl061.h b/include/linux/amba/pl061.h
index fb83c045348..5ddd9ad4b19 100644
--- a/include/linux/amba/pl061.h
+++ b/include/linux/amba/pl061.h
@@ -7,7 +7,8 @@ struct pl061_platform_data {
         unsigned        gpio_base;
 
         /* number of the first IRQ.
-         * If the IRQ functionality in not desired this must be set to 0.
+         * If the IRQ functionality in not desired this must be set to
+         * (unsigned) -1.
          */
         unsigned        irq_base;
 
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index 2a5f64a11b7..e6e28f37d8e 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -21,9 +21,8 @@
 #include <linux/dmaengine.h>
 #include <linux/interrupt.h>
 
+struct pl08x_lli;
 struct pl08x_driver_data;
-struct pl08x_phy_chan;
-struct pl08x_txd;
 
 /* Bitmasks for selecting AHB ports for DMA transfers */
 enum {
@@ -47,29 +46,149 @@ enum {
  * devices with static assignments
  * @muxval: a number usually used to poke into some mux regiser to
  * mux in the signal to this channel
- * @cctl_memcpy: options for the channel control register for memcpy
- *  *** not used for slave channels ***
+ * @cctl_opt: default options for the channel control register
  * @addr: source/target address in physical memory for this DMA channel,
  * can be the address of a FIFO register for burst requests for example.
  * This can be left undefined if the PrimeCell API is used for configuring
  * this.
+ * @circular_buffer: whether the buffer passed in is circular and
+ * shall simply be looped round round (like a record baby round
+ * round round round)
  * @single: the device connected to this channel will request single DMA
  * transfers, not bursts. (Bursts are default.)
  * @periph_buses: the device connected to this channel is accessible via
  * these buses (use PL08X_AHB1 | PL08X_AHB2).
  */
 struct pl08x_channel_data {
-        const char *bus_id;
+        char *bus_id;
         int min_signal;
         int max_signal;
         u32 muxval;
-        u32 cctl_memcpy;
+        u32 cctl;
         dma_addr_t addr;
+        bool circular_buffer;
         bool single;
         u8 periph_buses;
 };
 
 /**
+ * Struct pl08x_bus_data - information of source or destination
+ * busses for a transfer
+ * @addr: current address
+ * @maxwidth: the maximum width of a transfer on this bus
+ * @buswidth: the width of this bus in bytes: 1, 2 or 4
+ * @fill_bytes: bytes required to fill to the next bus memory boundary
+ */
+struct pl08x_bus_data {
+        dma_addr_t addr;
+        u8 maxwidth;
+        u8 buswidth;
+        size_t fill_bytes;
+};
+
+/**
+ * struct pl08x_phy_chan - holder for the physical channels
+ * @id: physical index to this channel
+ * @lock: a lock to use when altering an instance of this struct
+ * @signal: the physical signal (aka channel) serving this physical channel
+ * right now
+ * @serving: the virtual channel currently being served by this physical
+ * channel
+ */
+struct pl08x_phy_chan {
+        unsigned int id;
+        void __iomem *base;
+        spinlock_t lock;
+        int signal;
+        struct pl08x_dma_chan *serving;
+};
+
+/**
+ * struct pl08x_txd - wrapper for struct dma_async_tx_descriptor
+ * @llis_bus: DMA memory address (physical) start for the LLIs
+ * @llis_va: virtual memory address start for the LLIs
+ */
+struct pl08x_txd {
+        struct dma_async_tx_descriptor tx;
+        struct list_head node;
+        enum dma_data_direction direction;
+        dma_addr_t src_addr;
+        dma_addr_t dst_addr;
+        size_t len;
+        dma_addr_t llis_bus;
+        struct pl08x_lli *llis_va;
+        /* Default cctl value for LLIs */
+        u32 cctl;
+        /*
+         * Settings to be put into the physical channel when we
+         * trigger this txd.  Other registers are in llis_va[0].
+         */
+        u32 ccfg;
+};
+
+/**
+ * struct pl08x_dma_chan_state - holds the PL08x specific virtual channel
+ * states
+ * @PL08X_CHAN_IDLE: the channel is idle
+ * @PL08X_CHAN_RUNNING: the channel has allocated a physical transport
+ * channel and is running a transfer on it
+ * @PL08X_CHAN_PAUSED: the channel has allocated a physical transport
+ * channel, but the transfer is currently paused
+ * @PL08X_CHAN_WAITING: the channel is waiting for a physical transport
+ * channel to become available (only pertains to memcpy channels)
+ */
+enum pl08x_dma_chan_state {
+        PL08X_CHAN_IDLE,
+        PL08X_CHAN_RUNNING,
+        PL08X_CHAN_PAUSED,
+        PL08X_CHAN_WAITING,
+};
+
+/**
+ * struct pl08x_dma_chan - this structure wraps a DMA ENGINE channel
+ * @chan: wrappped abstract channel
+ * @phychan: the physical channel utilized by this channel, if there is one
+ * @phychan_hold: if non-zero, hold on to the physical channel even if we
+ * have no pending entries
+ * @tasklet: tasklet scheduled by the IRQ to handle actual work etc
+ * @name: name of channel
+ * @cd: channel platform data
+ * @runtime_addr: address for RX/TX according to the runtime config
+ * @runtime_direction: current direction of this channel according to
+ * runtime config
+ * @lc: last completed transaction on this channel
+ * @pend_list: queued transactions pending on this channel
+ * @at: active transaction on this channel
+ * @lock: a lock for this channel data
+ * @host: a pointer to the host (internal use)
+ * @state: whether the channel is idle, paused, running etc
+ * @slave: whether this channel is a device (slave) or for memcpy
+ * @waiting: a TX descriptor on this channel which is waiting for a physical
+ * channel to become available
+ */
+struct pl08x_dma_chan {
+        struct dma_chan chan;
+        struct pl08x_phy_chan *phychan;
+        int phychan_hold;
+        struct tasklet_struct tasklet;
+        char *name;
+        const struct pl08x_channel_data *cd;
+        dma_addr_t src_addr;
+        dma_addr_t dst_addr;
+        u32 src_cctl;
+        u32 dst_cctl;
+        enum dma_data_direction runtime_direction;
+        dma_cookie_t lc;
+        struct list_head pend_list;
+        struct pl08x_txd *at;
+        spinlock_t lock;
+        struct pl08x_driver_data *host;
+        enum pl08x_dma_chan_state state;
+        bool slave;
+        struct pl08x_txd *waiting;
+};
+
+/**
  * struct pl08x_platform_data - the platform configuration for the PL08x
  * PrimeCells.
  * @slave_channels: the channels defined for the different devices on the
@@ -89,8 +208,8 @@ struct pl08x_platform_data {
         const struct pl08x_channel_data *slave_channels;
         unsigned int num_slave_channels;
         struct pl08x_channel_data memcpy_channel;
-        int (*get_signal)(const struct pl08x_channel_data *);
-        void (*put_signal)(const struct pl08x_channel_data *, int);
+        int (*get_signal)(struct pl08x_dma_chan *);
+        void (*put_signal)(struct pl08x_dma_chan *);
         u8 lli_buses;
         u8 mem_buses;
 };
diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h
index fe93758e840..cbee7de7dd3 100644
--- a/include/linux/amba/pl330.h
+++ b/include/linux/amba/pl330.h
@@ -12,7 +12,20 @@
 #ifndef __AMBA_PL330_H_
 #define __AMBA_PL330_H_
 
-#include <linux/dmaengine.h>
+#include <asm/hardware/pl330.h>
+
+struct dma_pl330_peri {
+        /*
+         * Peri_Req i/f of the DMAC that is
+         * peripheral could be reached from.
+         */
+        u8 peri_id; /* {0, 31} */
+        enum pl330_reqtype rqtype;
+
+        /* For M->D and D->M Channels */
+        int burst_sz; /* in power of 2 */
+        dma_addr_t fifo_addr;
+};
 
 struct dma_pl330_platdata {
         /*
@@ -24,12 +37,9 @@ struct dma_pl330_platdata {
          */
         u8 nr_valid_peri;
         /* Array of valid peripherals */
-        u8 *peri_id;
-        /* Operational capabilities */
-        dma_cap_mask_t cap_mask;
+        struct dma_pl330_peri *peri;
         /* Bytes to allocate for MC buffer */
         unsigned mcbuf_sz;
 };
 
-extern bool pl330_filter(struct dma_chan *chan, void *param);
 #endif  /* __AMBA_PL330_H_ */
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index f612c783170..514ed45c462 100644
--- a/include/linux/amba/serial.h
+++ b/include/linux/amba/serial.h
@@ -23,8 +23,6 @@
 #ifndef ASM_ARM_HARDWARE_SERIAL_AMBA_H
 #define ASM_ARM_HARDWARE_SERIAL_AMBA_H
 
-#include <linux/types.h>
-
 /* -------------------------------------------------------------------------------
  *  From AMBA UART (PL010) Block Specification
  * -------------------------------------------------------------------------------
@@ -205,6 +203,7 @@ struct amba_pl011_data {
         void *dma_tx_param;
         void (*init) (void);
         void (*exit) (void);
+        void (*reset) (void);
 };
 #endif