From 477bca22f6bb649fb4c55d3ee401ff0f3c0c0e9e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 31 May 2012 07:23:59 +0000 Subject: 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 diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c index 7ef8742..84892dc 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, -- cgit v0.10.2