Merge tag 'omap-for-v4.2/soc-pt1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Omap hwmod changes for v4.2 via Paul Walmsley <paul@pwsan.com>:

Several OMAP2+ hwmod changes for v4.2.  One patch cleans up a nasty
interaction between the OMAP GPMC and the hwmod code when debugging is
enabled.  IP block integration data has been added for the AM43xx EMIF
RAM controller.  There's also a fix for the omap-aes driver when used in
QEMU.  And finally, some changes to the OMAP3 hwmod code to support the
use of the security IP blocks (AES and SHA) on GP devices, or when they've
specifically been enabled in the DT data.

Basic build, boot, and power management test results are here:

http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.2/20150601192349/

* tag 'omap-for-v4.2/soc-pt1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3: Fix crypto support for HS devices
  ARM: OMAP2+: Return correct error values from device and hwmod
  ARM: OMAP: AM43xx hwmod: Add data for am43xx emif hwmod
  memory: omap-gpmc: Add Kconfig option for debug

1 files changed, 17 insertions, 13 deletions

diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index 166b18f515a2..4a7303cf563e 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -224,13 +224,13 @@ static int _omap_device_notifier_call(struct notifier_block *nb,
  */
 static int _omap_device_enable_hwmods(struct omap_device *od)
 {
+        int ret = 0;
         int i;
 
         for (i = 0; i < od->hwmods_cnt; i++)
-                omap_hwmod_enable(od->hwmods[i]);
+                ret |= omap_hwmod_enable(od->hwmods[i]);
 
-        /* XXX pass along return value here? */
-        return 0;
+        return ret;
 }
 
 /**
@@ -241,13 +241,13 @@ static int _omap_device_enable_hwmods(struct omap_device *od)
  */
 static int _omap_device_idle_hwmods(struct omap_device *od)
 {
+        int ret = 0;
         int i;
 
         for (i = 0; i < od->hwmods_cnt; i++)
-                omap_hwmod_idle(od->hwmods[i]);
+                ret |= omap_hwmod_idle(od->hwmods[i]);
 
-        /* XXX pass along return value here? */
-        return 0;
+        return ret;
 }
 
 /* Public functions for use by core code */
@@ -595,18 +595,20 @@ static int _od_runtime_suspend(struct device *dev)
         int ret;
 
         ret = pm_generic_runtime_suspend(dev);
+        if (ret)
+                return ret;
 
-        if (!ret)
-                omap_device_idle(pdev);
-
-        return ret;
+        return omap_device_idle(pdev);
 }
 
 static int _od_runtime_resume(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
+        int ret;
 
-        omap_device_enable(pdev);
+        ret = omap_device_enable(pdev);
+        if (ret)
+                return ret;
 
         return pm_generic_runtime_resume(dev);
 }
@@ -743,7 +745,8 @@ int omap_device_enable(struct platform_device *pdev)
 
         ret = _omap_device_enable_hwmods(od);
 
-        od->_state = OMAP_DEVICE_STATE_ENABLED;
+        if (ret == 0)
+                od->_state = OMAP_DEVICE_STATE_ENABLED;
 
         return ret;
 }
@@ -773,7 +776,8 @@ int omap_device_idle(struct platform_device *pdev)
 
         ret = _omap_device_idle_hwmods(od);
 
-        od->_state = OMAP_DEVICE_STATE_IDLE;
+        if (ret == 0)
+                od->_state = OMAP_DEVICE_STATE_IDLE;
 
         return ret;
 }