From ce1d983988c12ddc7a799520ac6bdd2c9fc55807 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Mon, 10 Mar 2014 19:32:34 +0800
Subject: [PATCH] ARM: rockchip: move some head files to include/linux/rockchip

---
 arch/arm/mach-rockchip/common.c                    |  2 +-
 arch/arm/mach-rockchip/cpu.c                       |  2 +-
 arch/arm/mach-rockchip/cpuidle.c                   |  2 +-
 arch/arm/mach-rockchip/ddr_freq.c                  |  3 +--
 arch/arm/mach-rockchip/ddr_rk30.c                  |  2 +-
 arch/arm/mach-rockchip/hotplug.c                   |  2 +-
 arch/arm/mach-rockchip/platsmp.c                   |  2 +-
 arch/arm/mach-rockchip/rk3188-cpufreq.c            |  3 +--
 arch/arm/mach-rockchip/rk3188.c                    | 10 +++++-----
 arch/arm/mach-rockchip/rk3288.c                    | 12 ++++++------
 arch/arm/mach-rockchip/vcodec_service.c            |  5 ++---
 arch/arm/mach-rockchip/vpu_service.c               | 14 +++-----------
 drivers/clk/rockchip/clk-ops.c                     |  4 +---
 drivers/clk/rockchip/clk-ops.h                     |  6 +++---
 drivers/clk/rockchip/clk-pll.h                     |  2 +-
 drivers/net/ethernet/rk/vmac/rk29_vmac_phy.c       |  4 ++--
 drivers/video/rockchip/lcdc/rk3188_lcdc.c          |  6 +++---
 drivers/video/rockchip/lcdc/rk3288_lcdc.c          |  6 +++---
 drivers/video/rockchip/transmitter/rk32_dp.c       |  4 ++--
 drivers/video/rockchip/transmitter/rk32_dp_reg.c   |  6 +++---
 .../linux/rockchip}/common.h                       |  0
 .../mach-rockchip => include/linux/rockchip}/cpu.h |  0
 .../mach-rockchip => include/linux/rockchip}/cru.h |  0
 .../mach-rockchip => include/linux/rockchip}/grf.h |  0
 .../linux/rockchip}/iomap.h                        |  0
 25 files changed, 42 insertions(+), 55 deletions(-)
 rename {arch/arm/mach-rockchip => include/linux/rockchip}/common.h (100%)
 rename {arch/arm/mach-rockchip => include/linux/rockchip}/cpu.h (100%)
 rename {arch/arm/mach-rockchip => include/linux/rockchip}/cru.h (100%)
 rename {arch/arm/mach-rockchip => include/linux/rockchip}/grf.h (100%)
 rename {arch/arm/mach-rockchip => include/linux/rockchip}/iomap.h (100%)

diff --git a/arch/arm/mach-rockchip/common.c b/arch/arm/mach-rockchip/common.c
index cdeef164941c..9ab4d186f879 100644
--- a/arch/arm/mach-rockchip/common.c
+++ b/arch/arm/mach-rockchip/common.c
@@ -20,7 +20,7 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/hardware/cache-l2x0.h>
-#include "common.h"
+#include <linux/rockchip/common.h>
 #include "cpu_axi.h"
 #include "loader.h"
 #include "pmu.h"
diff --git a/arch/arm/mach-rockchip/cpu.c b/arch/arm/mach-rockchip/cpu.c
index 114d5b219c9b..6ac8cc02892a 100644
--- a/arch/arm/mach-rockchip/cpu.c
+++ b/arch/arm/mach-rockchip/cpu.c
@@ -1,6 +1,6 @@
 #include <linux/kernel.h>
 #include <linux/cpu.h>
-#include "cpu.h"
+#include <linux/rockchip/cpu.h>
 
 unsigned long rockchip_soc_id;
 EXPORT_SYMBOL(rockchip_soc_id);
diff --git a/arch/arm/mach-rockchip/cpuidle.c b/arch/arm/mach-rockchip/cpuidle.c
index 9788b3d6b5a5..d155b5c34506 100644
--- a/arch/arm/mach-rockchip/cpuidle.c
+++ b/arch/arm/mach-rockchip/cpuidle.c
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include "cpu.h"
+#include <linux/rockchip/cpu.h>
 
 static void __iomem *gic_cpu_base;
 
diff --git a/arch/arm/mach-rockchip/ddr_freq.c b/arch/arm/mach-rockchip/ddr_freq.c
index b9c3b19e43ff..3a54cd3a96b1 100644
--- a/arch/arm/mach-rockchip/ddr_freq.c
+++ b/arch/arm/mach-rockchip/ddr_freq.c
@@ -16,11 +16,10 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <linux/vmalloc.h>
+#include <linux/rockchip/common.h>
 #include <linux/rockchip/dvfs.h>
 #include <dt-bindings/clock/ddr.h>
 
