summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-14 07:15:48 -0700
committerTom Rini <trini@ti.com>2012-09-14 07:15:48 -0700
commit8f082d78fafd94db3f21b503794e0875d3331e53 (patch)
tree1eef05dcd0fca58283eac2c5fff55ba53f5abc81 /board
parentf71d5cd56bee6e730fe46f5f2024f1b5106ab944 (diff)
parent748fd4a621a870d378e4e4f54df76a38fd5d3cba (diff)
downloadu-boot-imx-8f082d78fafd94db3f21b503794e0875d3331e53.zip
u-boot-imx-8f082d78fafd94db3f21b503794e0875d3331e53.tar.gz
u-boot-imx-8f082d78fafd94db3f21b503794e0875d3331e53.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'board')
-rw-r--r--board/qi/qi_lb60/qi_lb60.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/qi/qi_lb60/qi_lb60.c b/board/qi/qi_lb60/qi_lb60.c
index 3583d01..d975209 100644
--- a/board/qi/qi_lb60/qi_lb60.c
+++ b/board/qi/qi_lb60/qi_lb60.c
@@ -69,7 +69,7 @@ static void gpio_init(void)
static void cpm_init(void)
{
struct jz4740_cpm *cpm = (struct jz4740_cpm *)JZ4740_CPM_BASE;
- uint32_t reg = readw(&cpm->clkgr);
+ uint32_t reg = readl(&cpm->clkgr);
reg |= CPM_CLKGR_IPU |
CPM_CLKGR_CIM |
@@ -81,7 +81,7 @@ static void cpm_init(void)
CPM_CLKGR_UDC |
CPM_CLKGR_AIC1;
- writew(reg, &cpm->clkgr);
+ writel(reg, &cpm->clkgr);
}
int board_early_init_f(void)