mirror of https://gitee.com/openkylin/linux.git
i.MX driver changes for 5.6:
- Add i.MX8MP SoC driver support. - Allow IMX DSP Protocol driver to be built as module. - Add COMPILE_TEST for IMX_SCU_SOC driver to increase build coverage. - Print SoC type and revision in i.MX8 SoC driver, as this is useful information to have when looking through boot log. -----BEGIN PGP SIGNATURE----- iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAl4bFOsUHHNoYXduZ3Vv QGtlcm5lbC5vcmcACgkQUFdYWoewfM5AYgf+NWY3ylMDPjrXwq5RUy/fD2QajJ2q OQnSBg7PGkclh9Avzhj9YALsMzr4RSeXHNxxNA0wNQskNvu4cu6mTQs06F8o/9Qx 53g7LaIjfohjG4rLH4IIUiw1h47HxHJfJG18E0Rpx8+H/x8PX3CkbpMkWXmLQHvw LgUzFAfeCZvB2t68LgjxKPLtq4xWcEyRFCB5S2y0BwF3JpICHjWaobsXoVuFMYny YmCMBcweyqFk7n11r2SLbMMHH9VH+16nkEZ76M8enbLHFWSe5VxFEZxpWpmjfAyn XJNmYSv1zPEIZBIpAl15ZHn+zxxwaY9JRaOwb+Ip7cCa9t/ZiT5OowDCLQ== =8b1n -----END PGP SIGNATURE----- Merge tag 'imx-driver-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/drivers i.MX driver changes for 5.6: - Add i.MX8MP SoC driver support. - Allow IMX DSP Protocol driver to be built as module. - Add COMPILE_TEST for IMX_SCU_SOC driver to increase build coverage. - Print SoC type and revision in i.MX8 SoC driver, as this is useful information to have when looking through boot log. * tag 'imx-driver-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: firmware: imx: Allow IMX DSP to be selected as module soc: imx: Enable compile testing of IMX_SCU_SOC soc: imx: Add i.MX8MP SoC driver support soc: imx8: print SoC type and revision Link: https://lore.kernel.org/r/20200113034006.17430-1-shawnguo@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
0f82727317
|
@ -1,6 +1,6 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
config IMX_DSP
|
config IMX_DSP
|
||||||
bool "IMX DSP Protocol driver"
|
tristate "IMX DSP Protocol driver"
|
||||||
depends on IMX_MBOX
|
depends on IMX_MBOX
|
||||||
help
|
help
|
||||||
This enables DSP IPC protocol between host AP (Linux)
|
This enables DSP IPC protocol between host AP (Linux)
|
||||||
|
|
|
@ -10,7 +10,7 @@ config IMX_GPCV2_PM_DOMAINS
|
||||||
|
|
||||||
config IMX_SCU_SOC
|
config IMX_SCU_SOC
|
||||||
bool "i.MX System Controller Unit SoC info support"
|
bool "i.MX System Controller Unit SoC info support"
|
||||||
depends on IMX_SCU
|
depends on IMX_SCU || COMPILE_TEST
|
||||||
select SOC_BUS
|
select SOC_BUS
|
||||||
help
|
help
|
||||||
If you say yes here you get support for the NXP i.MX System
|
If you say yes here you get support for the NXP i.MX System
|
||||||
|
|
|
@ -142,10 +142,16 @@ static const struct imx8_soc_data imx8mn_soc_data = {
|
||||||
.soc_revision = imx8mm_soc_revision,
|
.soc_revision = imx8mm_soc_revision,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct imx8_soc_data imx8mp_soc_data = {
|
||||||
|
.name = "i.MX8MP",
|
||||||
|
.soc_revision = imx8mm_soc_revision,
|
||||||
|
};
|
||||||
|
|
||||||
static const struct of_device_id imx8_soc_match[] = {
|
static const struct of_device_id imx8_soc_match[] = {
|
||||||
{ .compatible = "fsl,imx8mq", .data = &imx8mq_soc_data, },
|
{ .compatible = "fsl,imx8mq", .data = &imx8mq_soc_data, },
|
||||||
{ .compatible = "fsl,imx8mm", .data = &imx8mm_soc_data, },
|
{ .compatible = "fsl,imx8mm", .data = &imx8mm_soc_data, },
|
||||||
{ .compatible = "fsl,imx8mn", .data = &imx8mn_soc_data, },
|
{ .compatible = "fsl,imx8mn", .data = &imx8mn_soc_data, },
|
||||||
|
{ .compatible = "fsl,imx8mp", .data = &imx8mp_soc_data, },
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -204,6 +210,9 @@ static int __init imx8_soc_init(void)
|
||||||
goto free_serial_number;
|
goto free_serial_number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pr_info("SoC: %s revision %s\n", soc_dev_attr->soc_id,
|
||||||
|
soc_dev_attr->revision);
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_ARM_IMX_CPUFREQ_DT))
|
if (IS_ENABLED(CONFIG_ARM_IMX_CPUFREQ_DT))
|
||||||
platform_device_register_simple("imx-cpufreq-dt", -1, NULL, 0);
|
platform_device_register_simple("imx-cpufreq-dt", -1, NULL, 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue