From patchwork Tue Jul 9 17:31:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2825401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9E99F9F7D6 for ; Tue, 9 Jul 2013 17:32:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97CB7201F6 for ; Tue, 9 Jul 2013 17:32:17 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E3F1201EE for ; Tue, 9 Jul 2013 17:32:16 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uwbls-0000Pc-Vh; Tue, 09 Jul 2013 17:32:13 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uwblq-0006Ix-Nr; Tue, 09 Jul 2013 17:32:10 +0000 Received: from mail-yh0-f74.google.com ([209.85.213.74]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uwblm-0006Hd-BF for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2013 17:32:07 +0000 Received: by mail-yh0-f74.google.com with SMTP id z20so518193yhz.1 for ; Tue, 09 Jul 2013 10:31:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=JXL7xVTTBPaRArDKyIj14IbgF+rl+YkzGWAzd4CfQaQ=; b=TOlGVcqFcE4jBtKTncB1u8X+VNRqFNLJnoIfWUK/HsgkJ1q03334G979pSXQUlGIuZ oNarScAcUqDu3zzYR8kSm7ZX9cU6y0Ya25OsMh/y6o0Hzc+vz+zscNeODkTpZAb4pWgb kL5Tj/l9fSxqybz2T4ONGMeRWys0La7jIRPEuoBVoA62GLfmts1zd4JM2HXiJy0Q1Ohf sZzCJw8Zzi2j9VueqAAEahePGMrqXJQ+TM6FY95GZDt6CcnY36pwlVjNEo2gpzAQs75J 99qgMvsxsLSDAAkJNhBqQ9W0NlY+LFp5by37elZ0sWDf0AFjjw8gsgNAxtJl/CmmbVjk VYNg== X-Received: by 10.236.185.4 with SMTP id t4mr14523356yhm.21.1373391104351; Tue, 09 Jul 2013 10:31:44 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id p73si13937561yhh.5.2013.07.09.10.31.44 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 09 Jul 2013 10:31:44 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.34]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 2EC295A41DB; Tue, 9 Jul 2013 10:31:44 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id CE19B80AB4; Tue, 9 Jul 2013 10:31:43 -0700 (PDT) From: Doug Anderson To: Chris Ball Subject: [PATCH 3/5] mmc: dw_mmc: Add exynos resume callback to clear WAKEUP_INT Date: Tue, 9 Jul 2013 10:31:09 -0700 Message-Id: <1373391071-6312-4-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1373391071-6312-1-git-send-email-dianders@chromium.org> References: <1373391071-6312-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQms18m60aHTkO0Azn6j9ZY/CrbLGLSSgesBlJad5pufIZNLjnar/IrQPTl0lfzwRCKthVNQUsCuR8MWgErJibrepMg7UMksPVW3C+J1GRuBBpL2vUkV6CBl/M3H9Wv4/wvUS6PPPQvotiPEeGSyJEbFkWHU4S6RRfzewBqzMfehX3LrWv0RSCAf808mSHqCL3QXIS2Tb9j7SE11f4yhWR2HYMi/WQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130709_133206_415188_C0252BB9 X-CRM114-Status: GOOD ( 12.10 ) X-Spam-Score: -2.9 (--) Cc: Doug Anderson , linux-samsung-soc@vger.kernel.org, James Hogan , Grant Grundler , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Tomasz Figa , Abhilash Kesavan , Jaehoon Chung , Seungwon Jeon , Kukjin Kim , Alim Akhtar , Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 If the WAKEUP_INT is asserted at wakeup and not cleared, we'll end up looping around forever. Signed-off-by: Doug Anderson --- drivers/mmc/host/dw_mmc-exynos.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c index f013e7e..84d3b78 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c @@ -30,6 +30,7 @@ #define SDMMC_CLKSEL_TIMING(x, y, z) (SDMMC_CLKSEL_CCLK_SAMPLE(x) | \ SDMMC_CLKSEL_CCLK_DRIVE(y) | \ SDMMC_CLKSEL_CCLK_DIVIDER(z)) +#define SDMMC_CLKSEL_WAKEUP_INT BIT(11) #define SDMMC_CMD_USE_HOLD_REG BIT(29) @@ -102,6 +103,27 @@ static int dw_mci_exynos_setup_clock(struct dw_mci *host) return 0; } +/** + * dw_mci_exynos_resume - Exynos-specific resume code + * + * We have seen cases (at least on the exynos5420) where turning off the INT + * power rail during suspend will leave the WAKEUP_INT bit in the CLKSEL + * register asserted. This bit is 1 to indicate that it fired and we can + * clear it by writing a 1 back. Clear it to prevent interrupts from going off + * constantly. + */ + +static int dw_mci_exynos_resume(struct dw_mci *host) +{ + u32 clksel; + + clksel = mci_readl(host, CLKSEL); + if (clksel & SDMMC_CLKSEL_WAKEUP_INT) + mci_writel(host, CLKSEL, clksel); + + return 0; +} + static void dw_mci_exynos_prepare_command(struct dw_mci *host, u32 *cmdr) { /* @@ -165,6 +187,7 @@ static const struct dw_mci_drv_data exynos_drv_data = { .caps = exynos_dwmmc_caps, .init = dw_mci_exynos_priv_init, .setup_clock = dw_mci_exynos_setup_clock, + .resume = dw_mci_exynos_resume, .prepare_command = dw_mci_exynos_prepare_command, .set_ios = dw_mci_exynos_set_ios, .parse_dt = dw_mci_exynos_parse_dt,