From patchwork Tue Jun 24 23:54:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4414921 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DBE06BEEAA for ; Tue, 24 Jun 2014 23:59:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 193342035D for ; Tue, 24 Jun 2014 23:59:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B94F202E9 for ; Tue, 24 Jun 2014 23:59:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WzaYe-0004fg-Ux; Tue, 24 Jun 2014 23:55:24 +0000 Received: from mail-ie0-f202.google.com ([209.85.223.202]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WzaYc-0003b3-63 for linux-arm-kernel@lists.infradead.org; Tue, 24 Jun 2014 23:55:22 +0000 Received: by mail-ie0-f202.google.com with SMTP id tr6so275002ieb.1 for ; Tue, 24 Jun 2014 16:55:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EMEtQeIXaMOdxCpVbBGCVajAPZi0pWZxXg9b38Clu2A=; b=lOyTNaJxY1QdCIijD06HoKkhZ8xgsbKl4Q+kz0DqJELJ6rg87SeQGA/FO5qhcJum12 rAsSokwdegI32ly7eymtKXZLPQWwiWfX5uu0Q57ubVeUInqyWkBtBa/sgIo877DVsr8z yk86wrxrYFFJ5DeM3+2ZZoUlVcOUNm/oDbB74jMIsUCQViJxUV3btnb3JdKw19GiJ/JS 47sNqYNKMIU3YadomG8BcX+d6XuhQ7ECPuH9y6VvJex8ct20ly/dGlYqmQbt36ijT9f9 NifgWn5NJsyQ+tr6OjP709rS1+YOr7siAdYMmcrKtDFDYVcgeD0Y/KsJhLQmcQu0LsKB G2RA== X-Gm-Message-State: ALoCoQnbZttqHQJcwPUhfUC8krmGWvloKYX36+89VvlTjCZ5xtzhWNMc3W7fMXF3WEfCH8YiITbw X-Received: by 10.50.73.35 with SMTP id i3mr2758902igv.2.1403654097975; Tue, 24 Jun 2014 16:54:57 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id y50si164412yhk.4.2014.06.24.16.54.57 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jun 2014 16:54:57 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.72.141]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id C83AA31C832; Tue, 24 Jun 2014 16:54:57 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 675C380914; Tue, 24 Jun 2014 16:54:57 -0700 (PDT) From: Doug Anderson To: Wolfram Sang , Kukjin Kim Subject: [PATCH v2] i2c: exynos5: Properly use the "noirq" variants of suspend/resume Date: Tue, 24 Jun 2014 16:54:52 -0700 Message-Id: <1403654093-24134-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140624_165522_270420_04B56F91 X-CRM114-Status: GOOD ( 13.12 ) X-Spam-Score: -0.7 (/) Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, sjg@google.com, linux-kernel@vger.kernel.org, jg1.han@samsung.com, Doug Anderson , Tomasz Figa , standby24x7@gmail.com, paul.gortmaker@windriver.com, linux-i2c@vger.kernel.org, ch.naveen@samsung.com, javier.martinez@collabora.co.uk, jdelvare@suse.de, sachin.kamat@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The original code for the exynos i2c controller registered for the "noirq" variants. However during review feedback it was moved to SIMPLE_DEV_PM_OPS without anyone noticing that it meant we were no longer actually "noirq" (despite functions named exynos5_i2c_suspend_noirq and exynos5_i2c_resume_noirq). i2c controllers that might have wakeup sources on them seem to need to resume at noirq time so that the individual drivers can actually read the i2c bus to handle their wakeup. NOTE: I took the original review feedback from Wolfram and added poweroff, thaw, freeze, restore. This patch has only been compile-tested since I don't have all the patches needed to make my machine using this i2c driver actually suspend/resume. Signed-off-by: Doug Anderson Acked-by: Kukjin Kim --- Changes in v2: - Added missing CONFIG_PM_SLEEP drivers/i2c/busses/i2c-exynos5.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index 63d2292..348b1cd 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -789,8 +789,16 @@ static int exynos5_i2c_resume_noirq(struct device *dev) } #endif -static SIMPLE_DEV_PM_OPS(exynos5_i2c_dev_pm_ops, exynos5_i2c_suspend_noirq, - exynos5_i2c_resume_noirq); +const struct dev_pm_ops exynos5_i2c_dev_pm_ops = { +#ifdef CONFIG_PM_SLEEP + .suspend_noirq = exynos5_i2c_suspend_noirq, + .resume_noirq = exynos5_i2c_resume_noirq, + .freeze_noirq = exynos5_i2c_suspend_noirq, + .thaw_noirq = exynos5_i2c_resume_noirq, + .poweroff_noirq = exynos5_i2c_suspend_noirq, + .restore_noirq = exynos5_i2c_resume_noirq, +#endif +}; static struct platform_driver exynos5_i2c_driver = { .probe = exynos5_i2c_probe,