Commit a24015fa authored by Anson Huang's avatar Anson Huang Committed by Shawn Guo

firmware: imx: Move i.MX SCU soc driver into imx firmware folder

The i.MX SCU soc driver depends on SCU firmware driver, so it has to
use platform driver model for proper defer probe operation, since
it has no device binding in DT file, a simple platform device is
created together inside the platform driver. To make it more clean,
we can just move the entire SCU soc driver into imx firmware folder
and initialized by i.MX SCU firmware driver.
Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent cfda066a
...@@ -850,7 +850,6 @@ CONFIG_OWL_PM_DOMAINS=y ...@@ -850,7 +850,6 @@ CONFIG_OWL_PM_DOMAINS=y
CONFIG_RASPBERRYPI_POWER=y CONFIG_RASPBERRYPI_POWER=y
CONFIG_FSL_DPAA=y CONFIG_FSL_DPAA=y
CONFIG_FSL_MC_DPIO=y CONFIG_FSL_MC_DPIO=y
CONFIG_IMX_SCU_SOC=y
CONFIG_QCOM_AOSS_QMP=y CONFIG_QCOM_AOSS_QMP=y
CONFIG_QCOM_GENI_SE=y CONFIG_QCOM_GENI_SE=y
CONFIG_QCOM_RMTFS_MEM=m CONFIG_QCOM_RMTFS_MEM=m
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_IMX_DSP) += imx-dsp.o obj-$(CONFIG_IMX_DSP) += imx-dsp.o
obj-$(CONFIG_IMX_SCU) += imx-scu.o misc.o imx-scu-irq.o rm.o obj-$(CONFIG_IMX_SCU) += imx-scu.o misc.o imx-scu-irq.o rm.o imx-scu-soc.o
obj-$(CONFIG_IMX_SCU_PD) += scu-pd.o obj-$(CONFIG_IMX_SCU_PD) += scu-pd.o
...@@ -10,9 +10,7 @@ ...@@ -10,9 +10,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of.h> #include <linux/of.h>
#define IMX_SCU_SOC_DRIVER_NAME "imx-scu-soc" static struct imx_sc_ipc *imx_sc_soc_ipc_handle;
static struct imx_sc_ipc *soc_ipc_handle;
struct imx_sc_msg_misc_get_soc_id { struct imx_sc_msg_misc_get_soc_id {
struct imx_sc_rpc_msg hdr; struct imx_sc_rpc_msg hdr;
...@@ -44,7 +42,7 @@ static int imx_scu_soc_uid(u64 *soc_uid) ...@@ -44,7 +42,7 @@ static int imx_scu_soc_uid(u64 *soc_uid)
hdr->func = IMX_SC_MISC_FUNC_UNIQUE_ID; hdr->func = IMX_SC_MISC_FUNC_UNIQUE_ID;
hdr->size = 1; hdr->size = 1;
ret = imx_scu_call_rpc(soc_ipc_handle, &msg, true); ret = imx_scu_call_rpc(imx_sc_soc_ipc_handle, &msg, true);
if (ret) { if (ret) {
pr_err("%s: get soc uid failed, ret %d\n", __func__, ret); pr_err("%s: get soc uid failed, ret %d\n", __func__, ret);
return ret; return ret;
...@@ -71,7 +69,7 @@ static int imx_scu_soc_id(void) ...@@ -71,7 +69,7 @@ static int imx_scu_soc_id(void)
msg.data.req.control = IMX_SC_C_ID; msg.data.req.control = IMX_SC_C_ID;
msg.data.req.resource = IMX_SC_R_SYSTEM; msg.data.req.resource = IMX_SC_R_SYSTEM;
ret = imx_scu_call_rpc(soc_ipc_handle, &msg, true); ret = imx_scu_call_rpc(imx_sc_soc_ipc_handle, &msg, true);
if (ret) { if (ret) {
pr_err("%s: get soc info failed, ret %d\n", __func__, ret); pr_err("%s: get soc info failed, ret %d\n", __func__, ret);
return ret; return ret;
...@@ -80,7 +78,7 @@ static int imx_scu_soc_id(void) ...@@ -80,7 +78,7 @@ static int imx_scu_soc_id(void)
return msg.data.resp.id; return msg.data.resp.id;
} }
static int imx_scu_soc_probe(struct platform_device *pdev) int imx_scu_soc_init(struct device *dev)
{ {
struct soc_device_attribute *soc_dev_attr; struct soc_device_attribute *soc_dev_attr;
struct soc_device *soc_dev; struct soc_device *soc_dev;
...@@ -88,11 +86,11 @@ static int imx_scu_soc_probe(struct platform_device *pdev) ...@@ -88,11 +86,11 @@ static int imx_scu_soc_probe(struct platform_device *pdev)
u64 uid = 0; u64 uid = 0;
u32 val; u32 val;
ret = imx_scu_get_handle(&soc_ipc_handle); ret = imx_scu_get_handle(&imx_sc_soc_ipc_handle);
if (ret) if (ret)
return ret; return ret;
soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr), soc_dev_attr = devm_kzalloc(dev, sizeof(*soc_dev_attr),
GFP_KERNEL); GFP_KERNEL);
if (!soc_dev_attr) if (!soc_dev_attr)
return -ENOMEM; return -ENOMEM;
...@@ -115,19 +113,19 @@ static int imx_scu_soc_probe(struct platform_device *pdev) ...@@ -115,19 +113,19 @@ static int imx_scu_soc_probe(struct platform_device *pdev)
/* format soc_id value passed from SCU firmware */ /* format soc_id value passed from SCU firmware */
val = id & 0x1f; val = id & 0x1f;
soc_dev_attr->soc_id = devm_kasprintf(&pdev->dev, GFP_KERNEL, "0x%x", val); soc_dev_attr->soc_id = devm_kasprintf(dev, GFP_KERNEL, "0x%x", val);
if (!soc_dev_attr->soc_id) if (!soc_dev_attr->soc_id)
return -ENOMEM; return -ENOMEM;
/* format revision value passed from SCU firmware */ /* format revision value passed from SCU firmware */
val = (id >> 5) & 0xf; val = (id >> 5) & 0xf;
val = (((val >> 2) + 1) << 4) | (val & 0x3); val = (((val >> 2) + 1) << 4) | (val & 0x3);
soc_dev_attr->revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%d.%d", soc_dev_attr->revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
(val >> 4) & 0xf, val & 0xf); (val >> 4) & 0xf, val & 0xf);
if (!soc_dev_attr->revision) if (!soc_dev_attr->revision)
return -ENOMEM; return -ENOMEM;
soc_dev_attr->serial_number = devm_kasprintf(&pdev->dev, GFP_KERNEL, soc_dev_attr->serial_number = devm_kasprintf(dev, GFP_KERNEL,
"%016llX", uid); "%016llX", uid);
if (!soc_dev_attr->serial_number) if (!soc_dev_attr->serial_number)
return -ENOMEM; return -ENOMEM;
...@@ -138,35 +136,3 @@ static int imx_scu_soc_probe(struct platform_device *pdev) ...@@ -138,35 +136,3 @@ static int imx_scu_soc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static struct platform_driver imx_scu_soc_driver = {
.driver = {
.name = IMX_SCU_SOC_DRIVER_NAME,
},
.probe = imx_scu_soc_probe,
};
static int __init imx_scu_soc_init(void)
{
struct platform_device *pdev;
struct device_node *np;
int ret;
np = of_find_compatible_node(NULL, NULL, "fsl,imx-scu");
if (!np)
return -ENODEV;
of_node_put(np);
ret = platform_driver_register(&imx_scu_soc_driver);
if (ret)
return ret;
pdev = platform_device_register_simple(IMX_SCU_SOC_DRIVER_NAME,
-1, NULL, 0);
if (IS_ERR(pdev))
platform_driver_unregister(&imx_scu_soc_driver);
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(imx_scu_soc_init);
...@@ -328,6 +328,10 @@ static int imx_scu_probe(struct platform_device *pdev) ...@@ -328,6 +328,10 @@ static int imx_scu_probe(struct platform_device *pdev)
imx_sc_ipc_handle = sc_ipc; imx_sc_ipc_handle = sc_ipc;
ret = imx_scu_soc_init(dev);
if (ret)
dev_warn(dev, "failed to initialize SoC info: %d\n", ret);
ret = imx_scu_enable_general_irq_channel(dev); ret = imx_scu_enable_general_irq_channel(dev);
if (ret) if (ret)
dev_warn(dev, dev_warn(dev,
......
...@@ -8,15 +8,6 @@ config IMX_GPCV2_PM_DOMAINS ...@@ -8,15 +8,6 @@ config IMX_GPCV2_PM_DOMAINS
select PM_GENERIC_DOMAINS select PM_GENERIC_DOMAINS
default y if SOC_IMX7D default y if SOC_IMX7D
config IMX_SCU_SOC
bool "i.MX System Controller Unit SoC info support"
depends on IMX_SCU
select SOC_BUS
help
If you say yes here you get support for the NXP i.MX System
Controller Unit SoC info module, it will provide the SoC info
like SoC family, ID and revision etc.
config SOC_IMX8M config SOC_IMX8M
bool "i.MX8M SoC family support" bool "i.MX8M SoC family support"
depends on ARCH_MXC || COMPILE_TEST depends on ARCH_MXC || COMPILE_TEST
......
...@@ -5,4 +5,3 @@ endif ...@@ -5,4 +5,3 @@ endif
obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o
obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o
obj-$(CONFIG_IMX_SCU_SOC) += soc-imx-scu.o
...@@ -20,4 +20,5 @@ int imx_scu_enable_general_irq_channel(struct device *dev); ...@@ -20,4 +20,5 @@ int imx_scu_enable_general_irq_channel(struct device *dev);
int imx_scu_irq_register_notifier(struct notifier_block *nb); int imx_scu_irq_register_notifier(struct notifier_block *nb);
int imx_scu_irq_unregister_notifier(struct notifier_block *nb); int imx_scu_irq_unregister_notifier(struct notifier_block *nb);
int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable); int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable);
int imx_scu_soc_init(struct device *dev);
#endif /* _SC_SCI_H */ #endif /* _SC_SCI_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment