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>

diff --git a/arch/arm/include/asm/hardware/sp810.h b/arch/arm/include/asm/hardware/sp810.h
deleted file mode 100644 (file)
index 6636430..0000000
--- a/arch/arm/include/asm/hardware/sp810.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * arch/arm/include/asm/hardware/sp810.h
- *
- * ARM PrimeXsys System Controller SP810 header file
- *
- * Copyright (C) 2009 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __ASM_ARM_SP810_H
-#define __ASM_ARM_SP810_H
-
-#include <linux/io.h>
-
-/* sysctl registers offset */
-#define SCCTRL                 0x000
-#define SCSYSSTAT              0x004
-#define SCIMCTRL               0x008
-#define SCIMSTAT               0x00C
-#define SCXTALCTRL             0x010
-#define SCPLLCTRL              0x014
-#define SCPLLFCTRL             0x018
-#define SCPERCTRL0             0x01C
-#define SCPERCTRL1             0x020
-#define SCPEREN                        0x024
-#define SCPERDIS               0x028
-#define SCPERCLKEN             0x02C
-#define SCPERSTAT              0x030
-#define SCSYSID0               0xEE0
-#define SCSYSID1               0xEE4
-#define SCSYSID2               0xEE8
-#define SCSYSID3               0xEEC
-#define SCITCR                 0xF00
-#define SCITIR0                        0xF04
-#define SCITIR1                        0xF08
-#define SCITOR                 0xF0C
-#define SCCNTCTRL              0xF10
-#define SCCNTDATA              0xF14
-#define SCCNTSTEP              0xF18
-#define SCPERIPHID0            0xFE0
-#define SCPERIPHID1            0xFE4
-#define SCPERIPHID2            0xFE8
-#define SCPERIPHID3            0xFEC
-#define SCPCELLID0             0xFF0
-#define SCPCELLID1             0xFF4
-#define SCPCELLID2             0xFF8
-#define SCPCELLID3             0xFFC
-
-#define SCCTRL_TIMERENnSEL_SHIFT(n)    (15 + ((n) * 2))
-
-static inline void sysctl_soft_reset(void __iomem *base)
-{
-       /* switch to slow mode */
-       writel(0x2, base + SCCTRL);
-
-       /* writing any value to SCSYSSTAT reg will reset system */
-       writel(0, base + SCSYSSTAT);
-}
-
-#endif /* __ASM_ARM_SP810_H */

diff --git a/arch/arm/plat-spear/restart.c b/arch/arm/plat-spear/restart.c
index 4f990115b1bd7070c3092f3b768a7cce7e6f94a0..7d4616d5df116a653b20047e8d743b5be25ea78c 100644 (file)
--- 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 c742ac7c60bb3613184106520330eea8427e983e..4f83ff9ab2d98749fef15e95e5b4cebbde7d0ea1 100644 (file)
--- 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/include/linux/amba/sp810.h b/include/linux/amba/sp810.h
new file mode 100644 (file)
index 0000000..6636430
--- /dev/null
+++ b/include/linux/amba/sp810.h
@@ -0,0 +1,64 @@
+/*
+ * arch/arm/include/asm/hardware/sp810.h
+ *
+ * ARM PrimeXsys System Controller SP810 header file
+ *
+ * Copyright (C) 2009 ST Microelectronics
+ * Viresh Kumar <viresh.linux@gmail.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __ASM_ARM_SP810_H
+#define __ASM_ARM_SP810_H
+
+#include <linux/io.h>
+
+/* sysctl registers offset */
+#define SCCTRL                 0x000
+#define SCSYSSTAT              0x004
+#define SCIMCTRL               0x008
+#define SCIMSTAT               0x00C
+#define SCXTALCTRL             0x010
+#define SCPLLCTRL              0x014
+#define SCPLLFCTRL             0x018
+#define SCPERCTRL0             0x01C
+#define SCPERCTRL1             0x020
+#define SCPEREN                        0x024
+#define SCPERDIS               0x028
+#define SCPERCLKEN             0x02C
+#define SCPERSTAT              0x030
+#define SCSYSID0               0xEE0
+#define SCSYSID1               0xEE4
+#define SCSYSID2               0xEE8
+#define SCSYSID3               0xEEC
+#define SCITCR                 0xF00
+#define SCITIR0                        0xF04
+#define SCITIR1                        0xF08
+#define SCITOR                 0xF0C
+#define SCCNTCTRL              0xF10
+#define SCCNTDATA              0xF14
+#define SCCNTSTEP              0xF18
+#define SCPERIPHID0            0xFE0
+#define SCPERIPHID1            0xFE4
+#define SCPERIPHID2            0xFE8
+#define SCPERIPHID3            0xFEC
+#define SCPCELLID0             0xFF0
+#define SCPCELLID1             0xFF4
+#define SCPCELLID2             0xFF8
+#define SCPCELLID3             0xFFC
+
+#define SCCTRL_TIMERENnSEL_SHIFT(n)    (15 + ((n) * 2))
+
+static inline void sysctl_soft_reset(void __iomem *base)
+{
+       /* switch to slow mode */
+       writel(0x2, base + SCCTRL);
+
+       /* writing any value to SCSYSSTAT reg will reset system */
+       writel(0, base + SCSYSSTAT);
+}
+
+#endif /* __ASM_ARM_SP810_H */