diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-01-04 14:17:15 +0000 |
|---|---|---|
| committer | Pawel Moll <pawel.moll@arm.com> | 2013-01-30 15:55:45 +0000 |
| commit | da660b4a3b15caea9c198c4f26d1cf7023df92fc (patch) | |
| tree | 55f6a7aa3b6ba54c9e48ba7f7a434996ad95dce3 | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| download | linux-da660b4a3b15caea9c198c4f26d1cf7023df92fc.tar.bz2 | |
arm: Move sp810.h to include/linux/amba/
Since it is now used by code under drivers/clk/ it makes sense for this
file to be in a more generic location. This is required for building
vexpress support on arm64.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
| -rw-r--r-- | arch/arm/plat-spear/restart.c | 2 | ||||
| -rw-r--r-- | drivers/clk/versatile/clk-vexpress.c | 3 | ||||
| -rw-r--r-- | include/linux/amba/sp810.h (renamed from arch/arm/include/asm/hardware/sp810.h) | 0 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-spear/restart.c b/arch/arm/plat-spear/restart.c index 4f990115b1bd..7d4616d5df11 100644 --- a/arch/arm/plat-spear/restart.c +++ b/arch/arm/plat-spear/restart.c @@ -11,8 +11,8 @@ * warranty of any kind, whether express or implied. */ #include <linux/io.h> +#include <linux/amba/sp810.h> #include <asm/system_misc.h> -#include <asm/hardware/sp810.h> #include <mach/spear.h> #include <mach/generic.h> diff --git a/drivers/clk/versatile/clk-vexpress.c b/drivers/clk/versatile/clk-vexpress.c index c742ac7c60bb..4f83ff9ab2d9 100644 --- a/drivers/clk/versatile/clk-vexpress.c +++ b/drivers/clk/versatile/clk-vexpress.c @@ -11,6 +11,7 @@ * Copyright (C) 2012 ARM Limited */ +#include <linux/amba/sp810.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/err.h> @@ -18,8 +19,6 @@ #include <linux/of_address.h> #include <linux/vexpress.h> -#include <asm/hardware/sp810.h> - static struct clk *vexpress_sp810_timerclken[4]; static DEFINE_SPINLOCK(vexpress_sp810_lock); diff --git a/arch/arm/include/asm/hardware/sp810.h b/include/linux/amba/sp810.h index 6636430dd0e6..6636430dd0e6 100644 --- a/arch/arm/include/asm/hardware/sp810.h +++ b/include/linux/amba/sp810.h |