Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 16:03:55 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 16:03:55 +0000 (09:03 -0700)
Pull ARM SoC cleanup from Olof Johansson:
 "Here is a collection of cleanup patches.  Among the pieces that stand
  out are:

   - The deletion of h720x platforms
   - Split of at91 non-dt platforms to their own Kconfig file to keep
     them separate
   - General cleanups and refactoring of i.MX and MXS platforms
   - Some restructuring of clock tables for OMAP
   - Convertion of PMC driver for Tegra to dt-only
   - Some renames of sunxi -> sun4i (Allwinner A10)
   - ... plus a bunch of other stuff that I haven't mentioned"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
  ARM: i.MX: remove unused ARCH_* configs
  ARM i.MX53: remove platform ahci support
  ARM: sunxi: Rework the restart code
  irqchip: sunxi: Rename sunxi to sun4i
  irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
  clocksource: sunxi: Rename sunxi to sun4i
  clocksource: sunxi: make use of CLKSRC_OF
  clocksource: sunxi: Cleanup the timer code
  ARM: at91: remove trailing semicolon from macros
  ARM: at91/setup: fix trivial typos
  ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
  ARM: EXYNOS: change the name of USB ohci header
  ARM: SAMSUNG: Remove unnecessary code for dma
  ARM: S3C24XX: Remove unused GPIO drive strength register definitions
  ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
  ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
  ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
  ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
  ...

31 files changed:
1  2 
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig
arch/arm/mach-gemini/irq.c
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/avic.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/cclock33xx_data.c
arch/arm/mach-omap2/cpuidle34xx.c
arch/arm/mach-omap2/cpuidle44xx.c
arch/arm/mach-omap2/omap4-common.c
arch/arm/mach-omap2/omap4-sar-layout.h
arch/arm/mach-omap2/pm44xx.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-s3c24xx/common.c
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/pm.c
arch/arm/mach-tegra/sleep.h
arch/arm/mach-vexpress/v2m.c
drivers/clocksource/Makefile
drivers/gpio/gpio-pl061.c
drivers/gpio/gpio-pxa.c
drivers/irqchip/irq-gic.c
drivers/pinctrl/pinctrl-at91.c
drivers/pinctrl/pinctrl-exynos.c
drivers/pinctrl/pinctrl-nomadik.c
drivers/pinctrl/pinctrl-sirf.c
drivers/rtc/rtc-stmp3xxx.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/staging/imx-drm/ipu-v3/ipu-common.c
drivers/usb/host/ohci-exynos.c
include/linux/clocksource.h

index 006f9838dd43a4ccb11efcad5c1918c1e3b2f86f,32e215fd91ec76e818526a9582652648e9294a73..7af7d1368942a5463a6d0c47216b7ae1f4c4b249
@@@ -2163,15 -2153,33 +2156,8 @@@ endmen
  menu "CPU Power Management"
  
  if ARCH_HAS_CPUFREQ
 -
  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
 -config CPU_FREQ_SA1100
 -      bool
 -
 -config CPU_FREQ_SA1110
 -      bool
 -
 -config CPU_FREQ_INTEGRATOR
 -      tristate "CPUfreq driver for ARM Integrator CPUs"
 -      depends on ARCH_INTEGRATOR && CPU_FREQ
 -      default y
--      help
-         This enables the CPUfreq driver for i.MX CPUs.
 -        This enables the CPUfreq driver for ARM Integrator CPUs.
 -
 -        For details, take a look at <file:Documentation/cpu-freq>.
 -
 -        If in doubt, say Y.
 -
 -config CPU_FREQ_PXA
 -      bool
 -      depends on CPU_FREQ && ARCH_PXA && PXA25x
 -      default y
 -      select CPU_FREQ_DEFAULT_GOV_USERSPACE
 -      select CPU_FREQ_TABLE
--
  config CPU_FREQ_S3C
        bool
        help
