Commit 94a038c2 authored by Mike Frysinger's avatar Mike Frysinger

Blackfin: bf561: update a few more SIC_SYSCR locations

Looks like I missed a few new spots when renaming the SICA macros.
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent a2ce077a
...@@ -20,18 +20,18 @@ static __inline__ void bfin_write_PLL_CTL(unsigned int val) ...@@ -20,18 +20,18 @@ static __inline__ void bfin_write_PLL_CTL(unsigned int val)
flags = hard_local_irq_save(); flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */ /* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SICA_IWR0); iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SICA_IWR1); iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */ /* Only allow PPL Wakeup) */
bfin_write32(SICA_IWR0, IWR_ENABLE(0)); bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SICA_IWR1, 0); bfin_write32(SIC_IWR1, 0);
bfin_write16(PLL_CTL, val); bfin_write16(PLL_CTL, val);
SSYNC(); SSYNC();
asm("IDLE;"); asm("IDLE;");
bfin_write32(SICA_IWR0, iwr0); bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SICA_IWR1, iwr1); bfin_write32(SIC_IWR1, iwr1);
hard_local_irq_restore(flags); hard_local_irq_restore(flags);
} }
...@@ -45,18 +45,18 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val) ...@@ -45,18 +45,18 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
flags = hard_local_irq_save(); flags = hard_local_irq_save();
/* Enable the PLL Wakeup bit in SIC IWR */ /* Enable the PLL Wakeup bit in SIC IWR */
iwr0 = bfin_read32(SICA_IWR0); iwr0 = bfin_read32(SIC_IWR0);
iwr1 = bfin_read32(SICA_IWR1); iwr1 = bfin_read32(SIC_IWR1);
/* Only allow PPL Wakeup) */ /* Only allow PPL Wakeup) */
bfin_write32(SICA_IWR0, IWR_ENABLE(0)); bfin_write32(SIC_IWR0, IWR_ENABLE(0));
bfin_write32(SICA_IWR1, 0); bfin_write32(SIC_IWR1, 0);
bfin_write16(VR_CTL, val); bfin_write16(VR_CTL, val);
SSYNC(); SSYNC();
asm("IDLE;"); asm("IDLE;");
bfin_write32(SICA_IWR0, iwr0); bfin_write32(SIC_IWR0, iwr0);
bfin_write32(SICA_IWR1, iwr1); bfin_write32(SIC_IWR1, iwr1);
hard_local_irq_restore(flags); hard_local_irq_restore(flags);
} }
......
...@@ -86,12 +86,12 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle ...@@ -86,12 +86,12 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle
spin_lock(&boot_lock); spin_lock(&boot_lock);
if ((bfin_read_SIC_SYSCR() & COREB_SRAM_INIT) == 0) { if ((bfin_read_SYSCR() & COREB_SRAM_INIT) == 0) {
/* CoreB already running, sending ipi to wakeup it */ /* CoreB already running, sending ipi to wakeup it */
platform_send_ipi_cpu(cpu, IRQ_SUPPLE_0); platform_send_ipi_cpu(cpu, IRQ_SUPPLE_0);
} else { } else {
/* Kick CoreB, which should start execution from CORE_SRAM_BASE. */ /* Kick CoreB, which should start execution from CORE_SRAM_BASE. */
bfin_write_SIC_SYSCR(bfin_read_SIC_SYSCR() & ~COREB_SRAM_INIT); bfin_write_SYSCR(bfin_read_SYSCR() & ~COREB_SRAM_INIT);
SSYNC(); SSYNC();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment