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
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 167c442fb9adf4c2e02663a0291c6cfae31bad72 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Thu, 5 Dec 2013 10:02:25 +0100
|
|
Subject: [PATCH 165/203] ARM: mvebu: make armada_370_xp_pmsu_init() static
|
|
|
|
The armada_370_xp_pmsu_init() function is called as an
|
|
early_initcall(). Therefore, there is no need to export this function,
|
|
and we can make it static.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
arch/arm/mach-mvebu/common.h | 1 -
|
|
arch/arm/mach-mvebu/pmsu.c | 2 +-
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm/mach-mvebu/common.h
|
|
+++ b/arch/arm/mach-mvebu/common.h
|
|
@@ -22,7 +22,6 @@ void armada_370_xp_handle_irq(struct pt_
|
|
|
|
void armada_xp_cpu_die(unsigned int cpu);
|
|
int armada_370_xp_coherency_init(void);
|
|
-int armada_370_xp_pmsu_init(void);
|
|
void armada_xp_secondary_startup(void);
|
|
extern struct smp_operations armada_xp_smp_ops;
|
|
#endif
|
|
--- a/arch/arm/mach-mvebu/pmsu.c
|
|
+++ b/arch/arm/mach-mvebu/pmsu.c
|
|
@@ -58,7 +58,7 @@ int armada_xp_boot_cpu(unsigned int cpu_
|
|
}
|
|
#endif
|
|
|
|
-int __init armada_370_xp_pmsu_init(void)
|
|
+static int __init armada_370_xp_pmsu_init(void)
|
|
{
|
|
struct device_node *np;
|
|
|