rk: move clkdev.h debug-macro.S entry-macro.S timex.h uncompress.h from mach-rk30...

diff --git a/arch/arm/mach-rk30/include/mach/clkdev.h b/arch/arm/mach-rk30/include/mach/clkdev.h
index 730c49d1ebd85970c19d8dfea0e12017cb146fc3..c0cf3286a662374173b791d862e64bd5d484a77c 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/clkdev.h
+++ b/arch/arm/mach-rk30/include/mach/clkdev.h
@@ -1,13 +1 @@
-#ifndef __MACH_CLKDEV_H
-#define __MACH_CLKDEV_H
-
-static inline int __clk_get(struct clk *clk)
-{
-       return 1;
-}
-
-static inline void __clk_put(struct clk *clk)
-{
-}
-
-#endif
+#include <plat/clkdev.h>

diff --git a/arch/arm/mach-rk30/include/mach/debug-macro.S b/arch/arm/mach-rk30/include/mach/debug-macro.S
index 2a57cc79fa7e96482186f41d929ab92fe5de9a23..00d5467951fec3a45b74baac407ec8c11ef88c65 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/debug-macro.S
+++ b/arch/arm/mach-rk30/include/mach/debug-macro.S
@@ -1,35 +1 @@
-/* arch/arm/mach-rk30/include/mach/debug-macro.S
- *
- * Copyright (C) 2012 ROCKCHIP, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <mach/io.h>
-
-#ifdef DEBUG_UART_PHYS
-       .macro addruart, rp, rv
-               ldr     \rp, = DEBUG_UART_PHYS
-               ldr     \rv, = DEBUG_UART_BASE
-       .endm
-
-#define UART_SHIFT     2
-#include <asm/hardware/debug-8250.S>
-#else
-       .macro addruart, rp, rv
-       .endm
-       .macro senduart, rd, rx
-       .endm
-       .macro busyuart, rd, rx
-       .endm
-       .macro waituart, rd, rx
-       .endm
-#endif
+#include <plat/debug-macro.S>

diff --git a/arch/arm/mach-rk30/include/mach/entry-macro.S b/arch/arm/mach-rk30/include/mach/entry-macro.S
index 87b1727f00df129543453c46c8beadb0e843fc71..2cebce7a5717ee5e4f32eb4c60d024ecaab0d31d 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/entry-macro.S
+++ b/arch/arm/mach-rk30/include/mach/entry-macro.S
@@ -1,14 +1,2 @@
-#include <mach/io.h>
-
-#define HAVE_GET_IRQNR_PREAMBLE
-#include <asm/hardware/entry-macro-gic.S>
-
-       .macro  disable_fiq
-        .endm
-
-       .macro  get_irqnr_preamble, base, tmp
-       ldr     \base, =RK30_GICC_BASE
-       .endm
-
-       .macro  arch_ret_to_user, tmp1, tmp2
-        .endm
+#define GICC_BASE RK30_GICC_BASE
+#include <plat/entry-macro.S>

diff --git a/arch/arm/mach-rk30/include/mach/timex.h b/arch/arm/mach-rk30/include/mach/timex.h
index baf144aae0233b02cdde5a147e993405b8f2e579..d2a02f98c3973210fb094a12fb8b5b034e93b9cb 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/timex.h
+++ b/arch/arm/mach-rk30/include/mach/timex.h
@@ -1,6 +1 @@
-#ifndef __MACH_TIMEX_H
-#define __MACH_TIMEX_H
-
-#define CLOCK_TICK_RATE                (HZ * 100000UL)
-
-#endif /* __ASM_ARCH_TIMEX_H */
+#include <plat/timex.h>

diff --git a/arch/arm/mach-rk30/include/mach/uncompress.h b/arch/arm/mach-rk30/include/mach/uncompress.h
index f165f074ee0170267eec69922af2f8522e9a372b..a4acb7198e1ce2aa9891392760a747e0c57506d6 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/uncompress.h
+++ b/arch/arm/mach-rk30/include/mach/uncompress.h
@@ -1,34 +1 @@
-#ifndef __MACH_UNCOMPRESS_H
-#define __MACH_UNCOMPRESS_H
-
-#include <linux/serial_reg.h>
-#include <mach/io.h>
-
-#ifdef DEBUG_UART_PHYS
-static volatile u32 *UART = (u32 *)DEBUG_UART_PHYS;
-
-static void putc(int c)
-{
-       while (!(UART[UART_LSR] & UART_LSR_THRE))
-               barrier();
-       UART[UART_TX] = c;
-}
-#else
-static inline void putc(int c)
-{
-}
-#endif
-
-static inline void flush(void)
-{
-}
-
-static inline void arch_decomp_setup(void)
-{
-}
-
-static inline void arch_decomp_wdog(void)
-{
-}
-
-#endif
+#include <plat/uncompress.h>

