From patchwork Mon Apr 28 07:41:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Fenkart X-Patchwork-Id: 4075641 Return-Path: X-Original-To: patchwork-linux-mmc@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 17A869F271 for ; Mon, 28 Apr 2014 07:42:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 153AB2026D for ; Mon, 28 Apr 2014 07:42:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58758202A7 for ; Mon, 28 Apr 2014 07:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753353AbaD1Hmm (ORCPT ); Mon, 28 Apr 2014 03:42:42 -0400 Received: from mail-ee0-f43.google.com ([74.125.83.43]:39261 "EHLO mail-ee0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753981AbaD1Hmk (ORCPT ); Mon, 28 Apr 2014 03:42:40 -0400 Received: by mail-ee0-f43.google.com with SMTP id e53so4551381eek.30 for ; Mon, 28 Apr 2014 00:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z5uxudSJFfdo86GiQBWrhhhpv/kxmcFMsI56MSgDwhw=; b=AmJfafJgTy0Ry4YZEdQBGHpkdTKNh5Do6CelThsrVJabo6pd/K+w4308fwlE07gcy6 2LT6nS+oFe3P3T13Kg+J1KUaB43Ni8s1/B8EwaDw0uhzJwkLDhIglZfBraoe2elhkvvs SY/jJ566bIYqYbYYvjsqtVlfKbldr9yrRvKmKqtHLyMhDXlFKg2FD1vdnN96XjLKtRnx en4euEtnrtDYaukaxF0Lad1IM9IdNEbV1YbGFAYoSmkfP3fvIF24OvgxuJvKQpG4B5tk j1w/YMeE6jwfgtRZRSJbUjsKJqgs5UICsPuRqp8YdBhuhafaOJ9rmFvaCy8A//UIuXvw voiA== X-Received: by 10.15.27.195 with SMTP id p43mr31391623eeu.2.1398670959214; Mon, 28 Apr 2014 00:42:39 -0700 (PDT) Received: from localhost (ip-89-176-190-91.net.upcbroadband.cz. [89.176.190.91]) by mx.google.com with ESMTPSA id x46sm48060885een.17.2014.04.28.00.42.37 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 28 Apr 2014 00:42:38 -0700 (PDT) From: Andreas Fenkart To: Tony Lindgren Cc: Chris Ball , Grant Likely , Felipe Balbi , Balaji T K , zonque@gmail.com, galak@codeaurora.org, linux-doc@vger.kernel.org, linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org, Andreas Fenkart Subject: [PATCH v10 5/5] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x Date: Mon, 28 Apr 2014 09:41:00 +0200 Message-Id: <1398670860-30695-6-git-send-email-afenkart@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398670860-30695-1-git-send-email-afenkart@gmail.com> References: <1398670860-30695-1-git-send-email-afenkart@gmail.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 am335x can't detect pending cirq in PM runtime suspend. This patch reconfigures dat1 as a GPIO before going to suspend. SDIO interrupts are detected with the GPIO, the GPIO will only wake the module from suspend, SDIO irq detection will still happen through the IP block. Idea of remuxing the pins by Tony Lindgren. Code contributions from Tony Lindgren and Balaji T K Signed-off-by: Andreas Fenkart Signed-off-by: Tony Lindgren diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt index ce80561..4767cd1 100644 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt @@ -56,3 +56,54 @@ Examples: &edma 25>; dma-names = "tx", "rx"; }; + +[workaround for missing swakeup on am33xx] + +This SOC is missing the swakeup line, it will not detect SDIO irq +while in suspend. + + ------ + | PRCM | + ------ + ^ | + swakeup | | fclk + | v + ------ ------- ----- + | card | -- CIRQ --> | hsmmc | -- IRQ --> | CPU | + ------ ------- ----- + +In suspend the fclk is off and the module is disfunctional. Even +register reads will fail. A small logic in the host will request +fclk restore, when an external event is detected. Once the clock +is restored, the host detects the event normally. Since am33xx +doesn't have this line it never wakes from suspend. + +The workaround is to reconfigure the dat1 line as a GPIO upon +suspend. To make this work, we need to set 1) the named pinctrl +states "default", "idle" and "gpio_dat1", 2) the gpio detecting +sdio irq in suspend and 3) the compatibe section, see example below. +The MMC driver will then toggle between gpio_dat1 and default during +the runtime. If configuration is incomplete, a warning message is +emitted "falling back to polling". Mind not every application +needs SDIO irq, e.g. MMC cards Affected chips are am335x, +probably others + + + mmc1: mmc@48060100 { + compatible = "ti,am33xx-hsmmc"; + ... + interrupts-extended = <&intc 64 &gpio2 28 0>; + ... + pinctrl-names = "default", "idle", "sleep", "gpio_dat1" + pinctrl-0 = <&mmc1_pins>; + pinctrl-1 = <&mmc1_idle>; + pinctrl-2 = <&mmc1_sleep>; + pinctrl-3 = <&mmc1_cirq_pin>; + ... + }; + + mmc1_cirq_pin: pinmux_cirq_pin { + pinctrl-single,pins = < + 0x0f8 0x3f /* GPIO2_28 */ + >; + }; diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 9cc0d21..8661e1f 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -213,7 +213,10 @@ struct omap_hsmmc_host { #define AUTO_CMD23 (1 << 0) /* Auto CMD23 support */ #define HSMMC_SDIO_IRQ_ENABLED (1 << 1) /* SDIO irq enabled */ #define HSMMC_WAKE_IRQ_ENABLED (1 << 2) +#define HSMMC_SWAKEUP_QUIRK (1 << 3) struct omap_hsmmc_next next_data; + struct pinctrl *pinctrl; + struct pinctrl_state *gpio_pinmux; struct omap_mmc_platform_data *pdata; }; @@ -1744,8 +1747,28 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host) * and need to remux SDIO DAT1 to GPIO for wake-up from idle. */ if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) { - ret = -ENODEV; - goto err; + if (IS_ERR(host->dev->pins->default_state)) { + dev_info(host->dev, "missing default pinctrl state\n"); + ret = -EINVAL; + goto err; + } + + host->pinctrl = devm_pinctrl_get(host->dev); + if (IS_ERR(host->pinctrl)) { + dev_warn(host->dev, "no pinctrl handle\n"); + ret = -ENODEV; + goto err; + } + + host->gpio_pinmux = pinctrl_lookup_state(host->pinctrl, + "gpio_dat1"); + if (IS_ERR(host->gpio_pinmux)) { + dev_info(host->dev, "missing \"gpio_dat1\" pinctrl state\n"); + ret = -ENODEV; + goto err; + } + + host->flags |= HSMMC_SWAKEUP_QUIRK; } devres_remove_group(host->dev, NULL); @@ -2438,7 +2461,10 @@ static int omap_hsmmc_runtime_suspend(struct device *dev) goto abort; } - pinctrl_pm_select_idle_state(dev); + if (host->flags & HSMMC_SWAKEUP_QUIRK) + pinctrl_select_state(host->pinctrl, host->gpio_pinmux); + else + pinctrl_pm_select_idle_state(dev); WARN_ON(host->flags & HSMMC_WAKE_IRQ_ENABLED); enable_irq(host->wake_irq);