From patchwork Wed Oct 10 11:02:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12092 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5DFE5293F82 for ; Wed, 10 Oct 2012 11:02:57 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id E78A6A1904A for ; Wed, 10 Oct 2012 11:02:56 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so251084iag.11 for ; Wed, 10 Oct 2012 04:02:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=JZoEXSa83LzQ8dLFeolEOM1aodlFsLwF4D+XUxrHCx4=; b=Ze2Qh2C3BN8HiDxu7s0zYfrlqj0JcdxZpSVR4D+L8oPj2gRk9zH5/Q3tQMdQuAsmII lxRd1sIP0Lk1u15mKIvFxZp/79sPff1XRjw2bHzUf6wexV1TnUIEVnCZk1vb/PwtTAJ4 cFk0u9sUlzgBehif8hrNKaajLB/nX6eCcnhaTLvfyuo1WQ+4UYadub2OSzWQmnuUOtdv sQXDI+P5OazkoWWd/TPvJ/s11dk+Ssy1wS8CDINB6ze/8aYl8BhX3i8hSDsluCPMMxam vBKTt0Q4ajT8zq3dVhdRfrjXUIHzlueKOk9us3dTbG0xtrYnk/wsBuLor7iIykR1n/T5 sheQ== Received: by 10.50.77.138 with SMTP id s10mr4756982igw.70.1349866976273; Wed, 10 Oct 2012 04:02:56 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp205035igt; Wed, 10 Oct 2012 04:02:55 -0700 (PDT) Received: by 10.14.211.193 with SMTP id w41mr6038528eeo.32.1349866974501; Wed, 10 Oct 2012 04:02:54 -0700 (PDT) Received: from eu1sys200aog113.obsmtp.com (eu1sys200aog113.obsmtp.com [207.126.144.135]) by mx.google.com with SMTP id j5si83436eeo.122.2012.10.10.04.02.49 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 04:02:54 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.135; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob113.postini.com ([207.126.147.11]) with SMTP ID DSNKUHVV13IBwo6l1ebMEDj6o9/V8UgIi9I7@postini.com; Wed, 10 Oct 2012 11:02:53 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 3713A97; Wed, 10 Oct 2012 10:54:29 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 6F68C11C0; Wed, 10 Oct 2012 11:02:42 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 1699EA8093; Wed, 10 Oct 2012 13:02:37 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 10 Oct 2012 13:02:41 +0200 From: Linus Walleij To: Ben Dooks , Wolfram Sang , Cc: Anmar Oueja , Patrice Chotard , Linus Walleij Subject: [PATCH 2/2 v3] i2c: nomadik: adopt pinctrl support Date: Wed, 10 Oct 2012 13:02:39 +0200 Message-ID: <1349866959-10686-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQn4bIauRsXDq2K2U+sPq+Eyt8qMa2mvL8VQZ0RoTDPKnTVIaInhaC7OnfrgrMoL81WYZHOr From: Patrice Chotard Amend the I2C nomadik pin controller to optionally take a pin control handle and set the state of the pins to: - "default" on boot, resume and before performing an i2c transfer - "idle" after initial default, after resume default, and after each i2c xfer - "sleep" on suspend() This should make it possible to optimize energy usage for the pins both for the suspend/resume cycle, and for runtime cases inbetween I2C transfers. Signed-off-by: Patrice Chotard Signed-off-by: Linus Walleij --- ChangeLog v2->v3: - Rebase on top of the patch from Philippe/Ulf. ChangeLog v1->v2: - We used only two states initially: default and sleep. It turns out you can save some energy when idling (between transfers) and even more when suspending on our platform, so grab all three states and use them as applicable. --- drivers/i2c/busses/i2c-nomadik.c | 101 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 3eeae52..d50b16a 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -24,6 +24,7 @@ #include #include #include +#include #define DRIVER_NAME "nmk-i2c" @@ -145,6 +146,10 @@ struct i2c_nmk_client { * @stop: stop condition. * @xfer_complete: acknowledge completion for a I2C message. * @result: controller propogated result. + * @pinctrl: pinctrl handle. + * @pins_default: default state for the pins. + * @pins_idle: idle state for the pins. + * @pins_sleep: sleep state for the pins. * @busy: Busy doing transfer. */ struct nmk_i2c_dev { @@ -158,6 +163,11 @@ struct nmk_i2c_dev { int stop; struct completion xfer_complete; int result; + /* Three pin states - default, idle & sleep */ + struct pinctrl *pinctrl; + struct pinctrl_state *pins_default; + struct pinctrl_state *pins_idle; + struct pinctrl_state *pins_sleep; bool busy; }; @@ -648,6 +658,15 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, goto out_clk; } + /* Optionaly enable pins to be muxed in and configured */ + if (!IS_ERR(dev->pins_default)) { + status = pinctrl_select_state(dev->pinctrl, + dev->pins_default); + if (status) + dev_err(&dev->adev->dev, + "could not set default pins\n"); + } + status = init_hw(dev); if (status) goto out; @@ -675,6 +694,15 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, out: clk_disable_unprepare(dev->clk); out_clk: + /* Optionally let pins go into idle state */ + if (!IS_ERR(dev->pins_idle)) { + status = pinctrl_select_state(dev->pinctrl, + dev->pins_idle); + if (status) + dev_err(&dev->adev->dev, + "could not set pins to idle state\n"); + } + pm_runtime_put_sync(&dev->adev->dev); dev->busy = false; @@ -869,15 +897,44 @@ static int nmk_i2c_suspend(struct device *dev) { struct amba_device *adev = to_amba_device(dev); struct nmk_i2c_dev *nmk_i2c = amba_get_drvdata(adev); + int ret; if (nmk_i2c->busy) return -EBUSY; + if (!IS_ERR(nmk_i2c->pins_sleep)) { + ret = pinctrl_select_state(nmk_i2c->pinctrl, + nmk_i2c->pins_sleep); + if (ret) + dev_err(dev, + "could not set pins to sleep state\n"); + } + return 0; } static int nmk_i2c_resume(struct device *dev) { + struct amba_device *adev = to_amba_device(dev); + struct nmk_i2c_dev *nmk_i2c = amba_get_drvdata(adev); + int ret; + + /* First go to the default state */ + if (!IS_ERR(nmk_i2c->pins_default)) { + ret = pinctrl_select_state(nmk_i2c->pinctrl, + nmk_i2c->pins_default); + if (ret) + dev_err(dev, + "could not set pins to default state\n"); + } + /* Then let's idle the pins until the next transfer happens */ + if (!IS_ERR(nmk_i2c->pins_idle)) { + ret = pinctrl_select_state(nmk_i2c->pinctrl, + nmk_i2c->pins_idle); + if (ret) + dev_err(dev, + "could not set pins to idle state\n"); + } return 0; } #else @@ -941,6 +998,40 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) dev->adev = adev; amba_set_drvdata(adev, dev); + dev->pinctrl = devm_pinctrl_get(&adev->dev); + if (IS_ERR(dev->pinctrl)) { + ret = PTR_ERR(dev->pinctrl); + goto err_pinctrl; + } + + dev->pins_default = pinctrl_lookup_state(dev->pinctrl, + PINCTRL_STATE_DEFAULT); + if (IS_ERR(dev->pins_default)) + dev_err(&adev->dev, "could not get default pinstate\n"); + else { + ret = pinctrl_select_state(dev->pinctrl, + dev->pins_default); + if (ret) + dev_dbg(&adev->dev, "could not set default pinstate\n"); + } + + dev->pins_idle = pinctrl_lookup_state(dev->pinctrl, + PINCTRL_STATE_IDLE); + if (IS_ERR(dev->pins_idle)) + dev_dbg(&adev->dev, "could not get idle pinstate\n"); + else { + /* If possible, let's go to idle until the first transfer */ + ret = pinctrl_select_state(dev->pinctrl, + dev->pins_idle); + if (ret) + dev_dbg(&adev->dev, "could not set idle pinstate\n"); + } + + dev->pins_sleep = pinctrl_lookup_state(dev->pinctrl, + PINCTRL_STATE_SLEEP); + if (IS_ERR(dev->pins_sleep)) + dev_dbg(&adev->dev, "could not get sleep pinstate\n"); + dev->virtbase = ioremap(adev->res.start, resource_size(&adev->res)); if (!dev->virtbase) { ret = -ENOMEM; @@ -964,6 +1055,12 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) goto err_no_clk; } + ret = clk_prepare(dev->clk); + if (ret) { + dev_err(&adev->dev, "can't prepare clock\n"); + goto err_prep_clk; + } + adap = &dev->adap; adap->dev.parent = &adev->dev; adap->owner = THIS_MODULE; @@ -999,6 +1096,8 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) return 0; err_add_adap: + clk_unprepare(dev->clk); + err_prep_clk: clk_put(dev->clk); err_no_clk: free_irq(dev->irq, dev); @@ -1007,6 +1106,7 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) err_no_ioremap: amba_set_drvdata(adev, NULL); kfree(dev); + err_pinctrl: err_no_mem: return ret; @@ -1027,6 +1127,7 @@ static int nmk_i2c_remove(struct amba_device *adev) iounmap(dev->virtbase); if (res) release_mem_region(res->start, resource_size(res)); + clk_unprepare(dev->clk); clk_put(dev->clk); pm_runtime_disable(&adev->dev); amba_set_drvdata(adev, NULL);