
24 Sep
2012
24 Sep
'12
5:21 p.m.
On 24/09/2012 17:11, Eric Nelson wrote:
Sorry Stefano,
Between V3 and V4 you changed also ipu_common.c, and that change does not apply.
/* address of boot parameters */
diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c index cc8f881..5f0a1a8 100644 --- a/drivers/video/ipu_common.c +++ b/drivers/video/ipu_common.c @@ -218,7 +218,7 @@ static struct clk ipu_clk = { #else .enable_reg = (u32 *)(CCM_BASE_ADDR + offsetof(struct mxc_ccm_reg, CCGR3)),
- .enable_shift = MXC_CCM_CCGR3_IPU1_IPU_DI0_OFFSET,
- .enable_shift = MXC_CCM_CCGR3_IPU1_IPU_MASK,
But in ipu_common.c:
.enable_reg = (u32 *)(CCM_BASE_ADDR + offsetof(struct mxc_ccm_reg, CCGR5)), .enable_shift = MXC_CCM_CCGR5_CG5_OFFSET,
CCGR5/CG5 is the IPU clock on i.MX5x, not i.MX6x.
Right, but I see no #ifdef..
I do not see another patch changing that. Am I missing something ?
This patch requires the previous change to name the CCGRx bitfields:
http://patchwork.ozlabs.org/patch/185856/
Ah, ok, I see ! Next iteration, thanks.
Best regards, Stefano
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================