diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-16 22:08:07 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-16 22:08:07 +0200 |
| commit | d943a9c83e3dd42fb1c6f9cf5ff706effeb19fc5 (patch) | |
| tree | adc6608a224a08b21f17662b932ddaa41a962eb3 /drivers | |
| parent | Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kh... (diff) | |
| parent | soc: imx: check ls1021a (diff) | |
| download | linux-d943a9c83e3dd42fb1c6f9cf5ff706effeb19fc5.tar.xz linux-d943a9c83e3dd42fb1c6f9cf5ff706effeb19fc5.zip | |
Merge tag 'imx-fixes-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 5.8, round 2:
- A couple of fixes on i.MX platform device registration code to stop
the use of invalid IRQ 0.
- Fix a regression seen on ls1021a platform, caused by commit
52102a3ba6a61 ("soc: imx: move cpu code to drivers/soc/imx").
- Fix a misconfiguration of audio SSI on imx6qdl-gw551x board.
* tag 'imx-fixes-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
soc: imx: check ls1021a
ARM: imx: Remove imx_add_imx_dma() unused irq_err argument
ARM: imx: Provide correct number of resources when registering gpio devices
ARM: dts: imx6qdl-gw551x: fix audio SSI
Link: https://lore.kernel.org/r/20200714145649.GP15718@dragon
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/imx/soc-imx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/imx/soc-imx.c b/drivers/soc/imx/soc-imx.c index fec3d672b606..01bfea1cb64a 100644 --- a/drivers/soc/imx/soc-imx.c +++ b/drivers/soc/imx/soc-imx.c @@ -33,6 +33,9 @@ static int __init imx_soc_device_init(void) u32 val; int ret; + if (of_machine_is_compatible("fsl,ls1021a")) + return 0; + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); if (!soc_dev_attr) return -ENOMEM; |