Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC driver updates from Olof Johansson:
 "Driver updates for ARM SoCs.

  A slew of changes this release cycle.  The reset driver tree, that we
  merge through arm-soc for historical reasons, is also sizable this
  time around.

  Among the changes:

   - clps711x: Treewide changes to compatible strings, merged here for simplicity.
   - Qualcomm: SCM firmware driver cleanups, move to platform driver
   - ux500: Major cleanups, removal of old mach-specific infrastructure.
   - Atmel external bus memory driver
   - Move of brcmstb platform to the rest of bcm
   - PMC driver updates for tegra, various fixes and improvements
   - Samsung platform driver updates to support 64-bit Exynos platforms
   - Reset controller cleanups moving to devm_reset_controller_register() APIs
   - Reset controller driver for Amlogic Meson
   - Reset controller driver for Hisilicon hi6220
   - ARM SCPI power domain support"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (100 commits)
  ARM: ux500: consolidate base platform files
  ARM: ux500: move soc_id driver to drivers/soc
  ARM: ux500: call ux500_setup_id later
  ARM: ux500: consolidate soc_device code in id.c
  ARM: ux500: remove cpu_is_u* helpers
  ARM: ux500: use CLK_OF_DECLARE()
  ARM: ux500: move l2x0 init to .init_irq
  mfd: db8500 stop passing around platform data
  ASoC: ab8500-codec: remove platform data based probe
  ARM: ux500: move ab8500_regulator_plat_data into driver
  ARM: ux500: remove unused regulator data
  soc: raspberrypi-power: add CONFIG_OF dependency
  firmware: scpi: add CONFIG_OF dependency
  video: clps711x-fb: Changing the compatibility string to match with the smallest supported chip
  input: clps711x-keypad: Changing the compatibility string to match with the smallest supported chip
  pwm: clps711x: Changing the compatibility string to match with the smallest supported chip
  serial: clps711x: Changing the compatibility string to match with the smallest supported chip
  irqchip: clps711x: Changing the compatibility string to match with the smallest supported chip
  clocksource: clps711x: Changing the compatibility string to match with the smallest supported chip
  clk: clps711x: Changing the compatibility string to match with the smallest supported chip
  ...

diff --cc Documentation/driver-model/devres.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/exynos5420-peach-pit.dts
Simple merge

diff --cc arch/arm/mach-exynos/Kconfig
index ecf139f31c4c7995e5bef7d46bd48ab6d6acf283,58b334f5f1d6d44f1bb0be455201c2310131b43a..8f820de890b43559e55e475a9b51f8975f32e346
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -18,7 -19,7 +18,8 @@@ menuconfig ARCH_EXYNO
        select EXYNOS_THERMAL
        select EXYNOS_PMU
        select EXYNOS_SROM
+       select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
 +      select GPIOLIB
        select HAVE_ARM_SCU if SMP
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG

diff --cc arch/arm/mach-exynos/exynos.c
index ecbfa5dd3c543ad8ab7b34823e830c3387ab1e6b,a8620c6eb723aa2e89f7a1b5d77a01c3de85b4d6..acabf0bffc5dbf2bc7bd2effa800c3002cc9d2c7
--- 1/arch/arm/mach-exynos/exynos.c
--- 2/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@@ -24,10 -25,8 +24,9 @@@
  #include <asm/mach/map.h>
  
  #include <mach/map.h>
 +#include <plat/cpu.h>
  
  #include "common.h"
- #include "mfc.h"
  
  static struct map_desc exynos4_iodesc[] __initdata = {
        {

diff --cc arch/arm/mach-omap2/pdata-quirks.c
Simple merge

diff --cc drivers/clocksource/clps711x-timer.c
index 84aed78261e46e6cf6427298fdc78a16790bf8d1,7c65f9e1d347912d225602e520c8d7cb4266d298..24db6d605549cec0a4f0e611be0de44161b98b84
--- 1/drivers/clocksource/clps711x-timer.c
--- 2/drivers/clocksource/clps711x-timer.c
+++ b/drivers/clocksource/clps711x-timer.c
@@@ -112,12 -112,14 +112,12 @@@ static int __init clps711x_timer_init(s
  
        switch (of_alias_get_id(np, "timer")) {
        case CLPS711X_CLKSRC_CLOCKSOURCE:
 -              BUG_ON(_clps711x_clksrc_init(clock, base));
 -              break;
 +              return _clps711x_clksrc_init(clock, base);
        case CLPS711X_CLKSRC_CLOCKEVENT:
 -              BUG_ON(_clps711x_clkevt_init(clock, base, irq));
 -              break;
 +              return _clps711x_clkevt_init(clock, base, irq);
        default:
 -              break;
 +              return -EINVAL;
        }
  }
- CLOCKSOURCE_OF_DECLARE(clps711x, "cirrus,clps711x-timer", clps711x_timer_init);
+ CLOCKSOURCE_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init);
  #endif

diff --cc drivers/cpufreq/s5pv210-cpufreq.c
Simple merge

diff --cc drivers/memory/omap-gpmc.c
Simple merge

diff --cc drivers/power/reset/Kconfig
Simple merge

diff --cc drivers/power/reset/Makefile
Simple merge

diff --cc drivers/soc/samsung/pm_domains.c
index 0e075d96ccd4872e144cc3af0710d380b01f8dda,f60515eefb660378e02d01e2f304785acccdbf94..4822346aadc6c8766e3d9cee67b57afea74f76d0
--- 1/arch/arm/mach-exynos/pm_domains.c
--- 2/drivers/soc/samsung/pm_domains.c
+++ b/drivers/soc/samsung/pm_domains.c
@@@ -69,13 -74,13 +74,13 @@@ static int exynos_pd_power(struct gener
                }
        }
  
-       pwr = power_on ? INT_LOCAL_PWR_EN : 0;
+       pwr = power_on ? pd->local_pwr_cfg : 0;
 -      __raw_writel(pwr, base);
 +      writel_relaxed(pwr, base);
  
        /* Wait max 1ms */
        timeout = 10;
  
-       while ((readl_relaxed(base + 0x4) & INT_LOCAL_PWR_EN) != pwr) {
 -      while ((__raw_readl(base + 0x4) & pd->local_pwr_cfg) != pwr) {
++      while ((readl_relaxed(base + 0x4) & pd->local_pwr_cfg) != pwr) {
                if (!timeout) {
                        op = (power_on) ? "enable" : "disable";
                        pr_err("Power domain %s %s failed\n", domain->name, op);
@@@ -185,7 -207,7 +207,7 @@@ static __init int exynos4_pm_init_power
                        clk_put(pd->oscclk);
  
  no_clk:
-               on = readl_relaxed(pd->base + 0x4) & INT_LOCAL_PWR_EN;
 -              on = __raw_readl(pd->base + 0x4) & pd->local_pwr_cfg;
++              on = readl_relaxed(pd->base + 0x4) & pd->local_pwr_cfg;
  
                pm_genpd_init(&pd->pd, NULL, !on);
                of_genpd_add_provider_simple(np, &pd->pd);