diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 14:58:40 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 14:58:40 -0800 | 
| commit | b274776c54c320763bc12eb035c0e244f76ccb43 (patch) | |
| tree | c75b70d0824a7ae029229b19d61884039abf2127 /arch/arm/mach-imx/common.h | |
| parent | b24174b0cbbe383c5bb6097aeb24480b8fd2d338 (diff) | |
| parent | 3b1209e7994c4d31ff9932a7f566ae1c96b3c443 (diff) | |
| download | olio-linux-3.10-b274776c54c320763bc12eb035c0e244f76ccb43.tar.xz olio-linux-3.10-b274776c54c320763bc12eb035c0e244f76ccb43.zip  | |
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanups from Arnd Bergmann:
 "A large number of cleanups, all over the platforms.  This is dominated
  largely by the Samsung platforms (s3c, s5p, exynos) and a few of the
  others moving code out of arch/arm into more appropriate subsystems.
  The clocksource and irqchip drivers are now abstracted to the point
  where platforms that are already cleaned up do not need to even
  specify the driver they use, it can all get configured from the device
  tree as we do for normal device drivers.  The clocksource changes
  basically touch every single platform in the process.
  We further clean up the use of platform specific header files here,
  with the goal of turning more of the platforms over to being
  "multiplatform" enabled, which implies that they cannot expose their
  headers to architecture independent code any more.
  It is expected that no functional changes are part of the cleanup.
  The overall reduction in total code lines is mostly the result of
  removing broken and obsolete code."
* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits)
  ARM: mvebu: correct gated clock documentation
  ARM: kirkwood: add missing include for nsa310
  ARM: exynos: move exynos4210-combiner to drivers/irqchip
  mfd: db8500-prcmu: update resource passing
  drivers/db8500-cpufreq: delete dangling include
  ARM: at91: remove NEOCORE 926 board
  sunxi: Cleanup the reset code and add meaningful registers defines
  ARM: S3C24XX: header mach/regs-mem.h local
  ARM: S3C24XX: header mach/regs-power.h local
  ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
  ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
  ARM: S3C24XX: transform s3c2443 subirqs into new structure
  ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs
  ARM: S3C24XX: move s3c2443 irq code to irq.c
  ARM: S3C24XX: transform s3c2416 irqs into new structure
  ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs
  ARM: S3C24XX: move s3c2416 irq init to common irq code
  ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property
  ARM: S3C24XX: Move irq syscore-ops to irq-pm
  clocksource: always define CLOCKSOURCE_OF_DECLARE
  ...
Diffstat (limited to 'arch/arm/mach-imx/common.h')
| -rw-r--r-- | arch/arm/mach-imx/common.h | 12 | 
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index fa36fb84ab1..76c42004328 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -21,7 +21,6 @@ extern void mx25_map_io(void);  extern void mx27_map_io(void);  extern void mx31_map_io(void);  extern void mx35_map_io(void); -extern void mx50_map_io(void);  extern void mx51_map_io(void);  extern void mx53_map_io(void);  extern void imx1_init_early(void); @@ -30,7 +29,6 @@ extern void imx25_init_early(void);  extern void imx27_init_early(void);  extern void imx31_init_early(void);  extern void imx35_init_early(void); -extern void imx50_init_early(void);  extern void imx51_init_early(void);  extern void imx53_init_early(void);  extern void mxc_init_irq(void __iomem *); @@ -41,7 +39,6 @@ extern void mx25_init_irq(void);  extern void mx27_init_irq(void);  extern void mx31_init_irq(void);  extern void mx35_init_irq(void); -extern void mx50_init_irq(void);  extern void mx51_init_irq(void);  extern void mx53_init_irq(void);  extern void imx1_soc_init(void); @@ -50,7 +47,6 @@ extern void imx25_soc_init(void);  extern void imx27_soc_init(void);  extern void imx31_soc_init(void);  extern void imx35_soc_init(void); -extern void imx50_soc_init(void);  extern void imx51_soc_init(void);  extern void imx51_init_late(void);  extern void imx53_init_late(void); @@ -109,18 +105,11 @@ void tzic_handle_irq(struct pt_regs *);  #define imx27_handle_irq avic_handle_irq  #define imx31_handle_irq avic_handle_irq  #define imx35_handle_irq avic_handle_irq -#define imx50_handle_irq tzic_handle_irq  #define imx51_handle_irq tzic_handle_irq  #define imx53_handle_irq tzic_handle_irq -#define imx6q_handle_irq gic_handle_irq  extern void imx_enable_cpu(int cpu, bool enable);  extern void imx_set_cpu_jump(int cpu, void *jump_addr); -#ifdef CONFIG_DEBUG_LL -extern void imx_lluart_map_io(void); -#else -static inline void imx_lluart_map_io(void) {} -#endif  extern void v7_cpu_resume(void);  extern u32 *pl310_get_save_ptr(void);  #ifdef CONFIG_SMP @@ -139,7 +128,6 @@ extern void imx_gpc_init(void);  extern void imx_gpc_pre_suspend(void);  extern void imx_gpc_post_resume(void);  extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); -extern void imx6q_clock_map_io(void);  extern void imx_cpu_die(unsigned int cpu);  extern int imx_cpu_kill(unsigned int cpu);  |