summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavi Merino <javi.merino@arm.com>2011-11-16 12:45:39 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-11-21 13:12:19 +0000
commit1c8a7c1fbfc7ae2362d26559df26b99c806b68b5 (patch)
tree1b86fd2a9b0b8d27b7fd6a01604844e3ab5b688f
parent2674dd0b1c07d8b8dfb4872fc7b41841f05cb957 (diff)
downloadop-kernel-dev-1c8a7c1fbfc7ae2362d26559df26b99c806b68b5.zip
op-kernel-dev-1c8a7c1fbfc7ae2362d26559df26b99c806b68b5.tar.gz
ARM: 7165/2: PL330: Fix typo in _prepare_ccr()
scctl should be shifted by CC_SRCCTRL_SHFT and dcctl by CC_DSTCCTRL_SHFT, not the other way round. Reference: <1320244259-10496-4-git-send-email-javi.merino@arm.com> Signed-off-by: Javi Merino <javi.merino@arm.com> Acked-by: Jassi Brar <jassisinghbrar@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/common/pl330.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/pl330.c b/arch/arm/common/pl330.c
index f748a38..f407a6b 100644
--- a/arch/arm/common/pl330.c
+++ b/arch/arm/common/pl330.c
@@ -1211,8 +1211,8 @@ static inline u32 _prepare_ccr(const struct pl330_reqcfg *rqc)
ccr |= (rqc->brst_size << CC_SRCBRSTSIZE_SHFT);
ccr |= (rqc->brst_size << CC_DSTBRSTSIZE_SHFT);
- ccr |= (rqc->dcctl << CC_SRCCCTRL_SHFT);
- ccr |= (rqc->scctl << CC_DSTCCTRL_SHFT);
+ ccr |= (rqc->scctl << CC_SRCCCTRL_SHFT);
+ ccr |= (rqc->dcctl << CC_DSTCCTRL_SHFT);
ccr |= (rqc->swap << CC_SWAP_SHFT);
OpenPOWER on IntegriCloud