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: 2825412 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 5E945C0AB2 for ; Tue, 9 Jul 2013 17:39:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F9092020E for ; Tue, 9 Jul 2013 17:39:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 835C62020D for ; Tue, 9 Jul 2013 17:39:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751998Ab3GIRjp (ORCPT ); Tue, 9 Jul 2013 13:39:45 -0400 Received: from mail-vc0-f202.google.com ([209.85.220.202]:46545 "EHLO mail-vc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751999Ab3GIRjo (ORCPT ); Tue, 9 Jul 2013 13:39:44 -0400 Received: by mail-vc0-f202.google.com with SMTP id ha12so510321vcb.5 for ; Tue, 09 Jul 2013 10:39:43 -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=XCvTrs3epebhcTnr+S7bN/iObAZtRXNw4DadwU23BYbrp/5pg5KlP647iCsnEpHDMl OsdSyTj+GkfjWAG4MLLkRkGuanRhlQ8EAfE5/Pr80l56HjBTnrvaU1SHZNG2ou782DwY W3OdB7Ujrly94xv7enSkrMulb4ls5S1E7Uhi+BXciIR/fG1Nhnw/AEumrtakeEtpR/Rt i3Bv69A5gR/1PHMyD8H/e0P76vhrk+mKloQgxCzrOZiFCVZjyEZ+CLyav3w8A4r09pkx GcGnSNI8XY7Tn2yo5KqU+qcjDmz7w4QMhjV2YrtPKWV4z0RRPk6qyrf+g9pRE8r0Iv+D osaA== 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 Cc: Olof Johansson , Jaehoon Chung , Seungwon Jeon , James Hogan , Grant Grundler , Alim Akhtar , Abhilash Kesavan , Tomasz Figa , Doug Anderson , Kukjin Kim , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org 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: ALoCoQneVh8jS0rab4mIgohMjFF9lc+sY4VO//YyFZrifsnKxhnhCcYiZFF34kQlrPw0BiWkrT/xHLV1mxsYmglnHLL/OhcZbsJKW6FdAcVb0bOEo4C8Ytc56Y0I3fdhqrcspSA0ztRx6qjWbV40oezJ+CFQYGz0BIcwtCZknxZF/ZsrI2BxtFFBYo7UWC+omerVtWAS2H+TsegIkEiRcnTtm7Axe5p+tg== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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,