Received-SPF: pass (google.com: domain of linux-kernel+bounces-84065-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Tue, 27 Feb 2024 16:47:09 -0500
Subject: [PATCH 2/6] PCI: imx6: Rename pci-imx6.c and PCI_IMX6 config
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240227-pci2_upstream-v1-2-b952f8333606@nxp.com>
References: <20240227-pci2_upstream-v1-0-b952f8333606@nxp.com>
In-Reply-To: <20240227-pci2_upstream-v1-0-b952f8333606@nxp.com>
To: Richard Zhu <hongxing.zhu@nxp.com>, 
 Lucas Stach <l.stach@pengutronix.de>, 
 Lorenzo Pieralisi <lpieralisi@kernel.org>, 
 =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= <kw@linux.com>, 
 Rob Herring <robh@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, 
 Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, 
 Philipp Zabel <p.zabel@pengutronix.de>, Liam Girdwood <lgirdwood@gmail.com>, 
 Mark Brown <broonie@kernel.org>
Cc: linux-pci@vger.kernel.org, imx@lists.linux.dev, 
 linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, 
 bpf@vger.kernel.org, Frank Li <Frank.Li@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?WmdpNTQ3ZEVYc053Y0tSMUtUazdaejQ2Umd2dUxOaXhmdTB3WHFqYmJYS3BS?=
 =?utf-8?B?TUd0K3dwN2dKZmpFSDZlb0hHRkE3bWdWd1pzbEh6dHZ0ajJnNHlncVNHc2pv?=
 =?utf-8?B?YktTeXJVZkVoZkwwMldDTE5TREIyU1B3amkyMFF1NlR5dWZRNFVmYkc5TUxR?=
 =?utf-8?B?aWh1S0xCOUZNOEdWNjVWTjIrWEJVTzhibXdJeW5nT054V2VidGVIY0trTWtP?=
 =?utf-8?B?ZXlKc2xIYUZyaHVNbWl1VmpUQUJST3JSdmNUK1E5ZEJRK05CZVcwK3ZtMFJM?=
 =?utf-8?B?ZlZlVzhKS0N2ZmtSNGp1L3BpNVpBUG9IYnVYa1ZGUGhNM3doZ2lMRVZXazI1?=
 =?utf-8?B?dkNrRjFGOThHNXZyLzVOTkFGclhCYlVrVzA1WTQ4LzBCMk83RmsvMFptSERX?=
 =?utf-8?B?WGhKd1FLKzl3Sm9nVmRGSzhCbjNSTlFhSWxQK2hKUGltSENCdThpTkdsYVBO?=
 =?utf-8?B?SmovdEVVME0yQTJOaFpGbFhBRmdGYWxyeWk2YmkrNzU3SWpGT0JsenBqRFI5?=
 =?utf-8?B?SCt6TjlicDdhZmlxRDIrVGtFK1lvOXozcy9lc2gxRDZVcHlyWlpDSnZ2d1Nv?=
 =?utf-8?B?WWJDSzFkaDJ2VjdyRmJrNmFZckZOeTM1T1FISUVheHFMY2d2c05yN3lqNGtv?=
 =?utf-8?B?R3lZZTdQU2owbmNYcC9NTEt5TTY3dnBXT3RNcVY5QlhBMTZyUFJ3czFNT1dq?=
 =?utf-8?B?S3lERDVvbGxmOHY3d3VOQWJrNlJ1SVNPVlZ2aWlBSWwyRVhJVlgwb1RnTDRY?=
 =?utf-8?B?OWVSRG5rT3pFK1RWZGxFRkhwTDA4R0krM2hrbk9LMjJlRTlWM2FJMVRXNXpM?=
 =?utf-8?B?SW1aRzl5QWh0ZFY3SmsyRjNWY21CSTl3QWE0dUVZNDlHOWExMFBUKys4U3BR?=
 =?utf-8?B?SnEzYzh0a2Y5VUxDYmM3Mkd2cS8rNWtSa0pDM2VNcnh1WVlUTXlVakRtRmE4?=
 =?utf-8?B?b2VmQXd2SzNoenJ5eXB2MXN0a1ExYmRoMkRVaitCMG5veGwvMWl6cEdZWmph?=
 =?utf-8?B?UWg3aklLc1pZY2tEN04wcXNqVCt1K3RCdGtGeGFBa0s0dWZtUVA2Z2FFWUcy?=
 =?utf-8?B?YnRlK2svUXVTd3o3MmlyWWVCVHR5TkU2RTdVZkczdHJpeWtCb1pRb0phVDVU?=
 =?utf-8?B?ZWxnK2NrbVVLeFp3clhGejRtc0tMem91THllVzNJaTlLMmcyaXgzVXp0clBj?=
 =?utf-8?B?eUZjbWpwWm1JNjZjTlEzZVQyVHpjUFl0QU9NcmNSQ2lublJ4cFNyZHhGRUxW?=
 =?utf-8?B?WEdDZ3FEMkVhZUpEQXJrV0NQWW5Gd3U0L2RwbC9QWDlrbEhNQ0RDb2Q2OGlD?=
 =?utf-8?B?Q0cvNHNqTnh4Q3lhbFhQZldKRWFhSkVmQUlwWDRqVzU5dGZqSFNDU29aeTBt?=
 =?utf-8?B?V200M0tabi9mUFM5ZnFWbHlIKzFYRWk3WW5IRHMyVDNvaHkxWDFKQ3dqY3ZJ?=
 =?utf-8?B?Q2NzOVo4Z0RBV0JyUldUdW55UVRoOVdhLzZVTmRSQUtJWkM1eEVkVTkxS3lC?=
 =?utf-8?B?amdLSmRWNzBzR1IvYjRhaCtjcUxnTncva0NicWJNaW5nOGQyQzloRUpCYk42?=
 =?utf-8?B?MXgvUXlObnRxSmhzWml6Uk9odmgzSXpBeVpaSHhEMHg0Nk5RSXluYW9zbitW?=
 =?utf-8?B?dCtsMjI3VXY0d0hLdzk4TUd4S1dOcGk5MWRhVElJMkI4WHJjdnpiTnpLM0pP?=
 =?utf-8?B?NU54ZWFhOEZrU3VKY0dVRldIQ0xQSmpObnRKTmh6VWNrYkU5OVJmcGMrdnlp?=
 =?utf-8?B?VmdkNXdHeU1DNmo4RzZaNXk2YXhSZ0NGQmRXdURIQjl1SnE4WHNIQzZzbmFB?=
 =?utf-8?B?T1BYd25DQTU1UjZ4VXd5MFViekp3OUFHTDZDOHZZeXZROEEyUXIwSzRCVGxi?=
 =?utf-8?B?azdjc3pDWlBXdHlIUlRUVjR6WHBBT3NoNnBydC9WcDVhY0xOUHJPZjRkSnpt?=
 =?utf-8?B?ZkxVMmZwdFZRMVB3UzVoTjFkS1BaVElWakpsYllObkdSU0ZqbkxZQjh5ZTdw?=
 =?utf-8?B?c2hJNWg0TTlmWUN3VDFuRE1oUjI4VlR5NEJxL2x3RnNGWjc1SVdwei9WNjZL?=
 =?utf-8?B?NVlxWmRsWDFlZk9KdUNObmhWbmZ6MEw0NVRjSjdCejZvOSs1dkxHQzB2UnNP?=
 =?utf-8?Q?Op26tden2+gvMOotMgyNVR/yO?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c536a716-2f4b-47ab-f048-08dc37ddb9c9
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 21:47:42.5202
 (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: acf8WSXHnt8hf6ALopobdEkdtfCutiGNzgmNV0tvAoDCvN+tW8CtbMfbRkm21/2bAkQBsV5wmfpxWFeBDRVEkg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7056

pci-imx6.c and PCI_IMX6 actuall for all i.MX chips (i.MX6x, i.MX7x, i.MX8x,
i.MX9x). Remove '6' to avoid confuse.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/pci/controller/dwc/Kconfig                   | 14 +++++++-------
 drivers/pci/controller/dwc/Makefile                  |  2 +-
 drivers/pci/controller/dwc/{pci-imx6.c => pci-imx.c} |  0
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index 8afacc90c63b8..647ce302e5ebb 100644
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@ -70,27 +70,27 @@ config PCIE_BT1
 	  Enables support for the PCIe controller in the Baikal-T1 SoC to work
 	  in host mode. It's based on the Synopsys DWC PCIe v4.60a IP-core.
 
-config PCI_IMX6
+config PCI_IMX
 	bool
 
-config PCI_IMX6_HOST
-	bool "Freescale i.MX6/7/8 PCIe controller (host mode)"
+config PCI_IMX_HOST
+	bool "Freescale i.MX PCIe controller (host mode)"
 	depends on ARCH_MXC || COMPILE_TEST
 	depends on PCI_MSI
 	select PCIE_DW_HOST
-	select PCI_IMX6
+	select PCI_IMX
 	help
 	  Enables support for the PCIe controller in the i.MX SoCs to
 	  work in Root Complex mode. The PCI controller on i.MX is based
 	  on DesignWare hardware and therefore the driver re-uses the
 	  DesignWare core functions to implement the driver.
 
-config PCI_IMX6_EP
-	bool "Freescale i.MX6/7/8 PCIe controller (endpoint mode)"
+config PCI_IMX_EP
+	bool "Freescale i.MX PCIe controller (endpoint mode)"
 	depends on ARCH_MXC || COMPILE_TEST
 	depends on PCI_ENDPOINT
 	select PCIE_DW_EP
-	select PCI_IMX6
+	select PCI_IMX
 	help
 	  Enables support for the PCIe controller in the i.MX SoCs to
 	  work in endpoint mode. The PCI controller on i.MX is based
diff --git a/drivers/pci/controller/dwc/Makefile b/drivers/pci/controller/dwc/Makefile
index bac103faa5237..7084e615b2774 100644
--- a/drivers/pci/controller/dwc/Makefile
+++ b/drivers/pci/controller/dwc/Makefile
@@ -7,7 +7,7 @@ obj-$(CONFIG_PCIE_BT1) += pcie-bt1.o
 obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o
 obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
 obj-$(CONFIG_PCIE_FU740) += pcie-fu740.o
-obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
+obj-$(CONFIG_PCI_IMX) += pci-imx.o
 obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
 obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone.o
 obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx.c
similarity index 100%
rename from drivers/pci/controller/dwc/pci-imx6.c
rename to drivers/pci/controller/dwc/pci-imx.c

-- 
2.34.1