Commit 35d8faae authored by Russell King's avatar Russell King

[ARM] Add __iomem annotations to ARM amba drivers.

parent bba10cd3
...@@ -194,7 +194,7 @@ amba_attr(resource, "\t%08lx\t%08lx\t%08lx\n", ...@@ -194,7 +194,7 @@ amba_attr(resource, "\t%08lx\t%08lx\t%08lx\n",
int amba_device_register(struct amba_device *dev, struct resource *parent) int amba_device_register(struct amba_device *dev, struct resource *parent)
{ {
u32 pid, cid; u32 pid, cid;
void *tmp; void __iomem *tmp;
int i, ret; int i, ret;
dev->dev.release = amba_device_release; dev->dev.release = amba_device_release;
......
...@@ -69,7 +69,7 @@ static void mmci_stop_data(struct mmci_host *host) ...@@ -69,7 +69,7 @@ static void mmci_stop_data(struct mmci_host *host)
static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
{ {
unsigned int datactrl, timeout, irqmask; unsigned int datactrl, timeout, irqmask;
void *base; void __iomem *base;
DBG(host, "blksz %04x blks %04x flags %08x\n", DBG(host, "blksz %04x blks %04x flags %08x\n",
1 << data->blksz_bits, data->blocks, data->flags); 1 << data->blksz_bits, data->blocks, data->flags);
...@@ -108,7 +108,7 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) ...@@ -108,7 +108,7 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
static void static void
mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c) mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c)
{ {
void *base = host->base; void __iomem *base = host->base;
DBG(host, "op %02x arg %08x flags %08x\n", DBG(host, "op %02x arg %08x flags %08x\n",
cmd->opcode, cmd->arg, cmd->flags); cmd->opcode, cmd->arg, cmd->flags);
...@@ -169,7 +169,7 @@ static void ...@@ -169,7 +169,7 @@ static void
mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
unsigned int status) unsigned int status)
{ {
void *base = host->base; void __iomem *base = host->base;
host->cmd = NULL; host->cmd = NULL;
...@@ -193,7 +193,7 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, ...@@ -193,7 +193,7 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int remain) static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int remain)
{ {
void *base = host->base; void __iomem *base = host->base;
char *ptr = buffer; char *ptr = buffer;
u32 status; u32 status;
...@@ -222,7 +222,7 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema ...@@ -222,7 +222,7 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
static int mmci_pio_write(struct mmci_host *host, char *buffer, unsigned int remain, u32 status) static int mmci_pio_write(struct mmci_host *host, char *buffer, unsigned int remain, u32 status)
{ {
void *base = host->base; void __iomem *base = host->base;
char *ptr = buffer; char *ptr = buffer;
do { do {
...@@ -251,7 +251,7 @@ static int mmci_pio_write(struct mmci_host *host, char *buffer, unsigned int rem ...@@ -251,7 +251,7 @@ static int mmci_pio_write(struct mmci_host *host, char *buffer, unsigned int rem
static irqreturn_t mmci_pio_irq(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t mmci_pio_irq(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct mmci_host *host = dev_id; struct mmci_host *host = dev_id;
void *base = host->base; void __iomem *base = host->base;
u32 status; u32 status;
status = readl(base + MMCISTATUS); status = readl(base + MMCISTATUS);
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
struct clk; struct clk;
struct mmci_host { struct mmci_host {
void *base; void __iomem *base;
struct mmc_request *mrq; struct mmc_request *mrq;
struct mmc_command *cmd; struct mmc_command *cmd;
struct mmc_data *data; struct mmc_data *data;
......
...@@ -745,7 +745,7 @@ static struct uart_driver amba_reg = { ...@@ -745,7 +745,7 @@ static struct uart_driver amba_reg = {
static int pl011_probe(struct amba_device *dev, void *id) static int pl011_probe(struct amba_device *dev, void *id)
{ {
struct uart_amba_port *uap; struct uart_amba_port *uap;
void *base; void __iomem *base;
int i, ret; int i, ret;
for (i = 0; i < ARRAY_SIZE(amba_ports); i++) for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
......
...@@ -141,7 +141,7 @@ struct clcd_fb { ...@@ -141,7 +141,7 @@ struct clcd_fb {
struct clcd_panel *panel; struct clcd_panel *panel;
struct clcd_board *board; struct clcd_board *board;
void *board_data; void *board_data;
void *regs; void __iomem *regs;
u32 clcd_cntl; u32 clcd_cntl;
u32 cmap[16]; u32 cmap[16];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment