omap:hwspinlocks add pm_runtime_enable

Add pm_runtime_enable to hwspinlock_probe
change pm_runtime_get to pm_runtime_get_sync

Signed-off-by: Balaji T K <[email protected]>

Author: balajitk

arch/arm/mach-omap2/hwspinlocks.c

@@ -39,6 +39,14 @@
 #define LOCK_BASE_OFFSET		0x0800
 #define LOCK_OFFSET(i)			(LOCK_BASE_OFFSET + 0x4 * (i))
 
+struct omap_device_pm_latency omap_spinlock_latency[] = {
+	{
+		.deactivate_func = omap_device_idle_hwmods,
+		.activate_func   = omap_device_enable_hwmods,
+		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+	}
+};
+
 /* Initialization function */
 int __init hwspinlocks_init(void)
 {
@@ -63,7 +71,8 @@ int __init hwspinlocks_init(void)
 	pdata->lock_base_offset = LOCK_BASE_OFFSET;
 
 	omap_device_build(pdev_name, 0, oh, pdata,
-			sizeof(struct hwspinlock_plat_info), NULL, 0, false);
+		sizeof(struct hwspinlock_plat_info), omap_spinlock_latency,
+		ARRAY_SIZE(omap_spinlock_latency), false);
 
 	return retval;
 }

arch/arm/plat-omap/hwspinlock.c

@@ -116,7 +116,7 @@ int hwspinlock_lock(struct hwspinlock *handle)
 	if (WARN_ON(in_irq()))
 		return -EPERM;
 
-	if (pm_runtime_get(&handle->pdev->dev) < 0)
+	if (pm_runtime_get_sync(&handle->pdev->dev) < 0)
 		return -ENODEV;
 
 	/* Attempt to acquire the lock by reading from it */
@@ -139,14 +139,14 @@ int hwspinlock_trylock(struct hwspinlock *handle)
 	if (WARN_ON(in_irq()))
 		return -EPERM;
 
-	if (pm_runtime_get(&handle->pdev->dev) < 0)
+	if (pm_runtime_get_sync(&handle->pdev->dev) < 0)
 		return -ENODEV;
 
 	/* Attempt to acquire the lock by reading from it */
 	retval = readl(handle->lock_reg);
 
 	if (retval == HWSPINLOCK_BUSY)
-		pm_runtime_put(&handle->pdev->dev);
+		pm_runtime_put_sync(&handle->pdev->dev);
 
 	return retval;
 }
@@ -161,7 +161,7 @@ int hwspinlock_unlock(struct hwspinlock *handle)
 	/* Release it by writing 0 to it */
 	writel(0, handle->lock_reg);
 
-	pm_runtime_put(&handle->pdev->dev);
+	pm_runtime_put_sync(&handle->pdev->dev);
 
 	return 0;
 }
@@ -288,6 +288,7 @@ static int __devinit hwspinlock_probe(struct platform_device *pdev)
 		hwspinlocks[id].lock_reg	= io_base + pdata->
 					lock_base_offset + sizeof(u32) * id;
 	}
+	pm_runtime_enable(&pdev->dev);
 
 	return 0;
 }