summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-03-21 22:45:36 +0100
committerWolfgang Denk <wd@denx.de>2010-03-21 22:45:36 +0100
commitb46b353b901a45ebe860f8bf874ca99f018cd410 (patch)
treee2d42c0f36b9d7b67c1a17fe97f4734552370a6b /drivers
parent3c950e2ebfde083084cc926b020e3a22a536bf85 (diff)
parentdaa989b47297c9f73426783599c286ef3a1f3f49 (diff)
downloadu-boot-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.gz
Merge remote branch 'origin/master' into next
Diffstat (limited to 'drivers')
-rw-r--r--[-rwxr-xr-x]drivers/i2c/Makefile0
-rw-r--r--[-rwxr-xr-x]drivers/i2c/spr_i2c.c0
-rw-r--r--drivers/mmc/mxcmmc.c36
-rw-r--r--[-rwxr-xr-x]drivers/mtd/Makefile0
-rw-r--r--[-rwxr-xr-x]drivers/mtd/nand/spr_nand.c0
-rw-r--r--[-rwxr-xr-x]drivers/mtd/spr_smi.c0
-rw-r--r--drivers/pci/pci.c2
-rw-r--r--[-rwxr-xr-x]drivers/serial/usbtty.h0
-rw-r--r--[-rwxr-xr-x]drivers/usb/gadget/Makefile0
-rw-r--r--[-rwxr-xr-x]drivers/usb/gadget/spr_udc.c0
10 files changed, 19 insertions, 19 deletions
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 29bda85dbd..29bda85dbd 100755..100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
diff --git a/drivers/i2c/spr_i2c.c b/drivers/i2c/spr_i2c.c
index eabfe843f7..eabfe843f7 100755..100644
--- a/drivers/i2c/spr_i2c.c
+++ b/drivers/i2c/spr_i2c.c
diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c
index d30717661f..59639539f3 100644
--- a/drivers/mmc/mxcmmc.c
+++ b/drivers/mmc/mxcmmc.c
@@ -136,14 +136,14 @@ static void mxcmci_softreset(struct mxcmci_host *host)
int i;
/* reset sequence */
- writew(STR_STP_CLK_RESET, &host->base->str_stp_clk);
- writew(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK,
+ writel(STR_STP_CLK_RESET, &host->base->str_stp_clk);
+ writel(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK,
&host->base->str_stp_clk);
for (i = 0; i < 8; i++)
- writew(STR_STP_CLK_START_CLK, &host->base->str_stp_clk);
+ writel(STR_STP_CLK_START_CLK, &host->base->str_stp_clk);
- writew(0xff, &host->base->res_to);
+ writel(0xff, &host->base->res_to);
}
static void mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
@@ -154,8 +154,8 @@ static void mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
host->data = data;
- writew(nob, &host->base->nob);
- writew(blksz, &host->base->blk_len);
+ writel(nob, &host->base->nob);
+ writel(blksz, &host->base->blk_len);
host->datasize = datasize;
}
@@ -185,9 +185,9 @@ static int mxcmci_start_cmd(struct mxcmci_host *host, struct mmc_cmd *cmd,
return -EINVAL;
}
- writew(cmd->cmdidx, &host->base->cmd);
+ writel(cmd->cmdidx, &host->base->cmd);
writel(cmd->cmdarg, &host->base->arg);
- writew(cmdat, &host->base->cmd_dat_cont);
+ writel(cmdat, &host->base->cmd_dat_cont);
return 0;
}
@@ -247,14 +247,14 @@ static int mxcmci_read_response(struct mxcmci_host *host, unsigned int stat)
if (cmd->resp_type & MMC_RSP_PRESENT) {
if (cmd->resp_type & MMC_RSP_136) {
for (i = 0; i < 4; i++) {
- a = readw(&host->base->res_fifo);
- b = readw(&host->base->res_fifo);
+ a = readl(&host->base->res_fifo) & 0xFFFF;
+ b = readl(&host->base->res_fifo) & 0xFFFF;
resp[i] = a << 16 | b;
}
} else {
- a = readw(&host->base->res_fifo);
- b = readw(&host->base->res_fifo);
- c = readw(&host->base->res_fifo);
+ a = readl(&host->base->res_fifo) & 0xFFFF;
+ b = readl(&host->base->res_fifo) & 0xFFFF;
+ c = readl(&host->base->res_fifo) & 0xFFFF;
resp[0] = a << 24 | b << 8 | c >> 8;
}
}
@@ -445,7 +445,7 @@ static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios)
prescaler <<= 1;
}
- writew((prescaler << 4) | divider, &host->base->clk_rate);
+ writel((prescaler << 4) | divider, &host->base->clk_rate);
}
static void mxcmci_set_ios(struct mmc *mmc)
@@ -458,9 +458,9 @@ static void mxcmci_set_ios(struct mmc *mmc)
if (mmc->clock) {
mxcmci_set_clk_rate(host, mmc->clock);
- writew(STR_STP_CLK_START_CLK, &host->base->str_stp_clk);
+ writel(STR_STP_CLK_START_CLK, &host->base->str_stp_clk);
} else {
- writew(STR_STP_CLK_STOP_CLK, &host->base->str_stp_clk);
+ writel(STR_STP_CLK_STOP_CLK, &host->base->str_stp_clk);
}
host->clock = mmc->clock;
@@ -472,7 +472,7 @@ static int mxcmci_init(struct mmc *mmc)
mxcmci_softreset(host);
- host->rev_no = readw(&host->base->rev_no);
+ host->rev_no = readl(&host->base->rev_no);
if (host->rev_no != 0x400) {
printf("wrong rev.no. 0x%08x. aborting.\n",
host->rev_no);
@@ -480,7 +480,7 @@ static int mxcmci_init(struct mmc *mmc)
}
/* recommended in data sheet */
- writew(0x2db4, &host->base->read_to);
+ writel(0x2db4, &host->base->read_to);
writel(0, &host->base->int_cntr);
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index cbf6f156b4..cbf6f156b4 100755..100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
diff --git a/drivers/mtd/nand/spr_nand.c b/drivers/mtd/nand/spr_nand.c
index 097d0c60bf..097d0c60bf 100755..100644
--- a/drivers/mtd/nand/spr_nand.c
+++ b/drivers/mtd/nand/spr_nand.c
diff --git a/drivers/mtd/spr_smi.c b/drivers/mtd/spr_smi.c
index 9a70a199c8..9a70a199c8 100755..100644
--- a/drivers/mtd/spr_smi.c
+++ b/drivers/mtd/spr_smi.c
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d6d2d6e4ad..cd64a87fc6 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -388,7 +388,7 @@ int pci_hose_config_device(struct pci_controller *hose,
pci_hose_write_config_dword (hose, dev, PCI_COMMAND, 0);
- for (bar = PCI_BASE_ADDRESS_0; bar < PCI_BASE_ADDRESS_5; bar += 4) {
+ for (bar = PCI_BASE_ADDRESS_0; bar <= PCI_BASE_ADDRESS_5; bar += 4) {
pci_hose_write_config_dword (hose, dev, bar, 0xffffffff);
pci_hose_read_config_dword (hose, dev, bar, &bar_response);
diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h
index a23169a29d..a23169a29d 100755..100644
--- a/drivers/serial/usbtty.h
+++ b/drivers/serial/usbtty.h
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 1d7362dc97..1d7362dc97 100755..100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
diff --git a/drivers/usb/gadget/spr_udc.c b/drivers/usb/gadget/spr_udc.c
index f2b06d68e2..f2b06d68e2 100755..100644
--- a/drivers/usb/gadget/spr_udc.c
+++ b/drivers/usb/gadget/spr_udc.c