69d323f231
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.10, and Linux v3.11. This work mainly covers: * Enabling USB storage, and PCI to mvebu_defconfig. * Add support for NOR flash. * Some PCI device tree related updates, and bus parsing. * Adding Armada XP & 370 PCI driver, and update some clock gating specifics. * Introduce Marvell EBU Device Bus driver. * Enaling USB in the armada*.dts. * Enabling, and updating the mvebu-mbus. * Some SATA and Ethernet related fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39564
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From f865fd0e1c10bb044d56037eaa6ac4a4a122c62a Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Tue, 21 May 2013 12:33:28 +0200
|
|
Subject: [PATCH 012/203] arm: mvebu: mark functions of armada-370-xp.c as
|
|
static
|
|
|
|
All the functions in armada-370-xp.c are called from the
|
|
DT_MACHINE_START function pointers, so there is no need for them to be
|
|
visible outside of this file, and we therefore mark them as static.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
---
|
|
arch/arm/mach-mvebu/armada-370-xp.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/arch/arm/mach-mvebu/armada-370-xp.c
|
|
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
|
|
@@ -38,18 +38,18 @@ static struct map_desc armada_370_xp_io_
|
|
},
|
|
};
|
|
|
|
-void __init armada_370_xp_map_io(void)
|
|
+static void __init armada_370_xp_map_io(void)
|
|
{
|
|
iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
|
|
}
|
|
|
|
-void __init armada_370_xp_timer_and_clk_init(void)
|
|
+static void __init armada_370_xp_timer_and_clk_init(void)
|
|
{
|
|
mvebu_clocks_init();
|
|
armada_370_xp_timer_init();
|
|
}
|
|
|
|
-void __init armada_370_xp_init_early(void)
|
|
+static void __init armada_370_xp_init_early(void)
|
|
{
|
|
char *mbus_soc_name;
|
|
|