From patchwork Sun Apr 12 01:33:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1269390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AwPTvAUI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 490Dmw2TQcz9sSb for ; Sun, 12 Apr 2020 11:34:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726182AbgDLBeA (ORCPT ); Sat, 11 Apr 2020 21:34:00 -0400 Received: from mail-qv1-f65.google.com ([209.85.219.65]:40566 "EHLO mail-qv1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726155AbgDLBeA (ORCPT ); Sat, 11 Apr 2020 21:34:00 -0400 Received: by mail-qv1-f65.google.com with SMTP id k9so2818236qvw.7; Sat, 11 Apr 2020 18:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G3nQaM43k9Rklf2xLNnAGkRhKH0gN0HpijPYsLTLZdM=; b=AwPTvAUITiOJF80dM/rPAHATDeQ3GU/8cDAo/hNSm4EOixAspTDZ53W/ovEXabIXJP e0xUYfwOywrkk9NqihZ14MIAOHUhXmTwoQsbk0GAGjO98BJAnpUk9DdqI1HNB2FQAjUI 4pH3/Yb/3y+UnAxVViaohluOE0a8zpMYnGerS8s4wIe+fCtRTh2Kjxx9Ci7RpiP3AbNN GO88B3Ft2D0KY+4FC1mRrbhHu8yq40rZLboGWpdk2e2cvGB+OG3S73cHpUcKEYeYTT0K pCzrZ1tQKwokXPE2RzleSzlhvv52z5xs2Ah7M8BPGQKvrq9QnWEqMsqdzrYneMcA+uJX Zofw== 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=G3nQaM43k9Rklf2xLNnAGkRhKH0gN0HpijPYsLTLZdM=; b=lQd3bbPFEfYQEaQIYB3V59nO1Giacdkmt/p8PCBizIk1LDJ0a4N34P+bVjiLIpjdCb LEq3gXSljg1RfPZZJF7J42WxuYXCjDB/nLzQQnWRCacnkJaLpCudPieXH8jE1iKHKxnQ GNTCiHe0DWvRDotddcV8iUPb4kJh4aLHIHZKj4Fn3Py2hN87o9obsEbjdLMv2KyHwUgr iJAv+O+Oa4qCqd+QZjoFcQ00Ev0nGsckGAd4O/UOYUcm9iUyn8g/0cf/9kEFIhfBCZGI dx+QF4NK3c5fZBon5xNCZ0pPuySFusNM/vK9n+DG+GpXBB2b+5cLQrn3p5r44N3Kdj/t lobg== X-Gm-Message-State: AGi0PuYcx6FnvpNX4aiVqZXvPb1PtZ9VcZKsS9NF5dJTUkssTWs/gweT cC3eu5xx4u/dEJ9nlubHFWHQcxQngVY= X-Google-Smtp-Source: APiQypJiEV0RnRUmTyA/JuKefTQfZz6CM0s4Ym1Yzm4HZEMGiidJ3sWyRm1wpigUBRrhybZ2bO6rIQ== X-Received: by 2002:a0c:f70d:: with SMTP id w13mr11652746qvn.118.1586655239720; Sat, 11 Apr 2020 18:33:59 -0700 (PDT) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id n92sm4965192qtd.68.2020.04.11.18.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2020 18:33:59 -0700 (PDT) From: Adam Ford To: linux-gpio@vger.kernel.org Cc: aford@beaconembedded.com, Adam Ford , Linus Walleij , Bartosz Golaszewski , Thomas Petazzoni , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] gpiolib: of: Improve gpiolib-of support pull up/down on expanders Date: Sat, 11 Apr 2020 20:33:51 -0500 Message-Id: <20200412013352.674506-1-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org When using GPIO expanders attached to I2C ports, their set_config function needs to be passed a config setting which contains options to enable pull up or pull down bias feature. In order to set this config properly, the gpio parser needs to handle GPIO_PULL_UP and GPIO_PULL_DOWN. This patch enables the flags corresponding to GPIO_PULL_UP and GPIO_PULL_DOWN. Signed-off-by: Adam Ford diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index c6d30f73df07..bf17afb1f66d 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -344,6 +344,12 @@ struct gpio_desc *gpiod_get_from_of_node(struct device_node *node, if (transitory) lflags |= GPIO_TRANSITORY; + if (flags & OF_GPIO_PULL_UP) + lflags |= GPIO_PULL_UP; + + if (flags & OF_GPIO_PULL_DOWN) + lflags |= GPIO_PULL_DOWN; + ret = gpiod_configure_flags(desc, propname, lflags, dflags); if (ret < 0) { gpiod_put(desc); @@ -585,6 +591,10 @@ static struct gpio_desc *of_parse_own_gpio(struct device_node *np, *lflags |= GPIO_ACTIVE_LOW; if (xlate_flags & OF_GPIO_TRANSITORY) *lflags |= GPIO_TRANSITORY; + if (xlate_flags & OF_GPIO_PULL_UP) + *lflags |= GPIO_PULL_UP; + if (xlate_flags & OF_GPIO_PULL_DOWN) + *lflags |= GPIO_PULL_DOWN; if (of_property_read_bool(np, "input")) *dflags |= GPIOD_IN; From patchwork Sun Apr 12 01:33:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1269391 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eB2mHLKx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 490Dmx5X7rz9sSg for ; Sun, 12 Apr 2020 11:34:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726829AbgDLBeC (ORCPT ); Sat, 11 Apr 2020 21:34:02 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:43284 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726155AbgDLBeC (ORCPT ); Sat, 11 Apr 2020 21:34:02 -0400 Received: by mail-qt1-f195.google.com with SMTP id z90so4585529qtd.10; Sat, 11 Apr 2020 18:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J22mB3NQXWC/CST6MY0ECTvn5DksxAQMXIJYanPvBBM=; b=eB2mHLKxf3oeEvkGJbhlLEyFKxlCPsZXzd2uBK0OA9ZINs+MSzb/oSX+VjeD3Vyf0i EgkoLIXo08RM21vB+qTqS6gEIF2UnoXURiwbyGnOsX/JGitRes9Y5UnhMZ5D1S4ELa8P lnXYWeWxX6L0JtibzGU8hRR7wuWW8SXp/tuTZ8wKaCLaeNHqpJ0+Vi022TQ9Z6OlSjZf eTyouX1ArE25fIMFa2qGH6VOTvBl8jce/avfwr68YaY+sNVtQ1PK+ysc/fWUeYYlu6AB +EU3PZcZa/4PHvLjs1zdwhtkPBM7HtilPyBc+RNq8hQKxPDd5osHbXpGb5iG4K3/mAkz c9Ag== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=J22mB3NQXWC/CST6MY0ECTvn5DksxAQMXIJYanPvBBM=; b=YyZyz2b1O5Eh3woxDOnrLDRfOJSyXNiatqvuqctUCAL8ACwFYqf9Z5jmZGQJHrINjh Mc3ilZM7RkrlObq6Ek0dA/BaT97/Yi9yIts1hI3A8oqz4NJL3IBHVTQWmH90M0TPDc0X sawgXEs9XXNWDDBix+MO6mw8RwoEgCoa8sOTJNgIiyHn1IOYqrE8j+gtrFk7t77MAimY JcBR+1TNJwmLow0RaZVKs9P7jBNboEiYEpjtCRYquDOZRT5mp/7QGC0rd1GYx+BzUwOy bY5nTUyaOfDA76stK/d4B5CNFOSwfj7nae+B02ZRw6Ii+8GBBTQC6QZqg9OXBPo/7HuM QFwQ== X-Gm-Message-State: AGi0PubWam/vAYqRQvJz3m/xQHF/VR1sfRHCutJvOxzavugQhNUi2A6y abB1GQpGeRFcUI7QhfLhZauOL6OMjLw= X-Google-Smtp-Source: APiQypKIcOmRhbPE7CF37aPdRPiKcrwaissa2BNrJRAb3iEArDqyTm5Cr57d/hsg9V13peD+22f2XQ== X-Received: by 2002:ac8:65cc:: with SMTP id t12mr5627735qto.310.1586655241329; Sat, 11 Apr 2020 18:34:01 -0700 (PDT) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id n92sm4965192qtd.68.2020.04.11.18.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2020 18:34:00 -0700 (PDT) From: Adam Ford To: linux-gpio@vger.kernel.org Cc: aford@beaconembedded.com, Adam Ford , Linus Walleij , Bartosz Golaszewski , Thomas Petazzoni , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] gpio: pca953x: Fix pca953x_gpio_set_config Date: Sat, 11 Apr 2020 20:33:52 -0500 Message-Id: <20200412013352.674506-2-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200412013352.674506-1-aford173@gmail.com> References: <20200412013352.674506-1-aford173@gmail.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org pca953x_gpio_set_config is setup to support pull-up/down bias. Currently the driver uses a variable called 'config' to determine which options to use. Unfortunately, this is incorrect. This patch uses function pinconf_to_config_param(config), which converts this 'config' parameter back to pinconfig to determine which option to use. Fixes: 15add06841a3 ("gpio: pca953x: add ->set_config implementation") Signed-off-by: Adam Ford diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 5638b4e5355f..4269ea9a817e 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -531,7 +531,7 @@ static int pca953x_gpio_set_config(struct gpio_chip *gc, unsigned int offset, { struct pca953x_chip *chip = gpiochip_get_data(gc); - switch (config) { + switch (pinconf_to_config_param(config)) { case PIN_CONFIG_BIAS_PULL_UP: case PIN_CONFIG_BIAS_PULL_DOWN: return pca953x_gpio_set_pull_up_down(chip, offset, config);