From patchwork Tue Jan 9 05:59:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Zhang X-Patchwork-Id: 857208 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u6Ja3hHD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zG1gD6KC0z9sNx for ; Tue, 9 Jan 2018 16:59:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932557AbeAIF7O (ORCPT ); Tue, 9 Jan 2018 00:59:14 -0500 Received: from mail-yw0-f196.google.com ([209.85.161.196]:41331 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932532AbeAIF7N (ORCPT ); Tue, 9 Jan 2018 00:59:13 -0500 Received: by mail-yw0-f196.google.com with SMTP id f1so5241272ywd.8; Mon, 08 Jan 2018 21:59:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=wH5QkE8AkzwO2sMc/JTAzUKI4/1+W9asFufRrnq3xwE=; b=u6Ja3hHDxKxcGKt0ufG5VpN1J2Bb48eAIpAy7JMT9+3hWOa8a1CwV2Sxs/fvsKEfAr 7TEWxOA1lbAVp9X9FTVSQQxVH0tRYPHtwhU2s0HgQpT0ADzpd/WO1Yo1eehPSY3AShxi lGezdegwbedtfqktODnLXQK95YT0QvJ1bBSAyg/DrjsajPjBrH/X1UJxevjQLv3WW8cj z6oPstAnJwRjRsU1lzV3ZH1+fQdzqf8buwS9k1sPoFLz8JmpXsNd0BFZWfiVhNZqCiHq tKCKUBtI72QO78Hr1IqnLlOfFKmNSdDgyKJbZYyFmzfcsEB5PHqkmKfeCQL53KFqdfqm n5Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=wH5QkE8AkzwO2sMc/JTAzUKI4/1+W9asFufRrnq3xwE=; b=ZD323ILr2HcIUD03srRsJozyI93Opi4HIylCzFOfTGGAyOXbOjovlM02EkEisMKx1m Ae/FdqF0kaJxUrtgfMR1izlA0UYR+5djK6WMJiYJDC483CKzUbHuRlG6TRXZa6wiA4qQ uZvRQVG6XJEhQXLX0EdBw3PGhM0Z7RVqIZJlqBDpJWx7FfrxuQ3l+H9WCzyt9t8t70pi 6S6FFwxspO2Q80hecXYwZ1YNA1STMhXeEg7GhntZa2/XMC0WzflN87d0T4zy7dvZastb lG8sM5VtHFTsfBAxi/sxkRPRohYlX69ZQqkwttqlURSYBYz0EFTK7/AF94olkP9AnbBY 3eCQ== X-Gm-Message-State: AKGB3mK0YoagxszppQ1q/riPVZjw20ZmX7TW2qxuWF4OTQZSVwRUo9mJ EZWOfk/ylDyjjtlcl+JGTGA= X-Google-Smtp-Source: ACJfBou2LhDJFIEPz/cJd65iOi+tL77V/kmCBmIPzetjFSagp88oIFuA33sEGdSKPx7+mD7mxtTrhw== X-Received: by 10.129.73.86 with SMTP id w83mr8837982ywa.391.1515477552475; Mon, 08 Jan 2018 21:59:12 -0800 (PST) Received: from arx-s1 ([79.124.1.2]) by smtp.gmail.com with ESMTPSA id c142sm1479563ywh.36.2018.01.08.21.59.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 21:59:11 -0800 (PST) Date: Tue, 9 Jan 2018 13:59:02 +0800 From: hao_zhang To: maxime.ripard@free-electrons.com, wens@csie.org, linus.walleij@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, hao5781286@gmail.com Subject: [RESEND PATCH] ARM: pinctrl: sunxi-pinctrl: fix pin funtion can not be match correctly. Message-ID: <20180109055902.GA1306@arx-s1> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Pin function can not be match correctly when SUNXI_PIN describe with mutiple variant and same function. such as: on pinctrl-sun4i-a10.c SUNXI_PIN(SUNXI_PINCTRL_PIN(B, 2), SUNXI_FUNCTION(0x0, "gpio_in"), SUNXI_FUNCTION(0x1, "gpio_out"), SUNXI_FUNCTION_VARIANT(0x2, "pwm", /* PWM0 */ PINCTRL_SUN4I_A10 | PINCTRL_SUN7I_A20), SUNXI_FUNCTION_VARIANT(0x3, "pwm", /* PWM0 */ PINCTRL_SUN8I_R40)), it would always match to the first variant function (PINCTRL_SUN4I_A10, PINCTRL_SUN7I_A20) so we should add variant compare on it. Regards Hao Signed-off-by: hao_zhang Acked-by: Maxime Ripard --- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index 4b6cb25..131adf7 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -83,7 +83,9 @@ sunxi_pinctrl_desc_find_function_by_name(struct sunxi_pinctrl *pctl, struct sunxi_desc_function *func = pin->functions; while (func->name) { - if (!strcmp(func->name, func_name)) + if (!strcmp(func->name, func_name) && + (!func->variant || + func->variant & pctl->variant)) return func; func++;