3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
85 lines
2.6 KiB
Diff
85 lines
2.6 KiB
Diff
From 409885c9ec1b0dba5c8f393af6d481c69bfa9b0a Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Tue, 13 Aug 2013 11:43:12 -0300
|
|
Subject: [PATCH 083/203] clocksource: armada-370-xp: Use
|
|
CLOCKSOURCE_OF_DECLARE
|
|
|
|
This is almost cosmetic: we achieve a bit of consistency with
|
|
other clocksource drivers by using the CLOCKSOURCE_OF_DECLARE
|
|
macro for the boilerplate code.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
---
|
|
arch/arm/mach-mvebu/armada-370-xp.c | 4 ++--
|
|
drivers/clocksource/time-armada-370-xp.c | 6 +++---
|
|
include/linux/time-armada-370-xp.h | 18 ------------------
|
|
3 files changed, 5 insertions(+), 23 deletions(-)
|
|
delete mode 100644 include/linux/time-armada-370-xp.h
|
|
|
|
--- a/arch/arm/mach-mvebu/armada-370-xp.c
|
|
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
|
|
@@ -17,7 +17,7 @@
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/io.h>
|
|
-#include <linux/time-armada-370-xp.h>
|
|
+#include <linux/clocksource.h>
|
|
#include <linux/clk/mvebu.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/mbus.h>
|
|
@@ -38,7 +38,7 @@ static void __init armada_370_xp_map_io(
|
|
static void __init armada_370_xp_timer_and_clk_init(void)
|
|
{
|
|
mvebu_clocks_init();
|
|
- armada_370_xp_timer_init();
|
|
+ clocksource_of_init();
|
|
coherency_init();
|
|
BUG_ON(mvebu_mbus_dt_init());
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
--- a/drivers/clocksource/time-armada-370-xp.c
|
|
+++ b/drivers/clocksource/time-armada-370-xp.c
|
|
@@ -210,13 +210,11 @@ static struct local_timer_ops armada_370
|
|
.stop = armada_370_xp_timer_stop,
|
|
};
|
|
|
|
-void __init armada_370_xp_timer_init(void)
|
|
+static void __init armada_370_xp_timer_init(struct device_node *np)
|
|
{
|
|
u32 u;
|
|
- struct device_node *np;
|
|
int res;
|
|
|
|
- np = of_find_compatible_node(NULL, NULL, "marvell,armada-370-xp-timer");
|
|
timer_base = of_iomap(np, 0);
|
|
WARN_ON(!timer_base);
|
|
local_base = of_iomap(np, 1);
|
|
@@ -299,3 +297,5 @@ void __init armada_370_xp_timer_init(voi
|
|
#endif
|
|
}
|
|
}
|
|
+CLOCKSOURCE_OF_DECLARE(armada_370_xp, "marvell,armada-370-xp-timer",
|
|
+ armada_370_xp_timer_init);
|
|
--- a/include/linux/time-armada-370-xp.h
|
|
+++ /dev/null
|
|
@@ -1,18 +0,0 @@
|
|
-/*
|
|
- * Marvell Armada 370/XP SoC timer handling.
|
|
- *
|
|
- * Copyright (C) 2012 Marvell
|
|
- *
|
|
- * Lior Amsalem <alior@marvell.com>
|
|
- * Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
- * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
- *
|
|
- */
|
|
-#ifndef __TIME_ARMADA_370_XPPRCMU_H
|
|
-#define __TIME_ARMADA_370_XPPRCMU_H
|
|
-
|
|
-#include <linux/init.h>
|
|
-
|
|
-void __init armada_370_xp_timer_init(void);
|
|
-
|
|
-#endif
|