aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2011-07-12 12:21:03 -0700
committerColin Cross <ccross@android.com>2011-07-13 16:53:36 -0700
commit3bddebb31b924deba279ca757dd5e3ebef4c65ba (patch)
tree421dd05bcadfbf01c78dd697d4f735f60ebf29e9
parent6d9cf69c0dedac9afc93a03cb400a875a04eb44e (diff)
downloadkernel_samsung_espresso10-3bddebb31b924deba279ca757dd5e3ebef4c65ba.zip
kernel_samsung_espresso10-3bddebb31b924deba279ca757dd5e3ebef4c65ba.tar.gz
kernel_samsung_espresso10-3bddebb31b924deba279ca757dd5e3ebef4c65ba.tar.bz2
omap_hsi: HACK: Don't use runtime pm
This fixes the "ACK Timeout" hsi issues. Change-Id: I36d7e8b0bba9d4f0a626574c4a0c7c2aaa6f6a32 Signed-off-by: Benoit Goby <benoit@android.com>
-rw-r--r--drivers/omap_hsi/hsi_driver.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/omap_hsi/hsi_driver.c b/drivers/omap_hsi/hsi_driver.c
index 69c2b3d..159888e 100644
--- a/drivers/omap_hsi/hsi_driver.c
+++ b/drivers/omap_hsi/hsi_driver.c
@@ -647,7 +647,11 @@ void hsi_clocks_disable_channel(struct device *dev, u8 channel_number,
/* HSI_TODO : this can probably be changed
* to return pm_runtime_put(dev);
*/
+ /*
pm_runtime_put_sync(dev);
+ */
+ hsi_runtime_suspend(dev);
+ omap_device_idle(pd);
}
/**
@@ -685,7 +689,12 @@ int hsi_clocks_enable_channel(struct device *dev, u8 channel_number,
dev_warn(dev, "Error holding DPLL cascading constraint\n");
#endif
+ /*
return pm_runtime_get_sync(dev);
+ */
+ omap_device_enable(pd);
+ hsi_runtime_resume(dev);
+ return 0;
}
static int __init hsi_controller_init(struct hsi_dev *hsi_ctrl,