diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 11:39:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 11:39:51 -0800 |
| commit | 26d5f92adf87b1267feb8727ec59c4d0c0d933be (patch) | |
| tree | a78b0a3876de5512eb073f40a56a3d9e93990d43 | |
| parent | 615e303e241cafa2ecf6452183532c2aff607920 (diff) | |
| parent | 11dc35e4a24c7e650c40077b7843dcda1e9775c3 (diff) | |
| download | linux-26d5f92adf87b1267feb8727ec59c4d0c0d933be.tar.gz linux-26d5f92adf87b1267feb8727ec59c4d0c0d933be.tar.bz2 linux-26d5f92adf87b1267feb8727ec59c4d0c0d933be.zip | |
Merge tag 'mvebu-soc-3.14-2' of git://git.infradead.org/linux-mvebu into next/cleanup
From Jason Cooper:
mvebu SoC changes for v3.14 (incremental #2)
- mvebu
- some Armada cleanup to prep for a new SoC in mach-mvebu/
* tag 'mvebu-soc-3.14-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: move Armada 370/XP specific definitions to armada-370-xp.h
ARM: mvebu: remove prototypes of non-existing functions from common.h
ARM: mvebu: move ARMADA_XP_MAX_CPUS to armada-370-xp.h
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/common.h | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.h b/arch/arm/mach-mvebu/armada-370-xp.h index c612b2c4ed6c..237c86b83390 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.h +++ b/arch/arm/mach-mvebu/armada-370-xp.h @@ -18,8 +18,12 @@ #ifdef CONFIG_SMP #include <linux/cpumask.h> +#define ARMADA_XP_MAX_CPUS 4 + void armada_mpic_send_doorbell(const struct cpumask *mask, unsigned int irq); void armada_xp_mpic_smp_cpu_init(void); +void armada_xp_secondary_startup(void); +extern struct smp_operations armada_xp_smp_ops; #endif #endif /* __MACH_ARMADA_370_XP_H */ diff --git a/arch/arm/mach-mvebu/common.h b/arch/arm/mach-mvebu/common.h index 0e6016fadcc5..55449c487c9e 100644 --- a/arch/arm/mach-mvebu/common.h +++ b/arch/arm/mach-mvebu/common.h @@ -15,17 +15,10 @@ #ifndef __ARCH_MVEBU_COMMON_H #define __ARCH_MVEBU_COMMON_H -#define ARMADA_XP_MAX_CPUS 4 - #include <linux/reboot.h> void mvebu_restart(enum reboot_mode mode, const char *cmd); -void armada_370_xp_init_irq(void); -void armada_370_xp_handle_irq(struct pt_regs *regs); - void armada_xp_cpu_die(unsigned int cpu); -int armada_370_xp_coherency_init(void); -void armada_xp_secondary_startup(void); -extern struct smp_operations armada_xp_smp_ops; + #endif |