FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-14 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mvebu SoC changes for v3.14 (incremental #2)

Browse Source 
- mvebu
     - some Armada cleanup to prep for a new SoC in mach-mvebu/
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSxX7VAAoJEP45WPkGe8ZnvNMP/2xELuMr5mA2HkAAYPpXHWFo
 as4a0UygKxp+7EhPe4JkSSFzEBW/XnuFwCKOGt2Hcfcyq83kh4lYL9nF06CZq5bK
 eaMW4SqwsWsCpApcWpqlWw29tFSHruChYrge6lGU9mS8cQGfH4P08PzxwudfzZFv
 me+wnyedPfXuqA8pgmpXDp4bcuHhhLSC60FvFrszASgJgu94InWIVs+x/0t7+oEL
 OT2wNOJfK+UTzwfcK9EgLq4mtSnA8YLzoLQQTMz4Ab0lCzioHjo0Yek03c9DCH2M
 0ygNagudWwsBCaI2u7D48jBUMpfmBqgYQkaj0nSoo+rz/LWxrxP0S/oswDeK2lwx
 PTlK29b2kuftZ0+qu+9bQY6gJhVOIEKxQoKIZD9Dbjzafi/JgH27gRmrG4IZVtrZ
 oK6/6aLP1Krd/1Ok/z15HrTYiVZ9J1FOFUQyzGoWehp2JmHS6YeXuJ7EmnGYgaMH
 5zgeicJbjx81zOzL5V70HHdz7KdGTS4/oVBFFKMi9NpoHZbUiz0U9vNqHRzXNusK
 oCEgCC/NPt6Px/5A+bjnp6oppS+dv0h/ElzexnYoFSLHL0ASycydrdUWZwmK0rZ7
 dWxznIht3PIA2lCkwTik3aLK+Js0naNpGUe8xtuGGGEdB+pJVPDB+7wI46zSx2YD
 LCdiiGjTgxA2n3IAENKm
 =J4tF
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2014-01-02 11:39:51 -08:00
commit 26d5f92adf
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-mvebu/armada-370-xp.h
View File

@ -18,8 +18,12 @@
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#include <linux/cpumask.h> #include <linux/cpumask.h>
#define ARMADA_XP_MAX_CPUS 4
void armada_mpic_send_doorbell(const struct cpumask *mask, unsigned int irq); void armada_mpic_send_doorbell(const struct cpumask *mask, unsigned int irq);
void armada_xp_mpic_smp_cpu_init(void); void armada_xp_mpic_smp_cpu_init(void);
void armada_xp_secondary_startup(void);
extern struct smp_operations armada_xp_smp_ops;
#endif #endif
#endif /* __MACH_ARMADA_370_XP_H */ #endif /* __MACH_ARMADA_370_XP_H */

9
arch/arm/mach-mvebu/common.h
View File

@ -15,17 +15,10 @@
#ifndef __ARCH_MVEBU_COMMON_H #ifndef __ARCH_MVEBU_COMMON_H
#define __ARCH_MVEBU_COMMON_H #define __ARCH_MVEBU_COMMON_H
#define ARMADA_XP_MAX_CPUS 4
#include <linux/reboot.h> #include <linux/reboot.h>
void mvebu_restart(enum reboot_mode mode, const char *cmd); 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); 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 #endif