diff --git a/arch/arm/plat-rk/include/plat/clkdev.h b/arch/arm/plat-rk/include/plat/clkdev.h
new file mode 100644 (file)
index 0000000..2c2f066
--- /dev/null
+++ b/arch/arm/plat-rk/include/plat/clkdev.h
@@ -0,0 +1,13 @@
+#ifndef __PLAT_CLKDEV_H
+#define __PLAT_CLKDEV_H
+
+static inline int __clk_get(struct clk *clk)
+{
+       return 1;
+}
+
+static inline void __clk_put(struct clk *clk)
+{
+}
+
+#endif

diff --git a/arch/arm/plat-rk/include/plat/debug-macro.S b/arch/arm/plat-rk/include/plat/debug-macro.S
new file mode 100644 (file)
index 0000000..bb48d93
--- /dev/null
+++ b/arch/arm/plat-rk/include/plat/debug-macro.S
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012 ROCKCHIP, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <mach/io.h>
+
+#ifdef DEBUG_UART_PHYS
+       .macro addruart, rp, rv
+               ldr     \rp, = DEBUG_UART_PHYS
+               ldr     \rv, = DEBUG_UART_BASE
+       .endm
+
+#define UART_SHIFT     2
+#include <asm/hardware/debug-8250.S>
+#else
+       .macro addruart, rp, rv
+       .endm
+       .macro senduart, rd, rx
+       .endm
+       .macro busyuart, rd, rx
+       .endm
+       .macro waituart, rd, rx
+       .endm
+#endif

diff --git a/arch/arm/plat-rk/include/plat/entry-macro.S b/arch/arm/plat-rk/include/plat/entry-macro.S
new file mode 100644 (file)
index 0000000..1a0ede5
--- /dev/null
+++ b/arch/arm/plat-rk/include/plat/entry-macro.S
@@ -0,0 +1,14 @@
+#include <mach/io.h>
+
+#define HAVE_GET_IRQNR_PREAMBLE
+#include <asm/hardware/entry-macro-gic.S>
+
+       .macro  disable_fiq
+        .endm
+
+       .macro  get_irqnr_preamble, base, tmp
+       ldr     \base, =GICC_BASE
+       .endm
+
+       .macro  arch_ret_to_user, tmp1, tmp2
+        .endm

diff --git a/arch/arm/plat-rk/include/plat/timex.h b/arch/arm/plat-rk/include/plat/timex.h
new file mode 100644 (file)
index 0000000..42db342
--- /dev/null
+++ b/arch/arm/plat-rk/include/plat/timex.h
@@ -0,0 +1,6 @@
+#ifndef __PLAT_TIMEX_H
+#define __PLAT_TIMEX_H
+
+#define CLOCK_TICK_RATE                (HZ * 100000UL)
+
+#endif

diff --git a/arch/arm/plat-rk/include/plat/uncompress.h b/arch/arm/plat-rk/include/plat/uncompress.h
new file mode 100644 (file)
index 0000000..9704769
--- /dev/null
+++ b/arch/arm/plat-rk/include/plat/uncompress.h
@@ -0,0 +1,34 @@
+#ifndef __PLAT_UNCOMPRESS_H
+#define __PLAT_UNCOMPRESS_H
+
+#include <linux/serial_reg.h>
+#include <mach/io.h>
+
+#ifdef DEBUG_UART_PHYS
+static volatile u32 *UART = (u32 *)DEBUG_UART_PHYS;
+
+static void putc(int c)
+{
+       while (!(UART[UART_LSR] & UART_LSR_THRE))
+               barrier();
+       UART[UART_TX] = c;
+}
+#else
+static inline void putc(int c)
+{
+}
+#endif
+
+static inline void flush(void)
+{
+}
+
+static inline void arch_decomp_setup(void)
+{
+}
+
+static inline void arch_decomp_wdog(void)
+{
+}
+
+#endif