diff options
| author | Marc Dietrich <marvin24@gmx.de> | 2013-07-27 18:20:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 11:29:37 -0700 |
| commit | ca250b6017910ca6edca4cbd6eaa7452a13b5c03 (patch) | |
| tree | 70d28cd46f368af59ae1f5b6e7e42f265c27199d /drivers/staging/nvec | |
| parent | 9c02d0dbdefdb8953f6bce698bcce651a13f3a19 (diff) | |
| download | linux-ca250b6017910ca6edca4cbd6eaa7452a13b5c03.tar.bz2 | |
staging: nvec: re-enable the clock on resume
On resume the slave controller is reinitialized. The tegra i2c master
controller disables the clock at the end of the initialiation, propably
to save some power, and enables it again on each transfer. We don't
do this yet and also forgot to enable the clock on resume. Fix this
copy-paste error by not disabling the clock after initialization.
This didn't striked us yet because suspend/resume hasn't landed in mainline
yet, but will soon.
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/nvec')
| -rw-r--r-- | drivers/staging/nvec/nvec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 10393da315d7..5a5c6397e740 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -750,8 +750,6 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec) writel(0, nvec->base + I2C_SL_ADDR2); enable_irq(nvec->irq); - - clk_disable_unprepare(nvec->i2c_clk); } #ifdef CONFIG_PM_SLEEP @@ -872,9 +870,6 @@ static int tegra_nvec_probe(struct platform_device *pdev) tegra_init_i2c_slave(nvec); - clk_prepare_enable(i2c_clk); - - /* enable event reporting */ nvec_toggle_global_events(nvec, true); |