Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26d5f92a authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 615e303e 11dc35e4

arch/arm/mach-mvebu/armada-370-xp.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-mvebu/common.h

+1 −8
Original line number Diff line number Diff line
@@ -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