From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 01 Jun 2023 16:39:35 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q4jSi-005u9U-IH for lore@lore.pengutronix.de; Thu, 01 Jun 2023 16:39:35 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4jSf-0007IR-Lw for lore@pengutronix.de; Thu, 01 Jun 2023 16:39:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YDzP31fc5YQoKoeNpTAfhSzIOzOSiu1mcqijO1wXXpY=; b=DIIxnQ9VHmdeI88HhwQHYMi1BT SJDZj+qPAMWph/tLMUGVOtFrTXCdHICKjgVcvnNuNM377Uvmr5WxBLxspddYQlwiMxARXN+1KBVgA qGKwa/kj8K+M2c5rWvdbWogABQ0geQnhN4e35qKtFjx1012MavQghpzPSL/epbALEViBxfHgHuZfo y/8jph69ItNktw5QHuFtPVTmwrHGk4Mj1SZthpYwYuSDh50PenUAolqWnKSImnyqjoHlBE4HJNUG5 zGxKm/n9EdFvEsWyNJdv/YPN+7OQSoBCibvNDPjwoKIz/iWCcU2QxFFhlBPGIcJviDLiqqGNrRHmh lFm5LJZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4jRw-003tGZ-1E; Thu, 01 Jun 2023 14:38:48 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4jRs-003tG1-3A for barebox@lists.infradead.org; Thu, 01 Jun 2023 14:38:46 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4jRr-0007E9-9Y; Thu, 01 Jun 2023 16:38:43 +0200 Received: from mfe by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1q4jRq-0005Vu-SF; Thu, 01 Jun 2023 16:38:42 +0200 Date: Thu, 1 Jun 2023 16:38:42 +0200 From: Marco Felsch To: Sascha Hauer Cc: barebox@lists.infradead.org, Jules Maselbas Message-ID: <20230601143842.447ap3h6hmu27gxl@pengutronix.de> References: <20230601142506.1069998-1-m.felsch@pengutronix.de> <20230601143209.GN18491@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230601143209.GN18491@pengutronix.de> User-Agent: NeoMutt/20180716 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230601_073845_035552_241B5C61 X-CRM114-Status: GOOD ( 32.45 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] gpiolib: fix gpio-hog functionality X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On 23-06-01, Sascha Hauer wrote: > On Thu, Jun 01, 2023 at 04:25:06PM +0200, Marco Felsch wrote: > > This reverts commit 3641d381e63321016e3bf09504852a6b2a2f879b. > > > > Since the of_xlate support the gpio-hog support is broken because the > > 'gpio' property used to specify the gpio-hog pin does not contain any > > phandle. Due to the fact that of_xlate was never implemented the easiest > > way to fix the gpio-hog functionality is to revert the commit. > > 3641d381e63321016e3bf09504852a6b2a2f879b was introduced for sunxi. As > Jules is currently working on sunxi support this is likely needed soon, > so what's the second easiest way? There is no sunxi driver within the kernel which make use of of_xlate. Regards, Marco > > Sascha > > > > > Signed-off-by: Marco Felsch > > --- > > drivers/gpio/gpiolib.c | 58 ++++++++++++++++++++---------------------- > > drivers/of/of_gpio.c | 5 ++-- > > include/gpio.h | 4 +-- > > 3 files changed, 30 insertions(+), 37 deletions(-) > > > > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c > > index 6ec63b1119..b4a3a4e550 100644 > > --- a/drivers/gpio/gpiolib.c > > +++ b/drivers/gpio/gpiolib.c > > @@ -444,27 +444,44 @@ static int of_hog_gpio(struct device_node *np, struct gpio_chip *chip, > > unsigned int idx) > > { > > struct device_node *chip_np = chip->dev->of_node; > > - struct of_phandle_args gpiospec; > > unsigned long flags = 0; > > - u32 gpio_flags; > > + u32 gpio_cells, gpio_num, gpio_flags; > > int ret, gpio; > > const char *name = NULL; > > > > - ret = of_parse_phandle_with_args(chip_np, "gpios", "#gpio-cells", idx, > > - &gpiospec); > > + ret = of_property_read_u32(chip_np, "#gpio-cells", &gpio_cells); > > if (ret) > > return ret; > > > > - gpio = gpio_of_xlate(chip->dev, &gpiospec, &gpio_flags); > > + /* > > + * Support for GPIOs that don't have #gpio-cells set to 2 is > > + * not implemented > > + */ > > + if (WARN_ON(gpio_cells != 2)) > > + return -ENOTSUPP; > > + > > + ret = of_property_read_u32_index(np, "gpios", idx * gpio_cells, > > + &gpio_num); > > + if (ret) > > + return ret; > > + > > + ret = of_property_read_u32_index(np, "gpios", idx * gpio_cells + 1, > > + &gpio_flags); > > + if (ret) > > + return ret; > > + > > + if (gpio_flags & OF_GPIO_ACTIVE_LOW) > > + flags |= GPIOF_ACTIVE_LOW; > > + > > + gpio = gpio_get_num(chip->dev, gpio_num); > > if (gpio == -EPROBE_DEFER) > > return gpio; > > + > > if (gpio < 0) { > > - dev_err(chip->dev, "unable to get gpio: %d\n", gpio); > > + dev_err(chip->dev, "unable to get gpio %u\n", gpio_num); > > return gpio; > > } > > > > - if (gpio_flags & OF_GPIO_ACTIVE_LOW) > > - flags |= GPIOF_ACTIVE_LOW; > > > > /* > > * Note that, in order to be compatible with Linux, the code > > @@ -625,23 +642,6 @@ void gpiochip_remove(struct gpio_chip *chip) > > list_del(&chip->list); > > } > > > > -static int of_gpio_simple_xlate(struct gpio_chip *chip, > > - const struct of_phandle_args *gpiospec, > > - u32 *flags) > > -{ > > - /* > > - * Support for GPIOs that don't have #gpio-cells set to 2 is > > - * not implemented > > - */ > > - if (WARN_ON(gpiospec->args_count != 2)) > > - return -ENOTSUPP; > > - > > - if (flags) > > - *flags = gpiospec->args[1]; > > - > > - return chip->base + gpiospec->args[0]; > > -} > > - > > struct gpio_chip *gpio_get_chip_by_dev(struct device *dev) > > { > > struct gpio_chip *chip; > > @@ -654,8 +654,7 @@ struct gpio_chip *gpio_get_chip_by_dev(struct device *dev) > > return NULL; > > } > > > > -int gpio_of_xlate(struct device *dev, struct of_phandle_args *gpiospec, > > - int *flags) > > +int gpio_get_num(struct device *dev, int gpio) > > { > > struct gpio_chip *chip; > > > > @@ -666,10 +665,7 @@ int gpio_of_xlate(struct device *dev, struct of_phandle_args *gpiospec, > > if (!chip) > > return -EPROBE_DEFER; > > > > - if (chip->ops->of_xlate) > > - return chip->ops->of_xlate(chip, gpiospec, flags); > > - else > > - return of_gpio_simple_xlate(chip, gpiospec, flags); > > + return chip->base + gpio; > > } > > > > struct gpio_chip *gpio_get_chip(int gpio) > > diff --git a/drivers/of/of_gpio.c b/drivers/of/of_gpio.c > > index b662563742..5da80e2493 100644 > > --- a/drivers/of/of_gpio.c > > +++ b/drivers/of/of_gpio.c > > @@ -62,7 +62,6 @@ int of_get_named_gpio_flags(struct device_node *np, const char *propname, > > { > > struct of_phandle_args out_args; > > struct device *dev; > > - int of_flags; > > int ret; > > > > ret = of_parse_phandle_with_args(np, propname, "#gpio-cells", > > @@ -80,7 +79,7 @@ int of_get_named_gpio_flags(struct device_node *np, const char *propname, > > return -EPROBE_DEFER; > > } > > > > - ret = gpio_of_xlate(dev, &out_args, &of_flags); > > + ret = gpio_get_num(dev, out_args.args[0]); > > if (ret == -EPROBE_DEFER) > > return ret; > > if (ret < 0) { > > @@ -90,7 +89,7 @@ int of_get_named_gpio_flags(struct device_node *np, const char *propname, > > } > > > > if (flags) { > > - *flags = of_flags; > > + *flags = out_args.args[1]; > > of_gpio_flags_quirks(np, propname, flags, index); > > } > > > > diff --git a/include/gpio.h b/include/gpio.h > > index 10ac7fd7c4..5f2c16584c 100644 > > --- a/include/gpio.h > > +++ b/include/gpio.h > > @@ -177,7 +177,6 @@ struct gpio_ops { > > int (*get_direction)(struct gpio_chip *chip, unsigned offset); > > int (*get)(struct gpio_chip *chip, unsigned offset); > > void (*set)(struct gpio_chip *chip, unsigned offset, int value); > > - int (*of_xlate)(struct gpio_chip *chip, const struct of_phandle_args *gpiospec, u32 *flags); > > }; > > > > struct gpio_chip { > > @@ -194,8 +193,7 @@ struct gpio_chip { > > int gpiochip_add(struct gpio_chip *chip); > > void gpiochip_remove(struct gpio_chip *chip); > > > > -int gpio_of_xlate(struct device *dev, struct of_phandle_args *gpiospec, > > - int *flags); > > +int gpio_get_num(struct device *dev, int gpio); > > struct gpio_chip *gpio_get_chip(int gpio); > > > > #endif /* __GPIO_H */ > > -- > > 2.39.2 > > > > > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | >