c9ae111a20
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13. This work mainly covers: * Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family, and the Armada family. * timer initialization update, and access function for the Armada family. * Generic IRQ handling backporting. * Some bug fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39566
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From b340059540cbc90412f3e7159dc57a178e0effd6 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Wed, 4 Dec 2013 14:28:59 +0100
|
|
Subject: [PATCH 163/203] ARM: mvebu: move ARMADA_XP_MAX_CPUS to
|
|
armada-370-xp.h
|
|
|
|
The ARMADA_XP_MAX_CPUS definition was in common.h, which as its name
|
|
says, is common to all mvebu SoCs. It is more logical to have this XP
|
|
specific definition in the already existing armada-370-xp.h header
|
|
file.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
arch/arm/mach-mvebu/armada-370-xp.h | 2 ++
|
|
arch/arm/mach-mvebu/common.h | 2 --
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm/mach-mvebu/armada-370-xp.h
|
|
+++ b/arch/arm/mach-mvebu/armada-370-xp.h
|
|
@@ -18,6 +18,8 @@
|
|
#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);
|
|
#endif
|
|
--- a/arch/arm/mach-mvebu/common.h
|
|
+++ b/arch/arm/mach-mvebu/common.h
|
|
@@ -15,8 +15,6 @@
|
|
#ifndef __ARCH_MVEBU_COMMON_H
|
|
#define __ARCH_MVEBU_COMMON_H
|
|
|
|
-#define ARMADA_XP_MAX_CPUS 4
|
|
-
|
|
void mvebu_restart(char mode, const char *cmd);
|
|
|
|
void armada_370_xp_init_irq(void);
|