]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI: imx6: Skip controller_id generation logic for i.MX7D
authorRichard Zhu <hongxing.zhu@nxp.com>
Tue, 26 Nov 2024 07:56:56 +0000 (15:56 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 8 Feb 2025 09:02:03 +0000 (10:02 +0100)
[ Upstream commit f068ffdd034c93f0c768acdc87d4d2d7023c1379 ]

The i.MX7D only has one PCIe controller, so controller_id should always be
0. The previous code is incorrect although yielding the correct result.

Fix by removing "IMX7D" from the switch case branch.

Fixes: 2d8ed461dbc9 ("PCI: imx6: Add support for i.MX8MQ")
Link: https://lore.kernel.org/r/20241126075702.4099164-5-hongxing.zhu@nxp.com
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Krzysztof WilczyƄski <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pci/controller/dwc/pci-imx6.c

index 9d61e7c47208272ad09d095eb2c8888b7558ccf0..22bf21846b79d0ce11f80a7c160d16c7a3a679c6 100644 (file)
@@ -1393,7 +1393,6 @@ static int imx_pcie_probe(struct platform_device *pdev)
        switch (imx_pcie->drvdata->variant) {
        case IMX8MQ:
        case IMX8MQ_EP:
-       case IMX7D:
                if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR)
                        imx_pcie->controller_id = 1;
                break;