imx9: scmi: soc: USB instance number change for silicon revision B0

For silicon revision A1, the USB instance number for USB1 is 3 and for
USB2 it is 4. This changed for revision B0 where the USB instance number
for USB1 is 0 and for USB2 it is 1, which is the intended instance
number. Select the correct numbering according to the selected SoC
(IMX95) and its revision.

This patch is based on the information provided by:
"AN14750 Migration Guide from i.MX 95 A1 to B0; Rev. 1.0" .

Reviewed-by: Alice Guo <alice.guo@nxp.com>
Signed-off-by: Fedor Ross <fedor.ross@ifm.com>
Reviewed-by: Marek Vasut <marek.vasut@mailbox.org>

diff --git a/arch/arm/mach-imx/imx9/scmi/soc.c b/arch/arm/mach-imx/imx9/scmi/soc.c
index dbaa19a9e6e4c636281f6199d09d1e5af263c164..c1458ccca3c34816bdbab2a6d355631af04426ae 100644 (file)
--- a/arch/arm/mach-imx/imx9/scmi/soc.c
+++ b/arch/arm/mach-imx/imx9/scmi/soc.c
@@ -921,7 +921,7 @@ enum boot_device get_boot_device(void)
                break;
        case BT_DEV_TYPE_USB:
                boot_dev = boot_instance + USB_BOOT;
-               if (IS_ENABLED(CONFIG_IMX95))
+               if (is_imx95() && (soc_rev() < CHIP_REV_2_0))
                        boot_dev -= 3; //iMX95 usb instance start at 3
                break;
        default: