ARM: sprd: remove macro redefined build warnings

In sprd soc headers, order of header affects repeated macro
definitions and it causes many build warnings. Remove the macro
redefined build warnings by changing order of included headers.

Change-Id: I444399e693727787774b9825029aae1d773affe3
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/arch/arm/mach-sc/mach-scx35-dt.c b/arch/arm/mach-sc/mach-scx35-dt.c
index a42ec2b..a51d443 100644 (file)
--- a/arch/arm/mach-sc/mach-scx35-dt.c
+++ b/arch/arm/mach-sc/mach-scx35-dt.c
@@ -27,7 +27,6 @@
 #include <linux/of_address.h>
 #include <linux/clocksource.h>
 #include <linux/clk-provider.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/adi.h>
 #include <soc/sprd/adc.h>
 #include <soc/sprd/board.h>

diff --git a/arch/arm/mach-sc/syssleep.c b/arch/arm/mach-sc/syssleep.c
index cd86275..52833f3 100755 (executable)
--- a/arch/arm/mach-sc/syssleep.c
+++ b/arch/arm/mach-sc/syssleep.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
-#include <soc/sprd/hardware.h>
 #include <asm/uaccess.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -22,6 +21,7 @@
 #include <linux/delay.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 
 static int syssleep_read_proc(char *page, char **start, off_t off,
                          int count, int *eof, void *data)

diff --git a/drivers/autotst/dispc.c b/drivers/autotst/dispc.c
index 33a65cb..7f3281c 100644 (file)
--- a/drivers/autotst/dispc.c
+++ b/drivers/autotst/dispc.c
@@ -16,11 +16,11 @@
 #include <linux/fb.h>
 #include <linux/delay.h>
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/globalregs.h>
 #include <soc/sprd/irqs.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 
 //#include <mach/pinmap.h>
 

diff --git a/drivers/autotst/dsi.c b/drivers/autotst/dsi.c
index ce4e9d9..8e85e8b 100644 (file)
--- a/drivers/autotst/dsi.c
+++ b/drivers/autotst/dsi.c
@@ -19,12 +19,12 @@
 #include <linux/irqreturn.h>
 #include <linux/interrupt.h>
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/globalregs.h>
 #include <soc/sprd/irqs.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/board.h>
+#include <soc/sprd/hardware.h>
 
 #include "lcd_dummy.h"
 

diff --git a/drivers/battery/sprd27x3_fuelgauge4samsung.c b/drivers/battery/sprd27x3_fuelgauge4samsung.c
index 2114818..9cdb706 100644 (file)
--- a/drivers/battery/sprd27x3_fuelgauge4samsung.c
+++ b/drivers/battery/sprd27x3_fuelgauge4samsung.c
@@ -14,9 +14,9 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 #include <linux/io.h>
 #include <soc/sprd/adi.h>
 #include <linux/wakelock.h>

diff --git a/drivers/clk/clk-sc.c b/drivers/clk/clk-sc.c
index cb03583..9541642 100644 (file)
--- a/drivers/clk/clk-sc.c
+++ b/drivers/clk/clk-sc.c
@@ -21,8 +21,8 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 #include <soc/sprd/arch_lock.h>
 
 #ifdef CONFIG_OF

