From patchwork Tue May 31 06:30:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 68890 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp1763099qge; Mon, 30 May 2016 23:31:32 -0700 (PDT) X-Received: by 10.66.26.16 with SMTP id h16mr52326484pag.154.1464676292019; Mon, 30 May 2016 23:31:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g82si41778771pfj.143.2016.05.30.23.31.31; Mon, 30 May 2016 23:31:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756179AbcEaGb3 (ORCPT + 30 others); Tue, 31 May 2016 02:31:29 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:50718 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755589AbcEaGb0 (ORCPT ); Tue, 31 May 2016 02:31:26 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id u4V6T22p005795; Tue, 31 May 2016 15:29:02 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com u4V6T22p005795 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1464676143; bh=wHZffxIkDPIsGM7JsD/VirrFbVVUjXKi3bZwaPISevU=; h=From:To:Cc:Subject:Date:From; b=uZoK1mEc3Z1hB39EO0qqZ8SAz4r/06veqRpOx90B78g5A1A/igzo/eX7w0RVxYnkk G+7lIegHfAjzMlIsdNthwe6LUtr4wC5BdQAG+lxZ3BVGjFaLvH2/zAqRJP78gKYKRy GR6+0EDV/nCYgmfNyx8K9i0S1Nf0u3sy/cxM0xW1JLUpCmoSzcS5fOaCGXWKJ3MJzz lzPvqxTFhTZVQD669kkt0ujzjP3/R7w6cPDqTPPiweXgyvEVAUYrHo9ujeipNQXDmQ i52rEuscIlc146Mw6aPMq/NOi8J+HvluE/FzO8JeXYnG/YcKR3/FrOjpstosXiuy1u NiiZtBPxWwqew== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-gpio@vger.kernel.org Cc: Masahiro Yamada , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] pinctrl: uniphier: fix .pin_dbg_show() callback Date: Tue, 31 May 2016 15:30:10 +0900 Message-Id: <1464676210-16508-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Without this, reading the "pins" in the debugfs causes kernel BUG. Fixes: 6e9088920258 ("pinctrl: UniPhier: add UniPhier pinctrl core support") Signed-off-by: Masahiro Yamada --- Hi Linus, I hope this will be applied as a bug-fix patch for Linux 4.7 . drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 1.9.1 diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c index 9674009..5d08de0 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c @@ -73,6 +73,12 @@ static void uniphier_pctl_pin_dbg_show(struct pinctrl_dev *pctldev, case UNIPHIER_PIN_PULL_DOWN: pull_dir = "DOWN"; break; + case UNIPHIER_PIN_PULL_UP_FIXED: + pull_dir = "UP(FIXED)"; + break; + case UNIPHIER_PIN_PULL_DOWN_FIXED: + pull_dir = "DOWN(FIXED)"; + break; case UNIPHIER_PIN_PULL_NONE: pull_dir = "NONE"; break;