Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da660b4a authored by Catalin Marinas's avatar Catalin Marinas Committed by Pawel Moll
Browse files

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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
parent 949db153

arch/arm/plat-spear/restart.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,8 +11,8 @@ 
 * warranty of any kind, whether express or implied.

 * warranty of any kind, whether express or implied.

 */

 */

#include <linux/io.h>

#include <linux/io.h>

#include <linux/amba/sp810.h>

#include <asm/system_misc.h>

#include <asm/system_misc.h>

#include <asm/hardware/sp810.h>

#include <mach/spear.h>

#include <mach/spear.h>

#include <mach/generic.h>

#include <mach/generic.h>

drivers/clk/versatile/clk-vexpress.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * Copyright (C) 2012 ARM Limited

 * Copyright (C) 2012 ARM Limited

 */

 */





#include <linux/amba/sp810.h>

#include <linux/clkdev.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/clk-provider.h>

#include <linux/err.h>

#include <linux/err.h>
@@ -18,8 +19,6 @@ 
#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/vexpress.h>

#include <linux/vexpress.h>





#include <asm/hardware/sp810.h>



static struct clk *vexpress_sp810_timerclken[4];

static struct clk *vexpress_sp810_timerclken[4];

static DEFINE_SPINLOCK(vexpress_sp810_lock);

static DEFINE_SPINLOCK(vexpress_sp810_lock);