Re: [PATCH] soc: imx: Register SoC device only on i.MX boards

From: Shawn Guo
Date: Wed Dec 08 2021 - 07:30:38 EST


On Mon, Dec 06, 2021 at 12:38:28PM +0100, Stephan Gerhold wrote:
> At the moment, using the ARM32 multi_v7_defconfig always results in two
> SoCs being exposed in sysfs. This is wrong, as far as I'm aware the
> Qualcomm DragonBoard 410c does not actually make use of a i.MX SoC. :)
>
> qcom-db410c:/sys/devices/soc0$ grep . *
> family:Freescale i.MX
> machine:Qualcomm Technologies, Inc. APQ 8016 SBC
> revision:0.0
> serial_number:0000000000000000
> soc_id:Unknown
>
> qcom-db410c:/sys/devices/soc1$ grep . *
> family:Snapdragon
> machine:APQ8016
> ...
>
> This happens because imx_soc_device_init() registers the soc device
> unconditionally, even when running on devices that do not make use of i.MX.
> Arnd already reported this more than a year ago and even suggested a fix
> similar to this commit, but for some reason it was never submitted.
>
> Fix it by checking if the "__mxc_cpu_type" variable was actually
> initialized by earlier platform code. On devices without i.MX it will
> simply stay 0.
>
> Cc: Peng Fan <peng.fan@xxxxxxx>
> Fixes: d2199b34871b ("ARM: imx: use device_initcall for imx_soc_device_init")
> Reported-by: Arnd Bergmann <arnd@xxxxxxxx>
> Link: https://lore.kernel.org/r/CAK8P3a0hxO1TmK6oOMQ70AHSWJnP_CAq57YMOutrxkSYNjFeuw@xxxxxxxxxxxxxx/
> Signed-off-by: Stephan Gerhold <stephan@xxxxxxxxxxx>

Applied, thanks!