@@ -2119,32 +2119,6 @@ static int etm4_probe(struct device *dev)
return etm4_add_coresight_dev(&init_arg);
}
-static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id)
-{
- struct etmv4_drvdata *drvdata;
- void __iomem *base;
- struct device *dev = &adev->dev;
- struct resource *res = &adev->res;
- int ret;
-
- /* Validity for the resource is already checked by the AMBA core */
- base = devm_ioremap_resource(dev, res);
- if (IS_ERR(base))
- return PTR_ERR(base);
-
- drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
- if (!drvdata)
- return -ENOMEM;
-
- drvdata->base = base;
- dev_set_drvdata(dev, drvdata);
- ret = etm4_probe(dev);
- if (!ret)
- pm_runtime_put(&adev->dev);
-
- return ret;
-}
-
static int etm4_probe_platform_dev(struct platform_device *pdev)
{
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2205,15 +2179,6 @@ static int etm4_probe_cpu(unsigned int cpu)
return 0;
}
-static struct amba_cs_uci_id uci_id_etm4[] = {
- {
- /* ETMv4 UCI data */
- .devarch = ETM_DEVARCH_ETMv4x_ARCH,
- .devarch_mask = ETM_DEVARCH_ID_MASK,
- .devtype = ETM_DEVTYPE_ETMv4x_ARCH,
- }
-};
-
static void clear_etmdrvdata(void *info)
{
int cpu = *(int *)info;
@@ -2253,14 +2218,6 @@ static int __exit etm4_remove_dev(struct etmv4_drvdata *drvdata)
return 0;
}
-static void __exit etm4_remove_amba(struct amba_device *adev)
-{
- struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev);
-
- if (drvdata)
- etm4_remove_dev(drvdata);
-}
-
static int __exit etm4_remove_platform_dev(struct platform_device *pdev)
{
int ret = 0;
@@ -2276,42 +2233,6 @@ static int __exit etm4_remove_platform_dev(struct platform_device *pdev)
return ret;
}
-static const struct amba_id etm4_ids[] = {
- CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */
- CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */
- CS_AMBA_ID(0x000bb95a), /* Cortex-A72 */
- CS_AMBA_ID(0x000bb959), /* Cortex-A73 */
- CS_AMBA_UCI_ID(0x000bb9da, uci_id_etm4),/* Cortex-A35 */
- CS_AMBA_UCI_ID(0x000bbd05, uci_id_etm4),/* Cortex-A55 */
- CS_AMBA_UCI_ID(0x000bbd0a, uci_id_etm4),/* Cortex-A75 */
- CS_AMBA_UCI_ID(0x000bbd0c, uci_id_etm4),/* Neoverse N1 */
- CS_AMBA_UCI_ID(0x000bbd41, uci_id_etm4),/* Cortex-A78 */
- CS_AMBA_UCI_ID(0x000f0205, uci_id_etm4),/* Qualcomm Kryo */
- CS_AMBA_UCI_ID(0x000f0211, uci_id_etm4),/* Qualcomm Kryo */
- CS_AMBA_UCI_ID(0x000bb802, uci_id_etm4),/* Qualcomm Kryo 385 Cortex-A55 */
- CS_AMBA_UCI_ID(0x000bb803, uci_id_etm4),/* Qualcomm Kryo 385 Cortex-A75 */
- CS_AMBA_UCI_ID(0x000bb805, uci_id_etm4),/* Qualcomm Kryo 4XX Cortex-A55 */
- CS_AMBA_UCI_ID(0x000bb804, uci_id_etm4),/* Qualcomm Kryo 4XX Cortex-A76 */
- CS_AMBA_UCI_ID(0x000bbd0d, uci_id_etm4),/* Qualcomm Kryo 5XX Cortex-A77 */
- CS_AMBA_UCI_ID(0x000cc0af, uci_id_etm4),/* Marvell ThunderX2 */
- CS_AMBA_UCI_ID(0x000b6d01, uci_id_etm4),/* HiSilicon-Hip08 */
- CS_AMBA_UCI_ID(0x000b6d02, uci_id_etm4),/* HiSilicon-Hip09 */
- {},
-};
-
-MODULE_DEVICE_TABLE(amba, etm4_ids);
-
-static struct amba_driver etm4x_amba_driver = {
- .drv = {
- .name = "coresight-etm4x",
- .owner = THIS_MODULE,
- .suppress_bind_attrs = true,
- },
- .probe = etm4_probe_amba,
- .remove = etm4_remove_amba,
- .id_table = etm4_ids,
-};
-
#ifdef CONFIG_PM
static int etm4_runtime_suspend(struct device *dev)
{
@@ -2374,27 +2295,17 @@ static int __init etm4x_init(void)
if (ret)
return ret;
- ret = amba_driver_register(&etm4x_amba_driver);
- if (ret) {
- pr_err("Error registering etm4x AMBA driver\n");
- goto clear_pm;
- }
-
ret = platform_driver_register(&etm4_platform_driver);
if (!ret)
return 0;
pr_err("Error registering etm4x platform driver\n");
- amba_driver_unregister(&etm4x_amba_driver);
-
-clear_pm:
etm4_pm_clear();
return ret;
}
static void __exit etm4x_exit(void)
{
- amba_driver_unregister(&etm4x_amba_driver);
platform_driver_unregister(&etm4_platform_driver);
etm4_pm_clear();
}