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

Commit 316fbbc4 authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Jason Cooper
Browse files

ARM: mvebu: Clean-up the Armada XP support 



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: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarThomas 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: default avatarJason Cooper <jason@lakedaemon.net>
parent e12f12ac

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

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

arch/arm/mach-mvebu/board-v7.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -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,

arch/arm/mach-mvebu/coherency.c

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

arch/arm/mach-mvebu/cpu-reset.c

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

arch/arm/mach-mvebu/platsmp.c

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