summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-05-31 07:23:59 +0000
committerAnatolij Gustschin <agust@denx.de>2012-07-10 11:35:39 +0200
commit477bca22f6bb649fb4c55d3ee401ff0f3c0c0e9e (patch)
tree680d91602555adc9c062e2ea9081ec638eeb07c5 /drivers/video
parente4942ad703d81bc800210de3f4ba27a2f8178eb3 (diff)
downloadblackbird-obmc-uboot-477bca22f6bb649fb4c55d3ee401ff0f3c0c0e9e.tar.gz
blackbird-obmc-uboot-477bca22f6bb649fb4c55d3ee401ff0f3c0c0e9e.zip
ipu_common: Rename MXC_CCM_BASE
Rename MXC_CCM_BASE to CCM_BASE_ADDR as this is already defined for MX6. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/ipu_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c
index 7ef8742d2b..84892dcbfd 100644
--- a/drivers/video/ipu_common.c
+++ b/drivers/video/ipu_common.c
@@ -211,7 +211,7 @@ static void clk_ipu_disable(struct clk *clk)
static struct clk ipu_clk = {
.name = "ipu_clk",
.rate = 133000000,
- .enable_reg = (u32 *)(MXC_CCM_BASE +
+ .enable_reg = (u32 *)(CCM_BASE_ADDR +
offsetof(struct mxc_ccm_reg, CCGR5)),
.enable_shift = MXC_CCM_CCGR5_CG5_OFFSET,
.enable = clk_ipu_enable,
OpenPOWER on IntegriCloud