Commit 04b5e56f authored by Olof Johansson's avatar Olof Johansson

Merge tag 'fixes-3.10-3' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper, mvebu fixes for v3.10 round 3:
 - mvebu
    - fix bug in coherency fabric low level init
 - kirkwood
    - fix crash from pcie double init
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

* tag 'fixes-3.10-3' of git://git.infradead.org/users/jcooper/linux:
  ARM: mvebu: Fix bug in coherency fabric low level init function
  ARM: Kirkwood: TS219: Fix crash by double PCIe instantiation
parents d683b96b b60b61d4
...@@ -41,13 +41,3 @@ void __init qnap_dt_ts219_init(void) ...@@ -41,13 +41,3 @@ void __init qnap_dt_ts219_init(void)
pm_power_off = qnap_tsx1x_power_off; pm_power_off = qnap_tsx1x_power_off;
} }
/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
static int __init ts219_pci_init(void)
{
if (machine_is_ts219())
kirkwood_pcie_init(KW_PCIE0);
return 0;
}
subsys_initcall(ts219_pci_init);
...@@ -32,15 +32,21 @@ ENTRY(ll_set_cpu_coherent) ...@@ -32,15 +32,21 @@ ENTRY(ll_set_cpu_coherent)
/* Add CPU to SMP group - Atomic */ /* Add CPU to SMP group - Atomic */
add r3, r0, #ARMADA_XP_CFB_CTL_REG_OFFSET add r3, r0, #ARMADA_XP_CFB_CTL_REG_OFFSET
ldr r2, [r3] 1:
ldrex r2, [r3]
orr r2, r2, r1 orr r2, r2, r1
str r2, [r3] strex r0, r2, [r3]
cmp r0, #0
bne 1b
/* Enable coherency on CPU - Atomic */ /* Enable coherency on CPU - Atomic */
add r3, r0, #ARMADA_XP_CFB_CFG_REG_OFFSET add r3, r3, #ARMADA_XP_CFB_CFG_REG_OFFSET
ldr r2, [r3] 1:
ldrex r2, [r3]
orr r2, r2, r1 orr r2, r2, r1
str r2, [r3] strex r0, r2, [r3]
cmp r0, #0
bne 1b
dsb dsb
......
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