iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: mvebu: Clean-up the Armada XP support

Browse Source 
This patch removes the unneeded include of the armada-370-xp.h header.

It also moves some declarations from this file into more accurate
places.

Finally, it also adds a comment explaining that we can't remove yet the
smp field in the dt machine struct due to backward compatibly of the
device tree.

In a few releases, when the old device tree will be obsolete, we will be
able to remove the smp field and then the armada-370-xp.h header.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1414669184-16785-2-git-send-email-gregory.clement@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Gregory CLEMENT 2014-10-30 12:39:41 +01:00 committed by Jason Cooper
parent e12f12ac1a
commit 316fbbc400
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,14 +16,8 @@
#define __MACH_ARMADA_370_XP_H #define __MACH_ARMADA_370_XP_H
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#include <linux/cpumask.h>
#define ARMADA_XP_MAX_CPUS 4
void armada_xp_secondary_startup(void); void armada_xp_secondary_startup(void);
extern struct smp_operations armada_xp_smp_ops; extern struct smp_operations armada_xp_smp_ops;
#endif #endif
int armada_370_xp_pmsu_idle_enter(unsigned long deepidle);
#endif /* __MACH_ARMADA_370_XP_H */ #endif /* __MACH_ARMADA_370_XP_H */

5
arch/arm/mach-mvebu/board-v7.c
View File

@ -142,6 +142,11 @@ static const char * const armada_370_xp_dt_compat[] = {
DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)") DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")
.l2c_aux_val = 0, .l2c_aux_val = 0,
.l2c_aux_mask = ~0, .l2c_aux_mask = ~0,
/*
* The following field (.smp) is still needed to ensure backward
* compatibility with old Device Trees that were not specifying the
* cpus enable-method property.
*/
.smp = smp_ops(armada_xp_smp_ops), .smp = smp_ops(armada_xp_smp_ops),
.init_machine = mvebu_dt_init, .init_machine = mvebu_dt_init,
.init_irq = mvebu_init_irq, .init_irq = mvebu_init_irq,

1
arch/arm/mach-mvebu/coherency.c
View File

@ -33,7 +33,6 @@
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include "armada-370-xp.h"
#include "coherency.h" #include "coherency.h"
#include "mvebu-soc-id.h" #include "mvebu-soc-id.h"

1
arch/arm/mach-mvebu/cpu-reset.c
View File

@ -15,7 +15,6 @@
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/resource.h> #include <linux/resource.h>
#include "armada-370-xp.h"
static void __iomem *cpu_reset_base; static void __iomem *cpu_reset_base;
static size_t cpu_reset_size; static size_t cpu_reset_size;

2
arch/arm/mach-mvebu/platsmp.c
View File

@ -30,6 +30,8 @@
#include "pmsu.h" #include "pmsu.h"
#include "coherency.h" #include "coherency.h"
#define ARMADA_XP_MAX_CPUS 4
#define AXP_BOOTROM_BASE 0xfff00000 #define AXP_BOOTROM_BASE 0xfff00000
#define AXP_BOOTROM_SIZE 0x100000 #define AXP_BOOTROM_SIZE 0x100000

1
arch/arm/mach-mvebu/pmsu.c
View File

@ -39,7 +39,6 @@
#include <asm/suspend.h> #include <asm/suspend.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include "common.h" #include "common.h"
#include "armada-370-xp.h"
#define PMSU_BASE_OFFSET 0x100 #define PMSU_BASE_OFFSET 0x100

1
arch/arm/mach-mvebu/pmsu.h
View File

@ -18,4 +18,5 @@ int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target,
void mvebu_v7_pmsu_idle_exit(void); void mvebu_v7_pmsu_idle_exit(void);
int armada_370_xp_pmsu_idle_enter(unsigned long deepidle);
#endif /* __MACH_370_XP_PMSU_H */ #endif /* __MACH_370_XP_PMSU_H */