From patchwork Fri May 4 23:57:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 909073 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="WwrMZyz+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40d88H24w4z9s2k for ; Sat, 5 May 2018 09:57:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751774AbeEDX5d (ORCPT ); Fri, 4 May 2018 19:57:33 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36914 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729AbeEDX5c (ORCPT ); Fri, 4 May 2018 19:57:32 -0400 Received: by mail-pg0-f65.google.com with SMTP id a13-v6so16439430pgu.4 for ; Fri, 04 May 2018 16:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QUXa/IR6m/GLZCsuYE+ZgxyMcUYOxVcalE5GBZ8x4Q8=; b=WwrMZyz+Hoq+zDXovl4fVHXdOyL6/ZFKo0lNI/VGI4fbNAdqOS2ZHaxhN42e65u6Ur t809L+jkExLK8dHX21gMSNi37yy9fec82uCB1NI1v3zhptaNHX1GAvZ0e+DSxThGRgPd cNMHkMBMWrB+VgjjK89Ui6TSk2zPaWpU0rCiI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QUXa/IR6m/GLZCsuYE+ZgxyMcUYOxVcalE5GBZ8x4Q8=; b=s13Y4SWNb6KACrIL2lMkDK4P6lhlB+8K9nP+55SOZ0gldC1gjRBk6XIkQNN+WuyN0v AG17/x4CNq2yAIiSOOpYthhy8vHPdyQ8kgqlg9GqnZ9eZjarJHAiRbhuj5/SJSlWJl2l 38yjfULebxNYlCHRmKCF7PrwcJ7AaU+xEFuRk2MClNW2GrvKCtTlcx/SRJ24+VcKl6ad AQ+Q9H2aarAkhPahoMhV4L2QvFll8BHjZu1MsXToIqrxXN8KtPBhfbiWJO6z5H8E4wAS HiRwfoOUI8CRbBmrx5nRJcGulS21G0bTUqllC6dEZ/Moa/TkYc1914ZJF3Wxf1CvC2Xx ikTw== X-Gm-Message-State: ALQs6tCos2pwZHpJ88JgY5VvWIjO6+DM1olIwelmBHaHq9qE4b5WjFgd 9NrrczP0jyyhb/6KIPsbrj8pDw== X-Google-Smtp-Source: AB8JxZrMTSCPPhFAKQ7u7l4Vi8Vy4M6737Jc+GOuA8BMuS8nXQ26y6f8pUPaInazjLdIefssCYfnJA== X-Received: by 2002:a17:902:4303:: with SMTP id i3-v6mr30602956pld.394.1525478251729; Fri, 04 May 2018 16:57:31 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id x5-v6sm22330842pgv.15.2018.05.04.16.57.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 16:57:31 -0700 (PDT) From: Bjorn Andersson To: Linus Walleij , =?utf-8?b?Q2zDqW1lbnQgUMOp?= =?utf-8?q?ron?= Cc: linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH] pinctrl: qcom: fix wrong pull status display for no_keeper SoC Date: Fri, 4 May 2018 16:57:28 -0700 Message-Id: <20180504235728.805-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Clément Péron DebugFS strings about pin pull status for no_keeper SoC are wrong Fix this by adding a different string array for no_keeper SoC Signed-off-by: Clément Péron Signed-off-by: Bjorn Andersson --- Hi Linus, Forwarding this patch which was posted to linux-arm-msm@ only. LGTM, please apply. @Clémen, please use ./scripts/get_maintaine.pl to find appropriate recipients for future patches. Regards, Bjorn drivers/pinctrl/qcom/pinctrl-msm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index fa4e94fedb8c..c3c77b86eff7 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -504,13 +504,19 @@ static void msm_gpio_dbg_show_one(struct seq_file *s, int pull; u32 ctl_reg; - static const char * const pulls[] = { + static const char * const pulls_keeper[] = { "no pull", "pull down", "keeper", "pull up" }; + static const char * const pulls_no_keeper[] = { + "no pull", + "pull down", + "pull up", + }; + if (!gpiochip_line_is_valid(chip, offset)) return; @@ -524,7 +530,10 @@ 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]); + if (pctrl->soc->pull_no_keeper) + seq_printf(s, " %s", pulls_no_keeper[pull]); + else + seq_printf(s, " %s", pulls_keeper[pull]); seq_puts(s, "\n"); }