From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E2A9C433F5 for ; Fri, 3 Dec 2021 18:53:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382750AbhLCS4g (ORCPT ); Fri, 3 Dec 2021 13:56:36 -0500 Received: from mga09.intel.com ([134.134.136.24]:60825 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382737AbhLCS4c (ORCPT ); Fri, 3 Dec 2021 13:56:32 -0500 X-IronPort-AV: E=McAfee;i="6200,9189,10187"; a="236850018" X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="236850018" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 10:53:01 -0800 X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="460981919" Received: from smile.fi.intel.com ([10.237.72.184]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 10:52:58 -0800 Received: from andy by smile.fi.intel.com with local (Exim 4.95) (envelope-from ) id 1mtDf2-001sCL-Hp; Fri, 03 Dec 2021 20:51:56 +0200 Date: Fri, 3 Dec 2021 20:51:56 +0200 From: Andy Shevchenko To: Bartosz Golaszewski Cc: Kent Gibson , Linus Walleij , Shuah Khan , Geert Uytterhoeven , Viresh Kumar , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH v12 3/7] gpiolib: of: make fwnode take precedence in struct gpio_chip Message-ID: References: <20211203133003.31786-1-brgl@bgdev.pl> <20211203133003.31786-4-brgl@bgdev.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211203133003.31786-4-brgl@bgdev.pl> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 03, 2021 at 02:29:59PM +0100, Bartosz Golaszewski wrote: > If the driver sets the fwnode in struct gpio_chip, let it take > precedence over the of_node. > Signed-off-by: Bartosz Golaszewski > --- > drivers/gpio/gpiolib-of.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c > index 0ad288ab6262..91dcf2c6cdd8 100644 > --- a/drivers/gpio/gpiolib-of.c > +++ b/drivers/gpio/gpiolib-of.c > @@ -1046,6 +1046,9 @@ void of_gpio_dev_init(struct gpio_chip *gc, struct gpio_device *gdev) > if (gc->parent) > gdev->dev.of_node = gc->parent->of_node; > > + if (gc->fwnode) > + gc->of_node = to_of_node(gc->fwnode); > + > /* If the gpiochip has an assigned OF node this takes precedence */ > if (gc->of_node) > gdev->dev.of_node = gc->of_node; Similar should be done in acpi_gpio_dev_init(): if (gc->fwnode) device_set_node(&gdev->dev, gc->fwnode); -- With Best Regards, Andy Shevchenko