diff --git a/drivers/gpu/drm/sprd/regs-gsp.h b/drivers/gpu/drm/sprd/regs-gsp.h
index eca7e41..724ba9d 100644 (file)
--- a/drivers/gpu/drm/sprd/regs-gsp.h
+++ b/drivers/gpu/drm/sprd/regs-gsp.h
@@ -341,6 +341,7 @@ typedef struct _GSP_CONFIG_INFO_TAG_ {
  **---------------------------------------------------------------------------*/
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/globalregs.h> //define IRQ_GSP_INT
+#include <soc/sprd/hardware.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 

diff --git a/drivers/gpu/drm/sprd/sprd_drm_gsp.c b/drivers/gpu/drm/sprd/sprd_drm_gsp.c
index 7f69485..83b6fa9 100644 (file)
--- a/drivers/gpu/drm/sprd/sprd_drm_gsp.c
+++ b/drivers/gpu/drm/sprd/sprd_drm_gsp.c
@@ -28,7 +28,6 @@
 #include <linux/io.h>
 #include <linux/pid.h>
 #include <linux/pm_runtime.h>
-#include <soc/sprd/hardware.h>
 
 #include <drm/drmP.h>
 #include <drm/sprd_drm.h>

diff --git a/drivers/gpu/drm/sprd/sprd_drm_irq.c b/drivers/gpu/drm/sprd/sprd_drm_irq.c
index cc46f53..3bc7fc5 100644 (file)
--- a/drivers/gpu/drm/sprd/sprd_drm_irq.c
+++ b/drivers/gpu/drm/sprd/sprd_drm_irq.c
@@ -14,7 +14,6 @@
 
 #include "sprd_drm_irq.h"
 #include "sprd_drm_drv.h"
-#include <soc/sprd/hardware.h>
 #include "sprdfb.h"
 #include <soc/sprd/cpuidle.h>
 

diff --git a/drivers/input/keyboard/sc_keypad.c b/drivers/input/keyboard/sc_keypad.c
index 2b5876d..e081fe5 100644 (file)
--- a/drivers/input/keyboard/sc_keypad.c
+++ b/drivers/input/keyboard/sc_keypad.c
@@ -36,13 +36,13 @@
 #include <linux/of_gpio.h>
 
 #include <soc/sprd/globalregs.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/board.h>
 #include <soc/sprd/gpio.h>
 #include <soc/sprd/adi.h>
 #include <soc/sprd/kpd.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 #include <linux/wakelock.h>
 #if CONFIG_SEC_DEBUG
 #include <soc/sprd/sec_debug.h>

diff --git a/drivers/input/misc/ff-haptic.c b/drivers/input/misc/ff-haptic.c
index d9274bb..d753ef8 100644 (file)
--- a/drivers/input/misc/ff-haptic.c
+++ b/drivers/input/misc/ff-haptic.c
@@ -22,7 +22,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <../../../drivers/staging/android/timed_output.h>
-#include <soc/sprd/hardware.h>
 
 #if defined(CONFIG_HAS_WAKELOCK)
 #include <linux/wakelock.h>
@@ -32,6 +31,7 @@
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/adi.h>
 #include <soc/sprd/adc.h>
+#include <soc/sprd/hardware.h>
 #define FF_HAPTIC_NAME "ff-haptic"
 
 #endif

diff --git a/drivers/input/misc/headset_sprd_sc2723.c b/drivers/input/misc/headset_sprd_sc2723.c
index 4a7a580..03dfc09 100755 (executable)
--- a/drivers/input/misc/headset_sprd_sc2723.c
+++ b/drivers/input/misc/headset_sprd_sc2723.c
@@ -21,7 +21,6 @@
 
 #include <soc/sprd/adc.h>
 #include <asm/io.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/adi.h>
 #include <linux/module.h>
 #include <linux/wakelock.h>
@@ -29,6 +28,7 @@
 #include <linux/regulator/consumer.h>
 #include <soc/sprd/regulator.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 #include <soc/sprd/arch_misc.h>
 #include <linux/notifier.h>
 #ifdef CONFIG_OF
@@ -40,10 +40,6 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 
-#include <../sound/soc/sprd/codec/sprd/v4/sprd-codec.h>
-
-
-
 
 //====================  debug  ====================
 #define ENTER \

diff --git a/drivers/media/sprd_dcam/common/parse_hwinfo.c b/drivers/media/sprd_dcam/common/parse_hwinfo.c
index abaf9e6..e4897cb 100644 (file)
--- a/drivers/media/sprd_dcam/common/parse_hwinfo.c
+++ b/drivers/media/sprd_dcam/common/parse_hwinfo.c
@@ -16,6 +16,8 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <asm/io.h>
+#include <soc/sprd/sci.h>
+#include <soc/sprd/sci_glb_regs.h>
 #ifndef CONFIG_64BIT
 #include <soc/sprd/hardware.h>
 #include <soc/sprd/board.h>
@@ -23,8 +25,6 @@
 #else
 #include <soc/sprd/irqs.h>
 #endif
-#include <soc/sprd/sci.h>
-#include <soc/sprd/sci_glb_regs.h>
 
 #include <linux/sprd_iommu.h>
 #include <linux/delay.h>

diff --git a/drivers/media/sprd_dcam/tshark/dcam_drv.c b/drivers/media/sprd_dcam/tshark/dcam_drv.c
index a850c49..6ddeece 100755 (executable)
--- a/drivers/media/sprd_dcam/tshark/dcam_drv.c
+++ b/drivers/media/sprd_dcam/tshark/dcam_drv.c
@@ -20,10 +20,10 @@
 #include <linux/err.h>
 #include <asm/io.h>
 #include <linux/kthread.h>
-#include <soc/sprd/hardware.h>
 #include <mach/irqs.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 #include <linux/vmalloc.h>
 #include <linux/videodev2.h>
 #include <linux/wakelock.h>

diff --git a/drivers/misc/clkmon/clk_mon.c b/drivers/misc/clkmon/clk_mon.c
index 425e40d..fddc463 100644 (file)
--- a/drivers/misc/clkmon/clk_mon.c
+++ b/drivers/misc/clkmon/clk_mon.c
@@ -16,9 +16,9 @@
 #include <linux/uaccess.h>
 #include <linux/io.h>
 #include <linux/clk_mon.h>
-#include <soc/sprd/pm_debug.h>
 #include "clk_mon_ioctl.h"
 #include "clk_mon_scx35.h"
+#include <soc/sprd/pm_debug.h>
 /* SPRD is based on regulator framework and not Domain based framework
  * hence, we need to get the status of the Parent regulators to check if
  * it is ON/OFF

diff --git a/drivers/misc/sdiodev/sdio_dev.h b/drivers/misc/sdiodev/sdio_dev.h
index 0247809..0edcf18 100644 (file)
--- a/drivers/misc/sdiodev/sdio_dev.h
+++ b/drivers/misc/sdiodev/sdio_dev.h
@@ -38,9 +38,9 @@
 #include <linux/timer.h>
 #include <linux/irq.h>
 #include <linux/suspend.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/sci.h>
+#include <soc/sprd/hardware.h>
 #include <soc/sprd/board.h>
 #include <linux/sprd_iommu.h>
 #include <linux/spinlock.h>

diff --git a/drivers/misc/sprd_cproc/sprd_cproc.c b/drivers/misc/sprd_cproc/sprd_cproc.c
index af1ab01..6aec251 100755 (executable)
--- a/drivers/misc/sprd_cproc/sprd_cproc.c
+++ b/drivers/misc/sprd_cproc/sprd_cproc.c
@@ -31,11 +31,11 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #endif
-#include <soc/sprd/hardware.h>
 #include <linux/sprd_cproc.h>
 #include <linux/sipc.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 //#include <soc/sprd/arch_misc.h>
 #define CPROC_WDT_TRUE   1
 #define CPROC_WDT_FLASE  0

diff --git a/drivers/mmc/host/sdhost.c b/drivers/mmc/host/sdhost.c
index 4572d27..d7edcd7 100755 (executable)
--- a/drivers/mmc/host/sdhost.c
+++ b/drivers/mmc/host/sdhost.c
@@ -25,9 +25,9 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 
 #include "sdhost.h"
 #ifdef CONFIG_DEBUG_FS

diff --git a/drivers/mmc/host/sdhost_debugfs.c b/drivers/mmc/host/sdhost_debugfs.c
index b08a697..92432fd 100755 (executable)
--- a/drivers/mmc/host/sdhost_debugfs.c
+++ b/drivers/mmc/host/sdhost_debugfs.c
@@ -12,10 +12,10 @@
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/adi.h>
+#include <soc/sprd/hardware.h>
 
 #include "sdhost.h"
 #include "sdhost_debugfs.h"

diff --git a/drivers/platform/sprd/adie_irq.c b/drivers/platform/sprd/adie_irq.c
index df4ac0c..e789887 100644 (file)
--- a/drivers/platform/sprd/adie_irq.c
+++ b/drivers/platform/sprd/adie_irq.c
@@ -27,11 +27,11 @@
 
 #include <asm/delay.h>
 
+#include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/hardware.h>
 #include <soc/sprd/globalregs.h>
 #include <soc/sprd/adi.h>
 #include <soc/sprd/irqs.h>
-#include <soc/sprd/sci_glb_regs.h>
 
 //#include <mach/irqs.h>
 

diff --git a/drivers/platform/sprd/arch_misc.c b/drivers/platform/sprd/arch_misc.c
index 4804d2b..1b70abc 100644 (file)
--- a/drivers/platform/sprd/arch_misc.c
+++ b/drivers/platform/sprd/arch_misc.c
@@ -33,11 +33,11 @@
 #include <asm/tlbflush.h>
 #include <asm/fixmap.h>
 #include <asm/pgalloc.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/adi.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/arch_misc.h>
+#include <soc/sprd/hardware.h>
 
 #ifndef CONFIG_64BIT
 #include "../../../arch/arm/mm/mm.h"

diff --git a/drivers/platform/sprd/busmonitor.c b/drivers/platform/sprd/busmonitor.c
index 10bd214..fd1359f 100644 (file)
--- a/drivers/platform/sprd/busmonitor.c
+++ b/drivers/platform/sprd/busmonitor.c
@@ -29,13 +29,13 @@
 #include <linux/rtc.h>
 
 #include <soc/sprd/sci.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/irqs.h>
 #include <soc/sprd/busmonitor.h>
 #include <soc/sprd/iomap.h>
 #include <soc/sprd/pm_debug.h>
 #include <soc/sprd/sprd_persistent_clock.h>
+#include <soc/sprd/hardware.h>
 
 
 #ifdef CONFIG_OF

diff --git a/drivers/platform/sprd/cpufreq-scx35.c b/drivers/platform/sprd/cpufreq-scx35.c
index b277217..7983dc4 100644 (file)
--- a/drivers/platform/sprd/cpufreq-scx35.c
+++ b/drivers/platform/sprd/cpufreq-scx35.c
@@ -29,12 +29,12 @@
 //#include <asm/system.h>
 #include <trace/events/power.h>
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/regulator.h>
 #include <soc/sprd/adi.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/arch_misc.h>
+#include <soc/sprd/hardware.h>
 #include <linux/pm_qos.h>
 #include <linux/of_platform.h>
 

diff --git a/drivers/platform/sprd/cpuidle-scx35.c b/drivers/platform/sprd/cpuidle-scx35.c
index 418a12e..b3ee9d9 100644 (file)
--- a/drivers/platform/sprd/cpuidle-scx35.c
+++ b/drivers/platform/sprd/cpuidle-scx35.c
@@ -19,9 +19,9 @@
 #include <linux/suspend.h>
 #include <asm/proc-fns.h>
 #include <soc/sprd/sci.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/cpuidle.h>
+#include <soc/sprd/hardware.h>
 
 
 /*#define SC_IDLE_DEBUG 1*/

diff --git a/drivers/platform/sprd/hotplug.c b/drivers/platform/sprd/hotplug.c
index a887a0c..f81dfe5 100644 (file)
--- a/drivers/platform/sprd/hotplug.c
+++ b/drivers/platform/sprd/hotplug.c
@@ -17,12 +17,12 @@
 #include <linux/sched.h>
 #include <linux/io.h>
 
-#include <soc/sprd/hardware.h>
 #include <asm/cacheflush.h>
 #include <asm/cp15.h>
 #include <asm/smp_plat.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 
 extern volatile int pen_release;
 #ifdef CONFIG_ARCH_SCX35

diff --git a/drivers/platform/sprd/irq.c b/drivers/platform/sprd/irq.c
index 4a3db24..3e40eeb 100644 (file)
--- a/drivers/platform/sprd/irq.c
+++ b/drivers/platform/sprd/irq.c
@@ -21,7 +21,6 @@
 
 #include <linux/irqchip/arm-gic.h>
 
-#include <soc/sprd/hardware.h>
 //#include <mach/irqs.h>
 #include <soc/sprd/irqs.h>
 #include <soc/sprd/sci_glb_regs.h>
@@ -29,10 +28,10 @@
 #include <soc/sprd/arch_misc.h>
 //#include <asm/fiq.h>
 #include <soc/sprd/adi.h>
+#include <soc/sprd/hardware.h>
 #include <linux/of.h>
 #include <linux/irqchip.h>
 
-#include <soc/sprd/sci_glb_regs.h>
 
 /* general interrupt registers */
 #define        INTC_IRQ_MSKSTS         (0x0000)

diff --git a/drivers/platform/sprd/pin_switch.c b/drivers/platform/sprd/pin_switch.c
index 8a7a1ef..ba336c7 100755 (executable)
--- a/drivers/platform/sprd/pin_switch.c
+++ b/drivers/platform/sprd/pin_switch.c
@@ -8,10 +8,10 @@
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
 #include <linux/printk.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/arch_lock.h>
 #include <linux/of.h>
 #include <soc/sprd/pin_switch.h>
+#include <soc/sprd/hardware.h>
 #include <linux/regulator/consumer.h>
 
 #ifdef CONFIG_PROC_FS

diff --git a/drivers/platform/sprd/platsmp.c b/drivers/platform/sprd/platsmp.c
index dcccde1..6e92fdc 100644 (file)
--- a/drivers/platform/sprd/platsmp.c
+++ b/drivers/platform/sprd/platsmp.c
@@ -29,9 +29,9 @@
 #include <asm/smp_scu.h>
 #include <asm/unified.h>
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/sci.h>
+#include <soc/sprd/hardware.h>
 #include <asm/atomic.h>
 
 extern void sci_secondary_startup(void);

diff --git a/drivers/platform/sprd/pm_debug_scx35.c b/drivers/platform/sprd/pm_debug_scx35.c
index 448da86..38f6b13 100644 (file)
--- a/drivers/platform/sprd/pm_debug_scx35.c
+++ b/drivers/platform/sprd/pm_debug_scx35.c
@@ -20,7 +20,6 @@
 #include <linux/wakelock.h>
 #include <linux/kthread.h>
 #include <linux/debugfs.h>
-#include <soc/sprd/pm_debug.h>
 #if defined(CONFIG_ARCH_SCX35L64)||defined(CONFIG_ARCH_SCX35LT8)
 #include <soc/sprd/sprd_persistent_clock.h>
 #endif
@@ -31,6 +30,7 @@
 #include <soc/sprd/irqs.h>
 #include <soc/sprd/gpio.h>
 #include <soc/sprd/iomap.h>
+#include <soc/sprd/pm_debug.h>
 #include <linux/vmalloc.h>
 #ifdef CONFIG_PM_SLEEP_HISTORY
 #include <linux/power/sleep_history.h>

diff --git a/drivers/platform/sprd/sec_debug.c b/drivers/platform/sprd/sec_debug.c
index 47e383f..642c639 100755 (executable)
--- a/drivers/platform/sprd/sec_debug.c
+++ b/drivers/platform/sprd/sec_debug.c
@@ -36,9 +36,9 @@
 #include <linux/moduleparam.h>
 #include <asm/system_misc.h>
 #include <linux/dma-mapping.h>
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/system.h>
 #include <soc/sprd/sec_debug.h>
+#include <soc/sprd/hardware.h>
 
 #include <linux/seq_file.h>
 

diff --git a/drivers/platform/sprd/sec_log.c b/drivers/platform/sprd/sec_log.c
index d372ac1..79191e7 100644 (file)
--- a/drivers/platform/sprd/sec_log.c
+++ b/drivers/platform/sprd/sec_log.c
@@ -21,7 +21,6 @@
 #include <linux/uaccess.h>
 #include <linux/proc_fs.h>
 
-#include <soc/sprd/sec_debug.h>
 #include <asm/mach/map.h>
 #include <asm/tlbflush.h>
 #include <linux/init.h>
@@ -35,6 +34,7 @@
 #ifdef CONFIG_SEC_DEBUG_REG_ACCESS
 #include <soc/sprd/arch_lock.h>
 #endif
+#include <soc/sprd/sec_debug.h>
 
 /*
  * Example usage: sec_log=256K@0x45000000

diff --git a/drivers/platform/sprd/sleep_monitor_scx35.c b/drivers/platform/sprd/sleep_monitor_scx35.c
index 326e600..383da33 100755 (executable)
--- a/drivers/platform/sprd/sleep_monitor_scx35.c
+++ b/drivers/platform/sprd/sleep_monitor_scx35.c
@@ -20,7 +20,6 @@
 #include <linux/wakelock.h>
 #include <linux/kthread.h>
 #include <linux/debugfs.h>
-#include <soc/sprd/pm_debug.h>
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/adi.h>
@@ -28,6 +27,7 @@
 #include <soc/sprd/irqs.h>
 #include <soc/sprd/gpio.h>
 #include <soc/sprd/iomap.h>
+#include <soc/sprd/pm_debug.h>
 #include <linux/vmalloc.h>
 
 #ifdef CONFIG_SLEEP_MONITOR

diff --git a/drivers/platform/sprd/timer_sc8830.c b/drivers/platform/sprd/timer_sc8830.c
index fa8b921..78d9e0b 100755 (executable)
--- a/drivers/platform/sprd/timer_sc8830.c
+++ b/drivers/platform/sprd/timer_sc8830.c
@@ -29,9 +29,9 @@
 #include <asm/localtimer.h>
 #include <asm/mach/time.h>
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 #include <mach/irqs.h>
 #include <asm/mach/time.h>
 #include <soc/sprd/sprd_persistent_clock.h>

diff --git a/drivers/tty/serial/serial_sprd_dt.c b/drivers/tty/serial/serial_sprd_dt.c
index 1c2c734..5165e04 100755 (executable)
--- a/drivers/tty/serial/serial_sprd_dt.c
+++ b/drivers/tty/serial/serial_sprd_dt.c
@@ -28,6 +28,7 @@
 #include <asm/irq.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <soc/sprd/sci_glb_regs.h>
 #ifndef CONFIG_64BIT
 #include <soc/sprd/hardware.h>
 #include <soc/sprd/serial_sprd.h>
@@ -37,7 +38,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
-#include <soc/sprd/sci_glb_regs.h>
 
 #define IRQ_WAKEUP     0
 

diff --git a/drivers/video/sprdfb/spi/spi_simple_drv.c b/drivers/video/sprdfb/spi/spi_simple_drv.c
index ad96507..5265194 100644 (file)
--- a/drivers/video/sprdfb/spi/spi_simple_drv.c
+++ b/drivers/video/sprdfb/spi/spi_simple_drv.c
@@ -5,9 +5,9 @@
 #include <linux/fb.h>
 #endif
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 
 #include "spi_simple_drv.h"
 

diff --git a/drivers/video/sprdfb/sprdfb_chip_8830.h b/drivers/video/sprdfb/sprdfb_chip_8830.h
index 03dac17..c03298c 100644 (file)
--- a/drivers/video/sprdfb/sprdfb_chip_8830.h
+++ b/drivers/video/sprdfb/sprdfb_chip_8830.h
@@ -15,7 +15,6 @@
 #define _SC8830_DISPC_GLB_REG_K_H_
 
 #include <linux/kernel.h>
-#include <soc/sprd/hardware.h>
 
 #define        SPRD_MIPI_DPHY_GEN2
 

diff --git a/drivers/video/sprdfb/sprdfb_chip_common.h b/drivers/video/sprdfb/sprdfb_chip_common.h
index 8ff391c..cfc2517 100644 (file)
--- a/drivers/video/sprdfb/sprdfb_chip_common.h
+++ b/drivers/video/sprdfb/sprdfb_chip_common.h
@@ -18,12 +18,13 @@
 #include <soc/sprd/sci_glb_regs.h>
 #include <soc/sprd/sci.h>
 #else
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/globalregs.h>
 #include <mach/irqs.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 #endif
+#include <linux/kernel.h>
 #include <linux/io.h>
 
 #if defined(CONFIG_FB_SCX35L)

diff --git a/include/soc/sprd/__hardware-sc7731.h b/include/soc/sprd/__hardware-sc7731.h
index e7420fc..d9fe934 100644 (file)
--- a/include/soc/sprd/__hardware-sc7731.h
+++ b/include/soc/sprd/__hardware-sc7731.h
@@ -119,7 +119,9 @@ extern unsigned long sprd_adi_phys;
 #define CPU_JUMP_VADDR         (HOLDING_PEN_VADDR + 0X4)
 
 /* registers for watchdog ,RTC, touch panel, aux adc, analog die... */
+#ifndef SPRD_MISC_BASE
 #define SPRD_MISC_BASE ((unsigned int)SPRD_ADI_BASE)
+#endif
 #define SPRD_MISC_PHYS ((unsigned int)SPRD_ADI_PHYS)
 
 #define ANA_PWM_BASE                   (SPRD_ADISLAVE_BASE + 0x20 )

diff --git a/include/soc/sprd/__sprd_audio_sc8830.h b/include/soc/sprd/__sprd_audio_sc8830.h
index 82da0ef..80c2c37 100644 (file)
--- a/include/soc/sprd/__sprd_audio_sc8830.h
+++ b/include/soc/sprd/__sprd_audio_sc8830.h
@@ -20,9 +20,9 @@
 
 #include <linux/delay.h>
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sci.h>
 #include <soc/sprd/sci_glb_regs.h>
+#include <soc/sprd/hardware.h>
 #include <soc/sprd/adi.h>
 #include <soc/sprd/dma.h>
 #include <mach/irqs.h>

diff --git a/include/soc/sprd/system.h b/include/soc/sprd/system.h
index 4aa2ea3..452ff1a 100644 (file)
--- a/include/soc/sprd/system.h
+++ b/include/soc/sprd/system.h
@@ -14,8 +14,8 @@
 #ifndef __ASM_ARCH_SYSTEM_H
 #define __ASM_ARCH_SYSTEM_H __FILE__
 
-#include <soc/sprd/hardware.h>
 #include <soc/sprd/sys_reset.h>
+#include <soc/sprd/hardware.h>
 
 static inline void arch_idle(void)
 {

diff --git a/sound/soc/sprd/dai/i2s/i2s.c b/sound/soc/sprd/dai/i2s/i2s.c
index a29819a..2756fd8 100644 (file)
--- a/sound/soc/sprd/dai/i2s/i2s.c
+++ b/sound/soc/sprd/dai/i2s/i2s.c
@@ -37,8 +37,6 @@
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 
-#include <soc/sprd/hardware.h>
-
 #include "sprd-asoc-common.h"
 #ifndef CONFIG_SND_SOC_SPRD_AUDIO_DMA_ENGINE
 #include "sprd-pcm.h"
@@ -46,6 +44,7 @@
 #include "sprd-dmaengine-pcm.h"
 #endif
 #include <soc/sprd/i2s.h>
+#include <soc/sprd/hardware.h>
 
 /* register offset */
 #define IIS_TXD                        (0x0000)