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

[Marek Vasut]

On 11/27/25 6:50 PM, Fedor Ross wrote:
> 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 revision
> in the defconfig. The config for the B0 revision is IMX95 and for A1 it
> is IMX95_A0.
> 
> This patch is based on the information provided by:
> "AN14750 Migration Guide from i.MX 95 A1 to B0; Rev. 1.0" .
> 
> Signed-off-by: Fedor Ross <fedor.ross at ifm.com>
> ---
>   arch/arm/mach-imx/imx9/scmi/soc.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-imx/imx9/scmi/soc.c b/arch/arm/mach-imx/imx9/scmi/soc.c
> index dbaa19a9e6e..354df7d88a4 100644
> --- 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_ENABLED(CONFIG_IMX95_A0))

It seems this can also be made even more generic:

-if (IS_ENABLED(CONFIG_IMX95))
+if (is_imx95() && (soc_rev() < CHIP_REV_2_0))