diff options
| author | Ziyann <jaraidaniel@gmail.com> | 2014-07-11 12:39:11 +0200 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:12:50 +0100 |
| commit | ba8528cc16500866abf42f3c7384053f1c9f7c5d (patch) | |
| tree | bf2aa512408d91dad6cfec03574628e880328380 | |
| parent | c93d3931edb2ece1f7cc05146b996d1614aef86f (diff) | |
| download | kernel_samsung_tuna-ba8528cc16500866abf42f3c7384053f1c9f7c5d.zip kernel_samsung_tuna-ba8528cc16500866abf42f3c7384053f1c9f7c5d.tar.gz kernel_samsung_tuna-ba8528cc16500866abf42f3c7384053f1c9f7c5d.tar.bz2 | |
Revert "Fix HSI more properly"
This reverts commit 96bf283ca65b4c9e7497ce145add438e3776c954.
| -rwxr-xr-x | drivers/omap_hsi/hsi_driver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/omap_hsi/hsi_driver.c b/drivers/omap_hsi/hsi_driver.c index 4d5758c4..a216c99 100755 --- a/drivers/omap_hsi/hsi_driver.c +++ b/drivers/omap_hsi/hsi_driver.c @@ -75,8 +75,6 @@ void hsi_hsr_suspend(struct hsi_dev *hsi_ctrl) hsi_ctrl->clock_enabled = false; } -#define HSI_HSR_MODE_FRAME 0x2 -#define HSI_PORT1 0x1 void hsi_hsr_resume(struct hsi_dev *hsi_ctrl) { struct hsi_platform_data *pdata = hsi_ctrl->dev->platform_data; @@ -92,13 +90,6 @@ void hsi_hsr_resume(struct hsi_dev *hsi_ctrl) p = &pdata->ctx->pctx[port - 1]; hsi_outl(p->hsr.mode, base, HSI_HSR_MODE_REG(port)); } - - /* Restore HSR_MODE register value */ - /* WARNING: works only in this configuration: */ - /* - Flow = Synchronized */ - /* - Mode = frame */ - hsi_outl(HSI_HSR_MODE_FRAME, hsi_ctrl->base, - HSI_HSR_MODE_REG(HSI_PORT1)); } void hsi_save_ctx(struct hsi_dev *hsi_ctrl) @@ -1087,6 +1078,8 @@ static int hsi_pm_resume(struct device *dev) * * */ +#define HSI_HSR_MODE_FRAME 0x2 +#define HSI_PORT1 0x1 int hsi_runtime_resume(struct device *dev) { struct hsi_platform_data *pdata = dev_get_platdata(dev); @@ -1107,6 +1100,13 @@ int hsi_runtime_resume(struct device *dev) /* Allow data reception */ hsi_hsr_resume(hsi_ctrl); + /* Restore HSR_MODE register value */ + /* WARNING: works only in this configuration: */ + /* - Flow = Synchronized */ + /* - Mode = frame */ + hsi_outl(HSI_HSR_MODE_FRAME, hsi_ctrl->base, + HSI_HSR_MODE_REG(HSI_PORT1)); + /* When HSI is ON, no need for IO wakeup mechanism on any HSI port */ for (i = 0; i < hsi_ctrl->max_p; i++) pdata->wakeup_disable(hsi_ctrl->hsi_port[i].port_number); |