[PATCH 6.6 0/2] PCI: imx6: Fix i.MX7D controller_id backport regression

[Ryan Matthews <ryanmatthews@fastmail.com>]

Hello,

This fixes an i.Mx 7D SoC PCIe regression caused by a backport mistake.

The regression is broken PCIe initialization and for me a boot hang.

I don't know how to organize this. I think a revert and redo best captures
what's happening.

To complicate things, it looks like the redo patch could also be applied to
5.4, 5.10, 5.15, and 6.1. But those versions don't have the original
backport commit. Version 6.12 matches master and needs no change.

One conflict resolution is needed to apply the redo patch back to versions
6.1 -> 5.15 -> 5.10. One more resolution to apply back to -> 5.4. Patches
against those other versions aren't included here.

 -- Ryan

Richard Zhu (1):
  PCI: imx6: Skip controller_id generation logic for i.MX7D

Ryan Matthews (1):
  Revert "PCI: imx6: Skip controller_id generation logic for i.MX7D"

 drivers/pci/controller/dwc/pci-imx6.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


base-commit: 814637ca257f4faf57a73fd4e38888cce88b5911
-- 
2.47.2