From 5e1202f3a1c9bb40fda43ce50cbf81d52d305d24 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 22 Nov 2012 18:16:37 +0100 Subject: [PATCH] --- yaml --- r: 344329 b: refs/heads/master c: c4b4b732b2e99e6e302d90d57f2a4f5c9516d9a3 h: refs/heads/master i: 344327: 28668a7948f6c1c5c92dca66da08d327d3cfb984 v: v3 --- [refs] | 2 +- trunk/drivers/dma/mv_xor.c | 2 ++ trunk/drivers/dma/mv_xor.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 17b729cc0e8b..9ba3007a488e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f3410ff217f55c2a30bd1b2eb1032806d17c80e +refs/heads/master: c4b4b732b2e99e6e302d90d57f2a4f5c9516d9a3 diff --git a/trunk/drivers/dma/mv_xor.c b/trunk/drivers/dma/mv_xor.c index f450fe8cbd61..2c69b89eac4f 100644 --- a/trunk/drivers/dma/mv_xor.c +++ b/trunk/drivers/dma/mv_xor.c @@ -1240,6 +1240,8 @@ mv_xor_conf_mbus_windows(struct mv_xor_device *xordev, writel(win_enable, base + WINDOW_BAR_ENABLE(0)); writel(win_enable, base + WINDOW_BAR_ENABLE(1)); + writel(0, base + WINDOW_OVERRIDE_CTRL(0)); + writel(0, base + WINDOW_OVERRIDE_CTRL(1)); } static int __devinit mv_xor_probe(struct platform_device *pdev) diff --git a/trunk/drivers/dma/mv_xor.h b/trunk/drivers/dma/mv_xor.h index 17043287b71a..c632a4761fcf 100644 --- a/trunk/drivers/dma/mv_xor.h +++ b/trunk/drivers/dma/mv_xor.h @@ -53,6 +53,7 @@ #define WINDOW_SIZE(w) (0x270 + ((w) << 2)) #define WINDOW_REMAP_HIGH(w) (0x290 + ((w) << 2)) #define WINDOW_BAR_ENABLE(chan) (0x240 + ((chan) << 2)) +#define WINDOW_OVERRIDE_CTRL(chan) (0x2A0 + ((chan) << 2)) struct mv_xor_device { void __iomem *xor_base;