Simple merge
Simple merge
index cb70961b6239df22fe47c86388a76d55f3df9074,23555b0c08a9f08a442bf8770caa1a5d1be72b2a..fbe60a14534492310f26ee5f3af2871f2f64a1d5
@@@ -27,10 -27,9 +27,9 @@@ obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.
  obj-$(CONFIG_MXC_ULPI) += ulpi.o
  obj-$(CONFIG_MXC_USE_EPIT) += epit.o
  obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
- obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o
  
  ifeq ($(CONFIG_CPU_IDLE),y)
 -obj-y += cpuidle.o
 +obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
  obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
  endif
  
index 9c3e014705b190a5120c3ae2fe5412b381995209,49c87e7aa81752f7c7cba634efa89ce000868c5c..e163ec7a8441170151493adc38146dadf4115b39
  
  #define AVIC_NUM_IRQS 64
  
 -void __iomem *avic_base;
 +static void __iomem *avic_base;
  static struct irq_domain *domain;
  
- static u32 avic_saved_mask_reg[2];
  #ifdef CONFIG_MXC_IRQ_PRIOR
  static int avic_irq_set_priority(unsigned char irq, unsigned char prio)
  {
Simple merge
Simple merge
Simple merge
index 5a286b56205ebc8c1a301e967f0359b6a6b6c7e0,9de47a70628f0e15a3ee49a47cb6c2be6a73d050..c443f2e97e103702531c79b70dccebc11a85218d
@@@ -82,10 -78,9 +79,8 @@@ static int omap_enter_idle_coupled(stru
                        struct cpuidle_driver *drv,
                        int index)
  {
 -      struct omap4_idle_statedata *cx = &omap4_idle_data[index];
 -      int cpu_id = smp_processor_id();
 +      struct idle_statedata *cx = state_ptr + index;
  
-       local_fiq_disable();
        /*
         * CPU0 has to wait and stay ON until CPU1 is OFF state.
         * This is necessary to honour hardware recommondation
Simple merge
Simple merge
Simple merge
Simple merge
index 09b578f9eb8461a9de32630f8ad2ef5105726cdd,92703f955a373831cf92d796240ee998a4f0fadf..c1970005f8056d0c54e6480487efb91c9f90def8
@@@ -24,11 -25,9 +25,8 @@@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)              += cpu
  endif
  obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
 -obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
  obj-$(CONFIG_TEGRA_PCI)                       += pcie.o
  
- obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += board-dt-tegra20.o
- obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += board-dt-tegra30.o
- obj-$(CONFIG_ARCH_TEGRA_114_SOC)      += board-dt-tegra114.o
  ifeq ($(CONFIG_CPU_IDLE),y)
  obj-$(CONFIG_ARCH_TEGRA_114_SOC)      += cpuidle-tegra114.o
  endif
index 04a8e06f59a91f65812beef6db23db80ebb38622,acacbe8d1afcc83d171206cc417db6f832aecd56..891fb70d0aa7f8a05bf65f3f3606790c70010ab6
@@@ -162,19 -162,9 +162,14 @@@ bool tegra_set_cpu_in_lp2(int phy_cpu_i
        return last_cpu;
  }
  
 +int tegra_cpu_do_idle(void)
 +{
 +      return cpu_do_idle();
 +}
 +
  static int tegra_sleep_cpu(unsigned long v2p)
  {
-       /* Switch to the identity mapping. */
-       cpu_switch_mm(idmap_pgd, &init_mm);
-       /* Flush the TLB. */
-       local_flush_tlb_all();
+       setup_mm_for_reboot();
        tegra_sleep_cpu_finish(v2p);
  
        /* should never here */
Simple merge
index eb2b3a627f03ce12b8a68f2564a39647820d44a0,d0ad78998cb628c34feee844b81a4293cb28f253..9366f37902d991de48de0092f79797c781b3b9fd
@@@ -432,8 -433,9 +432,9 @@@ static void __init v2m_dt_timer_init(vo
  {
        struct device_node *node = NULL;
  
 -      vexpress_clk_of_init();
 +      of_clk_init(NULL);
  
+       clocksource_of_init();
        do {
                node = of_find_compatible_node(node, NULL, "arm,sp804");
        } while (node && vexpress_get_site_by_node(node) != VEXPRESS_SITE_MB);
index 96e25319659b09ccf80a21aa80539173b50d4b0d,98f220a7a92c786492e91c41ec56fc45b2428b63..4897f243a000bc66e21054ff816b624c62faa255
@@@ -16,10 -16,10 +16,11 @@@ obj-$(CONFIG_CLKSRC_NOMADIK_MTU)   += nom
  obj-$(CONFIG_CLKSRC_DBX500_PRCMU)     += clksrc-dbx500-prcmu.o
  obj-$(CONFIG_ARMADA_370_XP_TIMER)     += time-armada-370-xp.o
  obj-$(CONFIG_ARCH_BCM2835)    += bcm2835_timer.o
- obj-$(CONFIG_SUNXI_TIMER)     += sunxi_timer.o
+ obj-$(CONFIG_ARCH_MXS)                += mxs_timer.o
+ obj-$(CONFIG_SUN4I_TIMER)     += sun4i_timer.o
  obj-$(CONFIG_ARCH_TEGRA)      += tegra20_timer.o
  obj-$(CONFIG_VT8500_TIMER)    += vt8500_timer.o
 +obj-$(CONFIG_ARCH_BCM)                += bcm_kona_timer.o
  
  obj-$(CONFIG_ARM_ARCH_TIMER)          += arm_arch_timer.o
  obj-$(CONFIG_CLKSRC_METAG_GENERIC)    += metag_generic.o
index d7008dfdd6f076e52008042fe10e9ad2ea944a78,29763361d13c2ed7c654df649fc6cc235a05ad3f..6a4bd0dae0ceb9c3d2d6f7c020c273f0fb269618
@@@ -15,7 -15,7 +15,8 @@@
  #include <linux/io.h>
  #include <linux/ioport.h>
  #include <linux/irq.h>
 +#include <linux/irqdomain.h>
+ #include <linux/irqchip/chained_irq.h>
  #include <linux/bitops.h>
  #include <linux/workqueue.h>
  #include <linux/gpio.h>
@@@ -23,9 -23,7 +24,8 @@@
  #include <linux/amba/bus.h>
  #include <linux/amba/pl061.h>
  #include <linux/slab.h>
 +#include <linux/pinctrl/consumer.h>
  #include <linux/pm.h>
- #include <asm/mach/irq.h>
  
  #define GPIODIR 0x400
  #define GPIOIS  0x404
Simple merge
Simple merge
Simple merge
index 8b10b1ac9071374b557ece6c38eaf0b927e53812,7265e551dddb2949e38b41f50a389cf09950f5a6..ec1567842a7e3fbba71aedcbb51c412311c13cdd
  #include <linux/of_irq.h>
  #include <linux/io.h>
  #include <linux/slab.h>
 +#include <linux/spinlock.h>
  #include <linux/err.h>
  
- #include <asm/mach/irq.h>
  #include "pinctrl-samsung.h"
  #include "pinctrl-exynos.h"
  
Simple merge
Simple merge
index a9cd26a26dc0826128b96909914a3648339c47d6,67d26128bc85dd2694d81dace81acec7ae19334c..483ce086990b75b9ed979dab5749dd6047b0a75c
@@@ -303,11 -313,11 +301,11 @@@ static int stmp3xxx_rtc_suspend(struct 
        return 0;
  }
  
 -static int stmp3xxx_rtc_resume(struct platform_device *dev)
 +static int stmp3xxx_rtc_resume(struct device *dev)
  {
 -      struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev);
 +      struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
  
-       mxs_reset_block(rtc_data->io);
+       stmp_reset_block(rtc_data->io);
        writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
                        STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
                        STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
Simple merge
Simple merge
Simple merge