UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: zynq: slcr: Use read-modify-write for register writes 

zynq_slcr_cpu_start/stop() ignored the current register state when
writing to a register. Fixing this by implementing proper
read-modify-write.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Soren Brinkmann 2013-07-17 10:10:15 -07:00 committed by Michal Simek
parent b5f177ff30
commit 3db9e86029
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mach-zynq/slcr.c
View File

@ -61,11 +61,11 @@ void zynq_slcr_system_reset(void)
*/ */
void zynq_slcr_cpu_start(int cpu) void zynq_slcr_cpu_start(int cpu)
{ {
/* enable CPUn */ u32 reg = readl(zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
writel(SLCR_A9_CPU_CLKSTOP << cpu, reg &= ~(SLCR_A9_CPU_RST << cpu);
zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET); writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
/* enable CLK for CPUn */ reg &= ~(SLCR_A9_CPU_CLKSTOP << cpu);
writel(0x0 << cpu, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET); writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
} }
/** /**
@ -74,9 +74,9 @@ void zynq_slcr_cpu_start(int cpu)
*/ */
void zynq_slcr_cpu_stop(int cpu) void zynq_slcr_cpu_stop(int cpu)
{ {
/* stop CLK and reset CPUn */ u32 reg = readl(zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
writel((SLCR_A9_CPU_CLKSTOP | SLCR_A9_CPU_RST) << cpu, reg |= (SLCR_A9_CPU_CLKSTOP | SLCR_A9_CPU_RST) << cpu;
zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET); writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
} }
/** /**