Merge tag 'imx-cleanup-3.10' into imx/soc

The imx cleanup for 3.10:

* Clean up a couple of unneeded function declarations
* Remove imx specific cpufreq driver as generic cpufreq-cpu0 works well
  as the replacement
* Remove platform ahci support
* Clean up unused ARCH/MACH Kconfig symbols
* Remove a couple of unused files

diff --combined arch/arm/Kconfig
index 1cacda4,c5ed84c..e904ddc
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1183,9 -1183,9 +1183,9 @@@ config ARM_NR_BANK
        default 8
  
  config IWMMXT
 -      bool "Enable iWMMXt support"
 +      bool "Enable iWMMXt support" if !CPU_PJ4
        depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
 -      default y if PXA27x || PXA3xx || ARCH_MMP
 +      default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4
        help
          Enable support for iWMMXt context switching at run time if
          running on a CPU that supports it.
@@@ -1439,16 -1439,6 +1439,16 @@@ config ARM_ERRATA_77542
         to deadlock. This workaround puts DSB before executing ISB if
         an abort may occur on cache maintenance.
  
 +config ARM_ERRATA_798181
 +      bool "ARM errata: TLBI/DSB failure on Cortex-A15"
 +      depends on CPU_V7 && SMP
 +      help
 +        On Cortex-A15 (r0p0..r3p2) the TLBI*IS/DSB operations are not
 +        adequately shooting down all use of the old entries. This
 +        option enables the Linux kernel workaround for this erratum
 +        which sends an IPI to the CPUs that are running the same ASID
 +        as the one being invalidated.
 +
  endmenu
  
  source "arch/arm/common/Kconfig"
@@@ -2163,13 -2153,6 +2163,6 @@@ if ARCH_HAS_CPUFRE
  
  source "drivers/cpufreq/Kconfig"
  
- config CPU_FREQ_IMX
-       tristate "CPUfreq driver for i.MX CPUs"
-       depends on ARCH_MXC && CPU_FREQ
-       select CPU_FREQ_TABLE
-       help
-         This enables the CPUfreq driver for i.MX CPUs.
- 
  config CPU_FREQ_SA1100
        bool
  

diff --combined arch/arm/mach-imx/common.h
index 5bf4a97,d4b2f36..9fea252
--- 1/arch/arm/mach-imx/common.h
--- 2/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@@ -110,10 -110,7 +110,9 @@@ void tzic_handle_irq(struct pt_regs *)
  
  extern void imx_enable_cpu(int cpu, bool enable);
  extern void imx_set_cpu_jump(int cpu, void *jump_addr);
 +extern u32 imx_get_cpu_arg(int cpu);
 +extern void imx_set_cpu_arg(int cpu, u32 arg);
  extern void v7_cpu_resume(void);
- extern u32 *pl310_get_save_ptr(void);
  #ifdef CONFIG_SMP
  extern void v7_secondary_startup(void);
  extern void imx_scu_map_io(void);
@@@ -124,8 -121,6 +123,6 @@@ static inline void imx_scu_map_io(void
  static inline void imx_smp_prepare(void) {}
  static inline void imx_scu_standby_enable(void) {}
  #endif
- extern void imx_enable_cpu(int cpu, bool enable);
- extern void imx_set_cpu_jump(int cpu, void *jump_addr);
  extern void imx_src_init(void);
  extern void imx_src_prepare_restart(void);
  extern void imx_gpc_init(void);