From patchwork Wed Jan 28 13:16:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 5729651 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5F56BBF440 for ; Wed, 28 Jan 2015 20:29:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 903D620265 for ; Wed, 28 Jan 2015 20:29:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 926E120221 for ; Wed, 28 Jan 2015 20:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759442AbbA1U3X (ORCPT ); Wed, 28 Jan 2015 15:29:23 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:40263 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759421AbbA1U3P (ORCPT ); Wed, 28 Jan 2015 15:29:15 -0500 Received: by mail-wi0-f174.google.com with SMTP id n3so14819245wiv.1 for ; Wed, 28 Jan 2015 12:29:13 -0800 (PST) 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:in-reply-to :references; bh=w388bRZvPF2BspxxAG9YNwGvCFmeUSWMPBOjBhM5uB4=; b=X0Aj/7+Am8aYU8KGTekvB409W06Yg1E0G7Lxoy0FAAPijEEOO5wMNyvBKXksOvh3EG cozEWBfCSOwMHhFTAeGx/jnVlqpS3WahMMecwjAgd8DD2+cpFR5I0HXU4HkWP5OtPjJA kXmT2cpEhab+Y8vbkg8b9hFnRXK7mAx6tSMaULiIqa5+rlbLtyvbyVMF0cj+VdFiMUIq Za2k99xYDkz4vYJY2Bd89d2VQN1wnhVXphS8NQFQXUMlX0LOBwImPL/RKS+JLqhyybW6 PRfxAD4fAKrku5F6fixsDpio+f/eTegUIZdUzPu8NrwjgzAKFDi3mO5VI/Xf8DsOwTTI 3DSQ== X-Gm-Message-State: ALoCoQljJcA/bzH8Cr8MloCuKUpJWfUfO8zEPJCHxiO5+s9nbPU2nObcHRxhfJBOqdpbXIBKcmF6 X-Received: by 10.180.21.206 with SMTP id x14mr7087461wie.64.1422451023594; Wed, 28 Jan 2015 05:17:03 -0800 (PST) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-2-98-209-190.as13285.net. [2.98.209.190]) by mx.google.com with ESMTPSA id fo17sm6080227wjc.19.2015.01.28.05.17.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Jan 2015 05:17:02 -0800 (PST) From: Srinivas Kandagatla To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Kumar Gala , Rob Herring , Srinivas Kandagatla Subject: [PATCH 1/2] mmc: pwrseq: Add support to control multiple gpios in simple pwrseq Date: Wed, 28 Jan 2015 13:16:59 +0000 Message-Id: <1422451019-9372-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422450981-9328-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1422450981-9328-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This patch adds support to reset/powerup multiple gpio pins on a given sdio bus. The use case is simple, on sdio we could have multiple devices like WLAN, BT which are controlled by there own reset lines. So having multiple reset is something more useful in such cases. Without this patch I could not get BT and WLAN working at same time on IFC6410. Signed-off-by: Srinivas Kandagatla --- drivers/mmc/core/pwrseq_simple.c | 64 ++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/core/pwrseq_simple.c b/drivers/mmc/core/pwrseq_simple.c index 0958c69..bb9aadd 100644 --- a/drivers/mmc/core/pwrseq_simple.c +++ b/drivers/mmc/core/pwrseq_simple.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -19,34 +20,44 @@ struct mmc_pwrseq_simple { struct mmc_pwrseq pwrseq; - struct gpio_desc *reset_gpio; + int ngpios; + struct gpio_desc *reset_gpios[0]; }; -static void mmc_pwrseq_simple_pre_power_on(struct mmc_host *host) +static void __mmc_pwrseq_simple_pre_post_power_on_off(struct mmc_host *host, + bool on) { struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq, struct mmc_pwrseq_simple, pwrseq); + int i; - if (!IS_ERR(pwrseq->reset_gpio)) - gpiod_set_value_cansleep(pwrseq->reset_gpio, 1); + if (!IS_ERR(pwrseq->reset_gpios)) { + for (i = 0; i < pwrseq->ngpios; i++) + gpiod_set_value_cansleep(pwrseq->reset_gpios[i], + on ? : 0); + } } -static void mmc_pwrseq_simple_post_power_on(struct mmc_host *host) +static void mmc_pwrseq_simple_pre_power_on(struct mmc_host *host) { - struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq, - struct mmc_pwrseq_simple, pwrseq); + __mmc_pwrseq_simple_pre_post_power_on_off(host, true); +} - if (!IS_ERR(pwrseq->reset_gpio)) - gpiod_set_value_cansleep(pwrseq->reset_gpio, 0); +static void mmc_pwrseq_simple_post_power_on(struct mmc_host *host) +{ + __mmc_pwrseq_simple_pre_post_power_on_off(host, false); } static void mmc_pwrseq_simple_free(struct mmc_host *host) { struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq, struct mmc_pwrseq_simple, pwrseq); + int i; - if (!IS_ERR(pwrseq->reset_gpio)) - gpiod_put(pwrseq->reset_gpio); + if (!IS_ERR(pwrseq->reset_gpios)) { + for (i = 0; i < pwrseq->ngpios; i++) + gpiod_put(pwrseq->reset_gpios[i]); + } kfree(pwrseq); host->pwrseq = NULL; @@ -62,20 +73,35 @@ static struct mmc_pwrseq_ops mmc_pwrseq_simple_ops = { int mmc_pwrseq_simple_alloc(struct mmc_host *host, struct device *dev) { struct mmc_pwrseq_simple *pwrseq; - int ret = 0; + int ngpios, i, ret = 0; + + ngpios = of_count_phandle_with_args(dev->of_node, + "reset-gpios", "#gpio-cells"); - pwrseq = kzalloc(sizeof(struct mmc_pwrseq_simple), GFP_KERNEL); + if (!ngpios) + return -ENOENT; + + pwrseq = kzalloc(sizeof(struct mmc_pwrseq_simple) + + ngpios * sizeof(struct gpio_desc *), GFP_KERNEL); if (!pwrseq) return -ENOMEM; - pwrseq->reset_gpio = gpiod_get_index(dev, "reset", 0, GPIOD_OUT_HIGH); - if (IS_ERR(pwrseq->reset_gpio) && - PTR_ERR(pwrseq->reset_gpio) != -ENOENT && - PTR_ERR(pwrseq->reset_gpio) != -ENOSYS) { - ret = PTR_ERR(pwrseq->reset_gpio); - goto free; + for (i = 0; i < ngpios; i++) { + pwrseq->reset_gpios[i] = gpiod_get_index(dev, "reset", + i, GPIOD_OUT_HIGH); + if (IS_ERR(pwrseq->reset_gpios[i]) && + PTR_ERR(pwrseq->reset_gpios[i]) != -ENOENT && + PTR_ERR(pwrseq->reset_gpios[i]) != -ENOSYS) { + ret = PTR_ERR(pwrseq->reset_gpios[i]); + + while (--i) + gpiod_put(pwrseq->reset_gpios[i]); + + goto free; + } } + pwrseq->ngpios = ngpios; pwrseq->pwrseq.ops = &mmc_pwrseq_simple_ops; host->pwrseq = &pwrseq->pwrseq;