From cd1c8449c12acd2bfe3923ff7f04c3bedc3804bd Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 31 Aug 2011 13:00:52 +0200 Subject: [PATCH] --- yaml --- r: 271303 b: refs/heads/master c: da6cf5125f66ed1810616937777884cea021e66a h: refs/heads/master i: 271301: f4cc8081c47489f6158053b862d7582e6bc137c9 271299: b5f9368760e7b61504e4ad75e133655f138bf2e3 271295: ce27f1eff41d60a184b7d3c0795e17b0a3150d64 v: v3 --- [refs] | 2 +- trunk/drivers/video/sh_mobile_meram.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 519bd0bb01f7..ca0641ee7f3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c8a63e22a0802fd56380f6ab305b419f18eb6f5 +refs/heads/master: da6cf5125f66ed1810616937777884cea021e66a diff --git a/trunk/drivers/video/sh_mobile_meram.c b/trunk/drivers/video/sh_mobile_meram.c index f63297099193..4d63490209cd 100644 --- a/trunk/drivers/video/sh_mobile_meram.c +++ b/trunk/drivers/video/sh_mobile_meram.c @@ -373,8 +373,10 @@ static void meram_deinit(struct sh_mobile_meram_priv *priv, struct sh_mobile_meram_icb *icb) { /* disable ICB */ - meram_write_icb(priv->base, icb->cache_icb, MExxCTL, 0); - meram_write_icb(priv->base, icb->marker_icb, MExxCTL, 0); + meram_write_icb(priv->base, icb->cache_icb, MExxCTL, + MExxCTL_WBF | MExxCTL_WF | MExxCTL_RF); + meram_write_icb(priv->base, icb->marker_icb, MExxCTL, + MExxCTL_WBF | MExxCTL_WF | MExxCTL_RF); icb->cache_unit = 0; }