projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6e04769
)
ARM: zynq: Setup correct slcr_lock value
author
Michal Simek
<michal.simek@xilinx.com>
Fri, 30 Aug 2013 05:26:08 +0000
(07:26 +0200)
committer
Michal Simek
<michal.simek@xilinx.com>
Wed, 14 May 2014 05:43:34 +0000
(07:43 +0200)
The driver should setup slcr state according
to slcr operations.
Reported-by: Andrey Filippov <andrey@elphel.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/cpu/armv7/zynq/slcr.c
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/armv7/zynq/slcr.c
b/arch/arm/cpu/armv7/zynq/slcr.c
index
1ff1eac
..
5ba58fa
100644
(file)
--- a/
arch/arm/cpu/armv7/zynq/slcr.c
+++ b/
arch/arm/cpu/armv7/zynq/slcr.c
@@
-21,14
+21,18
@@
static int slcr_lock = 1; /* 1 means locked, 0 means unlocked */
void zynq_slcr_lock(void)
{
- if (!slcr_lock)
+ if (!slcr_lock)
{
writel(SLCR_LOCK_MAGIC, &slcr_base->slcr_lock);
+ slcr_lock = 1;
+ }
}
void zynq_slcr_unlock(void)
{
- if (slcr_lock)
+ if (slcr_lock)
{
writel(SLCR_UNLOCK_MAGIC, &slcr_base->slcr_unlock);
+ slcr_lock = 0;
+ }
}
/* Reset the entire system */