-#include "common.h"
-
 enum {
 	DEBUG_DDR = 1U << 0,
 	DEBUG_VIDEO_STATE = 1U << 1,
diff --git a/arch/arm/mach-rockchip/ddr_rk30.c b/arch/arm/mach-rockchip/ddr_rk30.c
index 5fe2c7aade34..cb545b78e085 100644
--- a/arch/arm/mach-rockchip/ddr_rk30.c
+++ b/arch/arm/mach-rockchip/ddr_rk30.c
@@ -19,7 +19,7 @@
 #include <linux/cpu.h>
 #include <dt-bindings/clock/ddr.h>
 
-#include "cru.h"
+#include <linux/rockchip/cru.h>
 
 typedef uint32_t uint32;
 
diff --git a/arch/arm/mach-rockchip/hotplug.c b/arch/arm/mach-rockchip/hotplug.c
index cfd1627588cd..1d00865e8f0e 100644
--- a/arch/arm/mach-rockchip/hotplug.c
+++ b/arch/arm/mach-rockchip/hotplug.c
@@ -12,13 +12,13 @@
 #include <linux/errno.h>
 #include <linux/smp.h>
 #include <linux/delay.h>
+#include <linux/rockchip/common.h>
 
 #include <asm/cacheflush.h>
 #include <asm/cp15.h>
 #include <asm/smp_plat.h>
 #include <asm/system.h>
 
-#include "common.h"
 #include "pmu.h"
 
 static cpumask_t dead_cpus;
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c
index ce2be6cde566..d0358a372ae6 100644
--- a/arch/arm/mach-rockchip/platsmp.c
+++ b/arch/arm/mach-rockchip/platsmp.c
@@ -20,13 +20,13 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/rockchip/common.h>
 
 #include <asm/cacheflush.h>
 #include <asm/smp_scu.h>
 #include <asm/smp_plat.h>
 #include <asm/mach/map.h>
 
-#include "common.h"
 #include "pmu.h"
 
 #define SCU_CTRL		0x00
diff --git a/arch/arm/mach-rockchip/rk3188-cpufreq.c b/arch/arm/mach-rockchip/rk3188-cpufreq.c
index 3a66589d0f29..55f5ec04088d 100644
--- a/arch/arm/mach-rockchip/rk3188-cpufreq.c
+++ b/arch/arm/mach-rockchip/rk3188-cpufreq.c
@@ -26,14 +26,13 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/string.h>
+#include <linux/rockchip/cpu.h>
 #include <linux/rockchip/dvfs.h>
 #include <asm/smp_plat.h>
 #include <asm/cpu.h>
 #include <asm/unistd.h>
 #include <asm/uaccess.h>
 
-#include "cpu.h"
-
 #define VERSION "2.2"
 
 #ifdef DEBUG
diff --git a/arch/arm/mach-rockchip/rk3188.c b/arch/arm/mach-rockchip/rk3188.c
index 0d3b8c74af06..976de3a29db1 100644
--- a/arch/arm/mach-rockchip/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188.c
@@ -22,14 +22,14 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/rockchip/dvfs.h>
+#include <linux/rockchip/common.h>
+#include <linux/rockchip/cpu.h>
+#include <linux/rockchip/cru.h>
+#include <linux/rockchip/grf.h>
+#include <linux/rockchip/iomap.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include "common.h"
-#include "cpu.h"
 #include "cpu_axi.h"
-#include "cru.h"
-#include "grf.h"
-#include "iomap.h"
 #include "loader.h"
 #include "pmu.h"
 #include "sram.h"
diff --git a/arch/arm/mach-rockchip/rk3288.c b/arch/arm/mach-rockchip/rk3288.c
index d7fac3150ea0..d1aaeab4559b 100644
--- a/arch/arm/mach-rockchip/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288.c
@@ -21,15 +21,15 @@
 #include <linux/kernel.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
+#include <linux/rockchip/common.h>
+#include <linux/rockchip/cpu.h>
+#include <linux/rockchip/cru.h>
+#include <linux/rockchip/dvfs.h>
+#include <linux/rockchip/grf.h>
+#include <linux/rockchip/iomap.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <linux/rockchip/dvfs.h>
-#include "common.h"
-#include "cpu.h"
 #include "cpu_axi.h"
-#include "cru.h"
-#include "grf.h"
-#include "iomap.h"
 #include "loader.h"
 #include "pmu.h"
 #include "sram.h"
diff --git a/arch/arm/mach-rockchip/vcodec_service.c b/arch/arm/mach-rockchip/vcodec_service.c
index 6298d3f0edda..24567074c3b5 100755
--- a/arch/arm/mach-rockchip/vcodec_service.c
+++ b/arch/arm/mach-rockchip/vcodec_service.c
@@ -33,6 +33,8 @@
 #include <linux/wakelock.h>
 #include <linux/cdev.h>
 #include <linux/of.h>
+#include <linux/rockchip/cpu.h>
+#include <linux/rockchip/cru.h>
 
 #include <asm/cacheflush.h>
 #include <asm/uaccess.h>
@@ -41,14 +43,11 @@
 #include <linux/debugfs.h>
 #endif
 
-#include "cru.h"
-
 #if defined(CONFIG_ARCH_RK319X)
 #include <mach/grf.h>
 #endif
 
 #include "vcodec_service.h"
-#include "cpu.h"
 
 #define HEVC_TEST_ENABLE    0
 #define HEVC_SIM_ENABLE		0
diff --git a/arch/arm/mach-rockchip/vpu_service.c b/arch/arm/mach-rockchip/vpu_service.c
index 17bca4a72cf1..cdcc7f6786ca 100755
--- a/arch/arm/mach-rockchip/vpu_service.c
+++ b/arch/arm/mach-rockchip/vpu_service.c
@@ -38,6 +38,8 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/wakelock.h>
+#include <linux/rockchip/cpu.h>
+#include <linux/rockchip/cru.h>
 
 #include <asm/uaccess.h>
 #if 0
@@ -47,22 +49,12 @@
 #define IRQ_VEPU                        41
 #define IRQ_VDPU                        42
 #endif
-#if 0
-#include <mach/cru.h>
-#else
-#include "cru.h"
-#endif
 
 #if defined(CONFIG_ARCH_RK319X)
 #include <mach/grf.h>
 #endif
-#if 0
-#include <plat/vpu_service.h>
-#include <plat/cpu.h>
-#else
+
 #include "vpu_service.h"
-#include "cpu.h"
-#endif
 
 typedef enum {
 	VPU_DEC_ID_9190		= 0x6731,
diff --git a/drivers/clk/rockchip/clk-ops.c b/drivers/clk/rockchip/clk-ops.c
index 73a19d59c911..0f3f50c70cf8 100644
--- a/drivers/clk/rockchip/clk-ops.c
+++ b/drivers/clk/rockchip/clk-ops.c
@@ -6,11 +6,9 @@
 #include <linux/of_address.h>
 #include <linux/clk-private.h>
 #include <linux/delay.h>
+#include <linux/rockchip/common.h>
 
 #include "clk-ops.h"
-#include "../../../arch/arm/mach-rockchip/common.h"
-
-
 
 /* mux_ops */
 struct clk_ops_table rk_clk_mux_ops_table[] = {
diff --git a/drivers/clk/rockchip/clk-ops.h b/drivers/clk/rockchip/clk-ops.h
index d5ab53e963a3..933bd029e795 100644
--- a/drivers/clk/rockchip/clk-ops.h
+++ b/drivers/clk/rockchip/clk-ops.h
@@ -1,9 +1,9 @@
 #ifndef __RK_CLK_OPS_H
 #define __RK_CLK_OPS_H
-#include <dt-bindings/clock/rockchip,rk3188.h>
-#include "../../../arch/arm/mach-rockchip/iomap.h"
-#include "../../../arch/arm/mach-rockchip/grf.h"
 
+#include <dt-bindings/clock/rockchip,rk3188.h>
+#include <linux/rockchip/iomap.h>
+#include <linux/rockchip/grf.h>
 
 #define MHZ			(1000UL * 1000UL)
 #define KHZ			(1000UL)
diff --git a/drivers/clk/rockchip/clk-pll.h b/drivers/clk/rockchip/clk-pll.h
index 53d8a7c55f8a..ba87874a7fba 100644
--- a/drivers/clk/rockchip/clk-pll.h
+++ b/drivers/clk/rockchip/clk-pll.h
@@ -3,7 +3,7 @@
 
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
-#include "../../../arch/arm/mach-rockchip/cru.h"
+#include <linux/rockchip/cru.h>
 
 
 #define CLK_LOOPS_JIFFY_REF	(11996091ULL)
diff --git a/drivers/net/ethernet/rk/vmac/rk29_vmac_phy.c b/drivers/net/ethernet/rk/vmac/rk29_vmac_phy.c
index 2adb9f9bc8ba..7bf19658bc24 100755
--- a/drivers/net/ethernet/rk/vmac/rk29_vmac_phy.c
+++ b/drivers/net/ethernet/rk/vmac/rk29_vmac_phy.c
@@ -21,8 +21,8 @@
 #include <linux/interrupt.h>
 #include <linux/completion.h>
 
-#include "../../../../../arch/arm/mach-rockchip/iomap.h"
-#include "../../../../../arch/arm/mach-rockchip/grf.h"
+#include <linux/rockchip/iomap.h>
+#include <linux/rockchip/grf.h>
 
 #include "rk29_vmac.h"
 
diff --git a/drivers/video/rockchip/lcdc/rk3188_lcdc.c b/drivers/video/rockchip/lcdc/rk3188_lcdc.c
index 8d26fe0475c8..55b77231efda 100755
--- a/drivers/video/rockchip/lcdc/rk3188_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3188_lcdc.c
@@ -28,9 +28,9 @@
 #include <linux/clk.h>
 #include <asm/div64.h>
 #include <asm/uaccess.h>
-#include "../../../arch/arm/mach-rockchip/cpu.h"
-#include "../../../arch/arm/mach-rockchip/iomap.h"
-#include "../../../arch/arm/mach-rockchip/grf.h"
+#include <linux/rockchip/cpu.h>
+#include <linux/rockchip/iomap.h>
+#include <linux/rockchip/grf.h>
 
 #include "rk3188_lcdc.h"
 
diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.c b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
index 47400d42f36e..1bc6972b0307 100755
--- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
@@ -26,11 +26,11 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/rockchip/cpu.h>
+#include <linux/rockchip/iomap.h>
+#include <linux/rockchip/grf.h>
 #include <asm/div64.h>
 #include <asm/uaccess.h>
-#include "../../../arch/arm/mach-rockchip/cpu.h"
-#include "../../../arch/arm/mach-rockchip/iomap.h"
-#include "../../../arch/arm/mach-rockchip/grf.h"
 
 #include "rk3288_lcdc.h"
 
diff --git a/drivers/video/rockchip/transmitter/rk32_dp.c b/drivers/video/rockchip/transmitter/rk32_dp.c
index a321b4389b0d..d3bf948b490d 100644
--- a/drivers/video/rockchip/transmitter/rk32_dp.c
+++ b/drivers/video/rockchip/transmitter/rk32_dp.c
@@ -23,9 +23,9 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
+#include <linux/rockchip/iomap.h>
+#include <linux/rockchip/grf.h>
 #include "rk32_dp.h"
-#include "../../../arch/arm/mach-rockchip/iomap.h"
-#include "../../../arch/arm/mach-rockchip/grf.h"
 
 #if defined(CONFIG_OF)
 #include <linux/of.h>
diff --git a/drivers/video/rockchip/transmitter/rk32_dp_reg.c b/drivers/video/rockchip/transmitter/rk32_dp_reg.c
index ae9c218b12b8..00fb1cec5700 100644
--- a/drivers/video/rockchip/transmitter/rk32_dp_reg.c
+++ b/drivers/video/rockchip/transmitter/rk32_dp_reg.c
@@ -13,9 +13,9 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include "../../../arch/arm/mach-rockchip/cpu.h"
-#include "../../../arch/arm/mach-rockchip/iomap.h"
-#include "../../../arch/arm/mach-rockchip/grf.h"
+#include <linux/rockchip/cpu.h>
+#include <linux/rockchip/iomap.h>
+#include <linux/rockchip/grf.h>
 
 #include "rk32_dp.h"
 
diff --git a/arch/arm/mach-rockchip/common.h b/include/linux/rockchip/common.h
similarity index 100%
rename from arch/arm/mach-rockchip/common.h
rename to include/linux/rockchip/common.h
diff --git a/arch/arm/mach-rockchip/cpu.h b/include/linux/rockchip/cpu.h
similarity index 100%
rename from arch/arm/mach-rockchip/cpu.h
rename to include/linux/rockchip/cpu.h
diff --git a/arch/arm/mach-rockchip/cru.h b/include/linux/rockchip/cru.h
similarity index 100%
rename from arch/arm/mach-rockchip/cru.h
rename to include/linux/rockchip/cru.h
diff --git a/arch/arm/mach-rockchip/grf.h b/include/linux/rockchip/grf.h
similarity index 100%
rename from arch/arm/mach-rockchip/grf.h
rename to include/linux/rockchip/grf.h
diff --git a/arch/arm/mach-rockchip/iomap.h b/include/linux/rockchip/iomap.h
similarity index 100%
rename from arch/arm/mach-rockchip/iomap.h
rename to include/linux/rockchip/iomap.h
-- 
2.34.1