From a86707999392f5102d89cb9951a48ae1e7a95bce Mon Sep 17 00:00:00 2001 From: Marc Dietrich Date: Tue, 27 Sep 2011 19:00:42 +0200 Subject: [PATCH] --- yaml --- r: 268559 b: refs/heads/master c: ac8107599e47b0f4638f4f3fb0141bbcf0cb142b h: refs/heads/master i: 268557: c3a2c91daf311be31a23bd8e3938e57c20e62c64 268555: 39203b7b5052e2969d784e8e6f9eb2623fe04fb4 268551: 6a6a23595a3d12c160ccd75fa66c9ebfadcc4456 268543: 2a4319eee174bafde04f75dae17b66185a53f52c v: v3 --- [refs] | 2 +- trunk/drivers/staging/nvec/nvec.c | 29 +++++++++++++++++++++-------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 426c9a5f3873..529f2dcfd94c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3a9aa1a41429b17aa1af20995850ea1b68d5ba2 +refs/heads/master: ac8107599e47b0f4638f4f3fb0141bbcf0cb142b diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c index d43fba25c22d..6c6e39447a5f 100644 --- a/trunk/drivers/staging/nvec/nvec.c +++ b/trunk/drivers/staging/nvec/nvec.c @@ -282,15 +282,27 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec) udelay(2); tegra_periph_reset_deassert(nvec->i2c_clk); - writel(nvec->i2c_addr>>1, nvec->base + I2C_SL_ADDR1); - writel(0, nvec->base + I2C_SL_ADDR2); - - writel(0x1E, nvec->base + I2C_SL_DELAY_COUNT); val = I2C_CNFG_NEW_MASTER_SFM | I2C_CNFG_PACKET_MODE_EN | - (0x2 << I2C_CNFG_DEBOUNCE_CNT_SHIFT); + (0x2 << I2C_CNFG_DEBOUNCE_CNT_SHIFT); writel(val, nvec->base + I2C_CNFG); + + clk_set_rate(nvec->i2c_clk, 8 * 80000); + writel(I2C_SL_NEWL, nvec->base + I2C_SL_CNFG); + writel(0x1E, nvec->base + I2C_SL_DELAY_COUNT); + + writel(nvec->i2c_addr>>1, nvec->base + I2C_SL_ADDR1); + writel(0, nvec->base + I2C_SL_ADDR2); + enable_irq(nvec->irq); + + clk_disable(nvec->i2c_clk); +} + +static void nvec_disable_i2c_slave(struct nvec_chip *nvec) +{ + disable_irq(nvec->irq); + writel(I2C_SL_NEWL | I2C_SL_NACK, nvec->base + I2C_SL_CNFG); clk_disable(nvec->i2c_clk); } @@ -352,9 +364,6 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev) goto err_iounmap; } - clk_enable(i2c_clk); - clk_set_rate(i2c_clk, 8*80000); - nvec->base = base; nvec->irq = res->start; nvec->i2c_clk = i2c_clk; @@ -378,9 +387,12 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev) dev_err(nvec->dev, "couldn't request irq\n"); goto failed; } + disable_irq(nvec->irq); tegra_init_i2c_slave(nvec); + clk_enable(i2c_clk); + gpio_direction_output(nvec->gpio, 1); gpio_set_value(nvec->gpio, 1); @@ -450,6 +462,7 @@ static int tegra_nvec_suspend(struct platform_device *pdev, pm_message_t state) dev_dbg(nvec->dev, "suspending\n"); nvec_write_async(nvec, EC_DISABLE_EVENT_REPORTING, 3); nvec_write_async(nvec, "\x04\x02", 2); + nvec_disable_i2c_slave(nvec); return 0; }