From patchwork Fri Jun 30 00:42:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timur Tabi X-Patchwork-Id: 782626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wzHn16HSPz9s81 for ; Fri, 30 Jun 2017 10:42:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="SVoeIvWV"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="SVoeIvWV"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751917AbdF3Amm (ORCPT ); Thu, 29 Jun 2017 20:42:42 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:43866 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751679AbdF3Amk (ORCPT ); Thu, 29 Jun 2017 20:42:40 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DE008609EF; Fri, 30 Jun 2017 00:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498783345; bh=qWojsvOZGV/A1dEGfamhfMFN1OZP7pieTTZsPSi0PCg=; h=From:To:Cc:Subject:Date:From; b=SVoeIvWVMenmeSe7r0leBx1JS3uAcFeEiW0DKNcpnnPE4LztxoYd715azAQBl3cPZ G1o54EFiAwSiWGXjFtk6IhhrXm87h74OZ7P9WKNbV6a7kELWIzyRzAUFCuRf8+Mid+ YPdiFtQG62uFQNKD6F0vdekfy1jB7SDQ51TUSxzA= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from timur-ubuntu.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: timur@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 5330B6087C; Fri, 30 Jun 2017 00:42:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498783345; bh=qWojsvOZGV/A1dEGfamhfMFN1OZP7pieTTZsPSi0PCg=; h=From:To:Cc:Subject:Date:From; b=SVoeIvWVMenmeSe7r0leBx1JS3uAcFeEiW0DKNcpnnPE4LztxoYd715azAQBl3cPZ G1o54EFiAwSiWGXjFtk6IhhrXm87h74OZ7P9WKNbV6a7kELWIzyRzAUFCuRf8+Mid+ YPdiFtQG62uFQNKD6F0vdekfy1jB7SDQ51TUSxzA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5330B6087C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=timur@codeaurora.org From: Timur Tabi To: andy.gross@linaro.org, david.brown@linaro.org, Linus Walleij , Bjorn Andersson , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: timur@codeaurora.org Subject: [PATCH 1/2] pinctrl: qcom: disable GPIO groups with no pins Date: Thu, 29 Jun 2017 19:42:18 -0500 Message-Id: <1498783339-749-1-git-send-email-timur@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org To support sparse GPIO maps, pinctrl-msm client drivers can specify that a given GPIO has a pin count of zero. These GPIOs will be considered "hidden". Any attempt to claim the GPIO will fail, and they will not be listed in debugfs. However, when the driver probes, it calls gpiochip_add_data() which wants to initialize the direction of all the GPIOs, even the ones that are unavailable. Therefore, msm_gpio_get_direction() checks to make sure the pin is available. Signed-off-by: Timur Tabi --- drivers/pinctrl/qcom/pinctrl-msm.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 273badd..e915db4 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -165,7 +165,22 @@ static int msm_pinmux_set_mux(struct pinctrl_dev *pctldev, return 0; } +/* + * Request a GPIO. If the number of pins for this GPIO group is zero, + * then assume that the GPIO is unavailable. + */ +static int msm_request(struct pinctrl_dev *pctldev, unsigned int offset) +{ + struct msm_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); + const struct msm_pingroup *g; + + g = &pctrl->soc->groups[offset]; + + return g->npins ? 0 : -ENODEV; +} + static const struct pinmux_ops msm_pinmux_ops = { + .request = msm_request, .get_functions_count = msm_get_functions_count, .get_function_name = msm_get_function_name, .get_function_groups = msm_get_function_groups, @@ -430,6 +445,14 @@ static int msm_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) g = &pctrl->soc->groups[offset]; + /* + * If the GPIO is unavailable, just return error. This is necessary + * because the GPIO layer tries to initialize the direction of all + * the GPIOs, even the ones that are unavailable. + */ + if (!g->npins) + return -ENODEV; + val = readl(pctrl->regs + g->ctl_reg); /* 0 = output, 1 = input */ @@ -494,6 +517,11 @@ static void msm_gpio_dbg_show_one(struct seq_file *s, }; g = &pctrl->soc->groups[offset]; + + /* If the GPIO group has no pins, then don't show it. */ + if (!g->npins) + return; + ctl_reg = readl(pctrl->regs + g->ctl_reg); is_out = !!(ctl_reg & BIT(g->oe_bit)); @@ -503,7 +531,7 @@ static void msm_gpio_dbg_show_one(struct seq_file *s, seq_printf(s, " %-8s: %-3s %d", g->name, is_out ? "out" : "in", func); seq_printf(s, " %dmA", msm_regval_to_drive(drive)); - seq_printf(s, " %s", pulls[pull]); + seq_printf(s, " %s\n", pulls[pull]); } static void msm_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) @@ -511,10 +539,8 @@ static void msm_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) unsigned gpio = chip->base; unsigned i; - for (i = 0; i < chip->ngpio; i++, gpio++) { + for (i = 0; i < chip->ngpio; i++, gpio++) msm_gpio_dbg_show_one(s, NULL, chip, i, gpio); - seq_puts(s, "\n"); - } } #else