Received-SPF: pass (google.com: domain of linux-kernel+bounces-172059-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Tue, 7 May 2024 15:22:33 -0400
From: Frank Li <Frank.li@nxp.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
	Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= <kwilczynski@kernel.org>,
	linux-omap@vger.kernel.org, linux-pci@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
	imx@lists.linux.dev, linux-amlogic@lists.infradead.org,
	linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org,
	Vignesh Raghavendra <vigneshr@ti.com>,
	Siddharth Vadapalli <s-vadapalli@ti.com>,
	Lorenzo Pieralisi <lpieralisi@kernel.org>,
	Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= <kw@linux.com>,
	Rob Herring <robh@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>,
	Richard Zhu <hongxing.zhu@nxp.com>,
	Lucas Stach <l.stach@pengutronix.de>,
	Shawn Guo <shawnguo@kernel.org>,
	Sascha Hauer <s.hauer@pengutronix.de>,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	Fabio Estevam <festevam@gmail.com>, Yue Wang <yue.wang@amlogic.com>,
	Neil Armstrong <neil.armstrong@linaro.org>,
	Kevin Hilman <khilman@baylibre.com>,
	Jerome Brunet <jbrunet@baylibre.com>,
	Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
	Xiaowei Song <songxiaowei@hisilicon.com>,
	Binghui Wang <wangbinghui@hisilicon.com>,
	Thierry Reding <thierry.reding@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Pali =?iso-8859-1?Q?Roh=E1r?= <pali@kernel.org>,
	Linus Walleij <linus.walleij@linaro.org>
Subject: Re: [PATCH v4 4/5] PCI: imx6: Convert to agnostic GPIO API
Message-ID: <Zjp/eTITvtTG8bBL@lizhi-Precision-Tower-5810>
References: <20240506142142.4042810-1-andriy.shevchenko@linux.intel.com>
 <20240506142142.4042810-5-andriy.shevchenko@linux.intel.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240506142142.4042810-5-andriy.shevchenko@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?QVSUFJpCCxnhUy9On/PuB0lev0fxURNHnOTIZgDiTtPCzf2QcVTQ9mfUyBzj?=
 =?us-ascii?Q?CwtndArE/H/enKpfKQfQpM+n6R/1g0PDPmF+HqWCb11hjlIsrAkwQ4I2Oqdr?=
 =?us-ascii?Q?qMt3hZDETwWtqHUxtxJT6P+4hdiSzD4tUl19YLCadgVzZ43xpZtmm8dpytVv?=
 =?us-ascii?Q?ZwGSW0mdmBamfHLV3xb0X7LhkMqUk2JTNZ1CnCdBB9A8BaXSH2U485pvkBVv?=
 =?us-ascii?Q?Uwg2JQfYyYM6BfQa35hR8G3xB4Tqjd46LoOhFOfR2v4mx1Dt1ktz6O9QnoGv?=
 =?us-ascii?Q?izIuq485WsN0ROBicwfFCbGpiKbFyfIyRFIZxsL8obtkOiTftVoQRClpHOwL?=
 =?us-ascii?Q?49qqzluF1tfe4eRdFuVtul4fGY3NMgkiVf8Q3xveobFb725CpzCVkhQhJWqR?=
 =?us-ascii?Q?TSXQKUT6AuG608BnoMlT6YI+IDNSuL1ygDCtc/7AWSRbETDh7Xx1RmsHyC/M?=
 =?us-ascii?Q?5U661X96f0JEDhBDkkjEBd1eKDQ88ab3HSt5rGD1F4/HShERpcV3i4/QRtkV?=
 =?us-ascii?Q?WNMx409vF437Jh1ZwJnSvYVwKAF7k97nKAhy0TPeC2CbS1+9j+572MhGls90?=
 =?us-ascii?Q?Gb4WWJPSk9vA/Ciy0Fdy0fbdLQunDRwRBeGvZD1acNuX3LSEvyjh9fC9MRTC?=
 =?us-ascii?Q?hwszHKHqgbMZq/7YMtonZUjeTJxrUbKFRQsMr4FPO4kzVqF6CqWqaSZGnZA+?=
 =?us-ascii?Q?dxDSmqbXDZMYKGThQ1+6xVPXbrKSN8Iuaf63iwdG+nIk0xG7DTaWv9YdnRlq?=
 =?us-ascii?Q?/9S9ACPQje5QBOBta+DA/pyv3+VULl+DvAbsOZ4XtCv4D6IiOVzuNF9g5xfI?=
 =?us-ascii?Q?fl/X36T9yKZkTO2Y0l4RjNxZEE5/93H/el595uF1R9fDN8Ptwe7kFkxf9l92?=
 =?us-ascii?Q?JyxlOZYiiP1Q9k1DJffAp2Pr7TxEGJqyjcHsfdP3dKxjDRkj6MoIUWkAfBLd?=
 =?us-ascii?Q?1Jw31booup7kd6pCaUi311Gsf6c0SVPQNnK5QKm0xYSFhycJ8v2NBcCTrntR?=
 =?us-ascii?Q?s0+F3XwXd+heUl+5u+s2fuuHsfI2rTDq+9WjF/mXMAz9UCNbACa66VJCmS/L?=
 =?us-ascii?Q?AJ8i3szpgTXzzNIcqEx9QzdFbHo58igd5bSOtV4/pEcNz1f03F5Ste2pUOn6?=
 =?us-ascii?Q?ROEeivvH36zp7IIfm88QaqLox023S52LV3jK1ZxZsDVK9oQn4j7fYKGanevq?=
 =?us-ascii?Q?kI7q1lXsG/5Gm+Nim21yzkOKKS9AOlWw4j8HCN67WHpTmD9rjfVgX+3qY7UC?=
 =?us-ascii?Q?OMZSrrJQSLODtTIlSsFLbhAObn4w2d6iVMeT6p49hZBRPXTYiPFm5XV+mBiS?=
 =?us-ascii?Q?fFNaNYWXdGoTu6fXovrOcqp6oG7ARRkUGf71Vf/19PH+0Y9piyg6VbeUIIPo?=
 =?us-ascii?Q?PZiQ3n6zAoOD6WwpA1GcMqAuFh1gUaSxmLTfi5cAse1SLIC+hX2RvemKHobQ?=
 =?us-ascii?Q?WIRf2ECbZAWDr6SoV0ZrtItzfK4DVJ9+qx9MG3x/dx0/KO4LkVhyCtdzJT3c?=
 =?us-ascii?Q?HwKYOEd/hu/2m3LPURsPowflthjOU9CCqzdofCrh1GLsAHyCsent3Ybfhzt1?=
 =?us-ascii?Q?Xk/jjXZHHVyAD/dcarFvHYqIKnNB9dm+7EovzZ+M?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6de290e8-cb74-4f59-55c3-08dc6ecb1320
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2024 19:22:45.9085
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BQpxN1R6HGpaMCb0b0Y/2A4XtPD1z2J59DmS2qkcRcfCKfTofhp96Ma7smkcdXkz4SOaY5ZRbpl7IbKtc/5W7Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8785

On Mon, May 06, 2024 at 05:20:40PM +0300, Andy Shevchenko wrote:
> The of_gpio.h is going to be removed. In preparation of that convert
> the driver to the agnostic API.
> 
> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Reviewed-by: Frank Li <Frank.Li@nxp.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---

Can I include your patch in my imx6 pci improvement patches
https://lore.kernel.org/linux-pci/20240507-pci2_upstream-v4-0-e8c80d874057@nxp.com/T/#t

There is patch, which rename function from imx6 -> imx. That will avoid
conflict.

Frank Li


>  drivers/pci/controller/dwc/pci-imx6.c | 36 ++++++++-------------------
>  1 file changed, 10 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
> index 917c69edee1d..62a4994c5501 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -11,14 +11,13 @@
>  #include <linux/bitfield.h>
>  #include <linux/clk.h>
>  #include <linux/delay.h>
> -#include <linux/gpio.h>
> +#include <linux/gpio/consumer.h>
>  #include <linux/kernel.h>
>  #include <linux/mfd/syscon.h>
>  #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
>  #include <linux/mfd/syscon/imx7-iomuxc-gpr.h>
>  #include <linux/module.h>
>  #include <linux/of.h>
> -#include <linux/of_gpio.h>
>  #include <linux/of_address.h>
>  #include <linux/pci.h>
>  #include <linux/platform_device.h>
> @@ -107,8 +106,7 @@ struct imx6_pcie_drvdata {
>  
>  struct imx6_pcie {
>  	struct dw_pcie		*pci;
> -	int			reset_gpio;
> -	bool			gpio_active_high;
> +	struct gpio_desc	*reset_gpiod;
>  	bool			link_is_up;
>  	struct clk_bulk_data	clks[IMX6_PCIE_MAX_CLKS];
>  	struct regmap		*iomuxc_gpr;
> @@ -721,9 +719,7 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
>  	}
>  
>  	/* Some boards don't have PCIe reset GPIO. */
> -	if (gpio_is_valid(imx6_pcie->reset_gpio))
> -		gpio_set_value_cansleep(imx6_pcie->reset_gpio,
> -					imx6_pcie->gpio_active_high);
> +	gpiod_set_value_cansleep(imx6_pcie->reset_gpiod, 1);
>  }
>  
>  static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
> @@ -771,10 +767,9 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
>  	}
>  
>  	/* Some boards don't have PCIe reset GPIO. */
> -	if (gpio_is_valid(imx6_pcie->reset_gpio)) {
> +	if (imx6_pcie->reset_gpiod) {
>  		msleep(100);
> -		gpio_set_value_cansleep(imx6_pcie->reset_gpio,
> -					!imx6_pcie->gpio_active_high);
> +		gpiod_set_value_cansleep(imx6_pcie->reset_gpiod, 0);
>  		/* Wait for 100ms after PERST# deassertion (PCIe r5.0, 6.6.1) */
>  		msleep(100);
>  	}
> @@ -1285,22 +1280,11 @@ static int imx6_pcie_probe(struct platform_device *pdev)
>  		return PTR_ERR(pci->dbi_base);
>  
>  	/* Fetch GPIOs */
> -	imx6_pcie->reset_gpio = of_get_named_gpio(node, "reset-gpio", 0);
> -	imx6_pcie->gpio_active_high = of_property_read_bool(node,
> -						"reset-gpio-active-high");
> -	if (gpio_is_valid(imx6_pcie->reset_gpio)) {
> -		ret = devm_gpio_request_one(dev, imx6_pcie->reset_gpio,
> -				imx6_pcie->gpio_active_high ?
> -					GPIOF_OUT_INIT_HIGH :
> -					GPIOF_OUT_INIT_LOW,
> -				"PCIe reset");
> -		if (ret) {
> -			dev_err(dev, "unable to get reset gpio\n");
> -			return ret;
> -		}
> -	} else if (imx6_pcie->reset_gpio == -EPROBE_DEFER) {
> -		return imx6_pcie->reset_gpio;
> -	}
> +	imx6_pcie->reset_gpiod = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
> +	if (IS_ERR(imx6_pcie->reset_gpiod))
> +		return dev_err_probe(dev, PTR_ERR(imx6_pcie->reset_gpiod),
> +				     "unable to get reset gpio\n");
> +	gpiod_set_consumer_name(imx6_pcie->reset_gpiod, "PCIe reset");
>  
>  	if (imx6_pcie->drvdata->clks_cnt >= IMX6_PCIE_MAX_CLKS)
>  		return dev_err_probe(dev, -ENOMEM, "clks_cnt is too big\n");
> -- 
> 2.43.0.rc1.1336.g36b5255a03ac
>