From: Tony Lindgren <tony@atomide.com>
Date: Wed, 3 Apr 2013 17:32:47 +0000 (-0700)
Subject: Merge commit '7185684' into omap-for-v3.10/timer
X-Git-Tag: accepted/tizen/common/20141203.182822~2347^2~20^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43231b5be657fde1c4ced180d829bbd59ceef9ad;p=platform%2Fkernel%2Flinux-arm64.git

Merge commit '7185684' into omap-for-v3.10/timer

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

Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
---

43231b5be657fde1c4ced180d829bbd59ceef9ad
diff --cc arch/arm/mach-omap2/gpmc.c
index 410e1ba,c0a2c26..6de3173
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@@ -1377,20 -1171,9 +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 381be7a,b21ad596..eeea4fa
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@@ -815,22 -1157,95 +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;
++		return ERR_PTR(-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;
++		return ERR_PTR(-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/plat-omap/dmtimer.c
index a0daa2f,5679ec4..e6dbc8d
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@@ -808,9 -807,12 +807,10 @@@ static int omap_dm_timer_probe(struct p
  		return  -ENOMEM;
  	}
  
+ 	timer->fclk = ERR_PTR(-ENODEV);
 -	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->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))