From patchwork Mon Jul 31 04:51:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 108965 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1852218qge; Sun, 30 Jul 2017 21:52:29 -0700 (PDT) X-Received: by 10.84.229.68 with SMTP id d4mr15457640pln.89.1501476749789; Sun, 30 Jul 2017 21:52:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501476749; cv=none; d=google.com; s=arc-20160816; b=dgHSDyOqmkU+BOrOvammWuaAgwryVyW0HvIE0uPJX05iC7BMrj1aKSYrACiK/6aTD+ Ix0fpQ/pKljleSMS76OaYhaBm4pOImfRq0OjsJ6I0q2TG7FN53t2H5YukukcBJI1EBhS XC2ziiN33hex1Ms3XKBvbXSxSOMpuaOz2mlwCazCHVbz4Eo54OwQU22CT8TZFGR4fGtV GD+QmjBVCxJuLkTgaj9r5MtGOI7mf+ftoHkavAIv5PuUIaqT7tTJrcva85hrQ2egoyUB IUEwxdJQRzge6isbTBxPkE8fA/OALcAqDW42qTg5SmTKc1twESIISsMJPQYPZqyntHc1 yMOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=vL/xb5nMBtny6VO4mxSbCQaF3jN5CtMCE5KpDilZK2U=; b=M/iWisee0FNPS/GZp7vjK76rM+hGJtYA2VBjzdKtSheUrc7pCQPFybsd8LUCLWQxU0 XWHL4KKd9OdoiAYPPcd31RSnBUQL34W3vMU8Fwqg7JdD+CEmrKm4OdYxgJQRvIOM82nE GOMCycgvCHwiVDAXgOkG/9psg7Ps8bXOyLnC9BaXkunUwWB+jYg1TZBxUxpleo/W4XUx kmatY3YyJFZJ1MiCbPwYV7zORG+s2GlamP/h6L6+BT4mOkFiVbTzUhihBpFhSrW98MLQ MGM1eQlPmPkzJwbXZdV6KBD6RqKBiQ/CKP6NYJ6GAZIAMjMjbAOpEF2O2FWux5gScX6Z xBSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.b=YvTVdo7o; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s10si16509148plj.788.2017.07.30.21.52.29; Sun, 30 Jul 2017 21:52:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.b=YvTVdo7o; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751106AbdGaEwM (ORCPT + 26 others); Mon, 31 Jul 2017 00:52:12 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:54895 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750748AbdGaEwL (ORCPT ); Mon, 31 Jul 2017 00:52:11 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v6V4pDwB031504; Mon, 31 Jul 2017 13:51:14 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v6V4pDwB031504 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1501476674; bh=vL/xb5nMBtny6VO4mxSbCQaF3jN5CtMCE5KpDilZK2U=; h=From:To:Cc:Subject:Date:From; b=YvTVdo7o6uYOsafLU2F8GQ14+WUHBoUwscfG0G031M7wZ1Lp4oqYYay3zMfyCEiHM Gt39qnUfBu+ClugNiJ3igP7MyBXJjc9ATipIzx25pnZJwaWoTUiESAGQlQXbmHroSM SH7Q1mHQAZHpeA/XIbvnIWGcBLYtM0M3ll6bK1ZqvuDKOGtMBGpBWDIqUWv8TCu4IN ZMvXfxv0cBoVQFpa7t2qY65Cyg/QDApaDw2PyK4v4THSH25Ad5Vb6rhbm80KtE3bcd ro0hHsG0DKgdmma+GvSNInc2UEQqj6vU0tM5RppTFEUniQkhCa0ehZO667yOAeHZNB 4UAeakqt1ULcg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-i2c@vger.kernel.org Cc: Masami Hiramatsu , Jassi Brar , Masahiro Yamada , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Wolfram Sang Subject: [PATCH 1/2] i2c: uniphier: add PM suspend / resume support Date: Mon, 31 Jul 2017 13:51:07 +0900 Message-Id: <1501476668-18432-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When resuming, set up registers that have been lost in the sleep state. Also, add clock handling in the resume / suspend hooks. Signed-off-by: Masahiro Yamada --- drivers/i2c/busses/i2c-uniphier.c | 40 ++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c index 777c0fe93653..f41a09d9927a 100644 --- a/drivers/i2c/busses/i2c-uniphier.c +++ b/drivers/i2c/busses/i2c-uniphier.c @@ -53,6 +53,7 @@ struct uniphier_i2c_priv { void __iomem *membase; struct clk *clk; unsigned int busy_cnt; + unsigned int clk_cycle; }; static irqreturn_t uniphier_i2c_interrupt(int irq, void *dev_id) @@ -316,13 +317,13 @@ static struct i2c_bus_recovery_info uniphier_i2c_bus_recovery_info = { .unprepare_recovery = uniphier_i2c_unprepare_recovery, }; -static void uniphier_i2c_hw_init(struct uniphier_i2c_priv *priv, - u32 bus_speed, unsigned long clk_rate) +static void uniphier_i2c_hw_init(struct uniphier_i2c_priv *priv) { + unsigned int cyc = priv->clk_cycle; + uniphier_i2c_reset(priv, true); - writel((clk_rate / bus_speed / 2 << 16) | (clk_rate / bus_speed), - priv->membase + UNIPHIER_I2C_CLK); + writel((cyc / 2 << 16) | cyc, priv->membase + UNIPHIER_I2C_CLK); uniphier_i2c_reset(priv, false); } @@ -376,6 +377,7 @@ static int uniphier_i2c_probe(struct platform_device *pdev) goto disable_clk; } + priv->clk_cycle = clk_rate / bus_speed; init_completion(&priv->comp); priv->adap.owner = THIS_MODULE; priv->adap.algo = &uniphier_i2c_algo; @@ -386,7 +388,7 @@ static int uniphier_i2c_probe(struct platform_device *pdev) i2c_set_adapdata(&priv->adap, priv); platform_set_drvdata(pdev, priv); - uniphier_i2c_hw_init(priv, bus_speed, clk_rate); + uniphier_i2c_hw_init(priv); ret = devm_request_irq(dev, irq, uniphier_i2c_interrupt, 0, pdev->name, priv); @@ -413,6 +415,33 @@ static int uniphier_i2c_remove(struct platform_device *pdev) return 0; } +static int uniphier_i2c_suspend(struct device *dev) +{ + struct uniphier_i2c_priv *priv = dev_get_drvdata(dev); + + clk_disable_unprepare(priv->clk); + + return 0; +} + +static int uniphier_i2c_resume(struct device *dev) +{ + struct uniphier_i2c_priv *priv = dev_get_drvdata(dev); + int ret; + + ret = clk_prepare_enable(priv->clk); + if (ret) + return ret; + + uniphier_i2c_hw_init(priv); + + return 0; +} + +static const struct dev_pm_ops uniphier_i2c_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(uniphier_i2c_suspend, uniphier_i2c_resume) +}; + static const struct of_device_id uniphier_i2c_match[] = { { .compatible = "socionext,uniphier-i2c" }, { /* sentinel */ } @@ -425,6 +454,7 @@ static struct platform_driver uniphier_i2c_drv = { .driver = { .name = "uniphier-i2c", .of_match_table = uniphier_i2c_match, + .pm = &uniphier_i2c_pm_ops, }, }; module_platform_driver(uniphier_i2c_drv);