Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp

Conflicts:
	arch/arm/plat-omap/dmtimer.c

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_cp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/gpmc-onenand.c
Simple merge

diff --cc arch/arm/mach-omap2/gpmc.c
index c0a2c26ed5a4ad3453b83e68c85c62acc6d452c9,410e1bac781531e35fb4aa3b58b77a9a2a01111d..6de31739b45c474c63e68acec36171a05bbe0c8b
--- 1/arch/arm/mach-omap2/gpmc.c
--- 2/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@@ -1171,9 -1377,20 +1377,20 @@@ static int gpmc_probe(struct platform_d
                return rc;
        }
  
 -      if (IS_ERR_VALUE(gpmc_setup_irq()))
 +      if (gpmc_setup_irq() < 0)
                dev_warn(gpmc_dev, "gpmc_setup_irq failed\n");
  
+       /* Now the GPMC is initialised, unreserve the chip-selects */
+       gpmc_cs_map = 0;
+ 
+       rc = gpmc_probe_dt(pdev);
+       if (rc < 0) {
+               clk_disable_unprepare(gpmc_l3_clk);
+               clk_put(gpmc_l3_clk);
+               dev_err(gpmc_dev, "failed to probe DT parameters\n");
+               return rc;
+       }
+ 
        return 0;
  }
  

diff --cc arch/arm/mach-omap2/omap_device.c
index b21ad59604d1080c668bb85986bd357fb5c72b44,381be7ac0c17923d8330ad6bfc983347c1695417..2448c7a273d2ce60bf46a47af4138b0e0086e34f
--- 1/arch/arm/mach-omap2/omap_device.c
--- 2/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@@ -1157,95 -815,22 +815,19 @@@ struct device *omap_device_get_by_hwmod
        }
  
        oh = omap_hwmod_lookup(oh_name);
 -      if (IS_ERR_OR_NULL(oh)) {
 +      if (!oh) {
                WARN(1, "%s: no hwmod for %s\n", __func__,
                        oh_name);
 -              return ERR_PTR(oh ? PTR_ERR(oh) : -ENODEV);
 +              return -ENODEV;
        }
 -      if (IS_ERR_OR_NULL(oh->od)) {
 +      if (!oh->od) {
                WARN(1, "%s: no omap_device for %s\n", __func__,
                        oh_name);
 -              return ERR_PTR(oh->od ? PTR_ERR(oh->od) : -ENODEV);
 +              return -ENODEV;
        }
  
 -      if (IS_ERR_OR_NULL(oh->od->pdev))
 -              return ERR_PTR(oh->od->pdev ? PTR_ERR(oh->od->pdev) : -ENODEV);
 -
        return &oh->od->pdev->dev;
  }
- EXPORT_SYMBOL(omap_device_get_by_hwmod_name);
- 
- /*
-  * Public functions intended for use in omap_device_pm_latency
-  * .activate_func and .deactivate_func function pointers
-  */
- 
- /**
-  * omap_device_enable_hwmods - call omap_hwmod_enable() on all hwmods
-  * @od: struct omap_device *od
-  *
-  * Enable all underlying hwmods.  Returns 0.
-  */
- int omap_device_enable_hwmods(struct omap_device *od)
- {
-       int i;
- 
-       for (i = 0; i < od->hwmods_cnt; i++)
-               omap_hwmod_enable(od->hwmods[i]);
- 
-       /* XXX pass along return value here? */
-       return 0;
- }
- 
- /**
-  * omap_device_idle_hwmods - call omap_hwmod_idle() on all hwmods
-  * @od: struct omap_device *od
-  *
-  * Idle all underlying hwmods.  Returns 0.
-  */
- int omap_device_idle_hwmods(struct omap_device *od)
- {
-       int i;
- 
-       for (i = 0; i < od->hwmods_cnt; i++)
-               omap_hwmod_idle(od->hwmods[i]);
- 
-       /* XXX pass along return value here? */
-       return 0;
- }
- 
- /**
-  * omap_device_disable_clocks - disable all main and interface clocks
-  * @od: struct omap_device *od
-  *
-  * Disable the main functional clock and interface clock for all of the
-  * omap_hwmods associated with the omap_device.  Returns 0.
-  */
- int omap_device_disable_clocks(struct omap_device *od)
- {
-       int i;
- 
-       for (i = 0; i < od->hwmods_cnt; i++)
-               omap_hwmod_disable_clocks(od->hwmods[i]);
- 
-       /* XXX pass along return value here? */
-       return 0;
- }
- 
- /**
-  * omap_device_enable_clocks - enable all main and interface clocks
-  * @od: struct omap_device *od
-  *
-  * Enable the main functional clock and interface clock for all of the
-  * omap_hwmods associated with the omap_device.  Returns 0.
-  */
- int omap_device_enable_clocks(struct omap_device *od)
- {
-       int i;
- 
-       for (i = 0; i < od->hwmods_cnt; i++)
-               omap_hwmod_enable_clocks(od->hwmods[i]);
- 
-       /* XXX pass along return value here? */
-       return 0;
- }
  
  static struct notifier_block platform_nb = {
        .notifier_call = _omap_device_notifier_call,

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

diff --cc arch/arm/mach-omap2/pm-debug.c
Simple merge

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

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

diff --cc arch/arm/mach-tegra/tegra2_emc.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu.c
Simple merge

diff --cc arch/arm/plat-omap/dmtimer.c
index 5679ec41928b34d78d9d63d42b18bfeecbe5df99,a0daa2fb5de667d4410a87e81fb53cba254dc664..e6dbc8dbe6a68457acf5515a238551f61fc65e78
--- 1/arch/arm/plat-omap/dmtimer.c
--- 2/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@@ -807,12 -808,9 +807,10 @@@ static int omap_dm_timer_probe(struct p
                return  -ENOMEM;
        }
  
-       timer->io_base = devm_request_and_ioremap(dev, mem);
-       if (!timer->io_base) {
-               dev_err(dev, "%s: region already claimed.\n", __func__);
-               return -ENOMEM;
-       }
 +      timer->fclk = ERR_PTR(-ENODEV);
+       timer->io_base = devm_ioremap_resource(dev, mem);
+       if (IS_ERR(timer->io_base))
+               return PTR_ERR(timer->io_base);
  
        if (dev->of_node) {
                if (of_find_property(dev->of_node, "ti,timer-alwon", NULL))