| Message ID | 20230317030501.1811905-6-anshuman.khandual@arm.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | coresight: etm4x: Migrate AMBA devices to platform driver | expand |
On 17/03/2023 03:04, Anshuman Khandual wrote: > From: Suzuki Poulose <suzuki.poulose@arm.com> > > Drop ETM4X ACPI ID from the AMBA ACPI device list, and instead just move it > inside the new ACPI devices list detected and used via platform driver. It may be a good idea to add a short summary of why we are doing this ? Though it is part of the cover letter, it would benefit people looking at the commit (e.g., maintainers or even in the future). Suzuki > > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Len Brown <lenb@kernel.org> > Cc: Mathieu Poirier <mathieu.poirier@linaro.org> > Cc: Suzuki K Poulose <suzuki.poulose@arm.com> > Cc: Mike Leach <mike.leach@linaro.org> > Cc: Leo Yan <leo.yan@linaro.org> > Cc: Sudeep Holla <sudeep.holla@arm.com> > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> > Cc: linux-acpi@vger.kernel.org > Cc: coresight@lists.linaro.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Suzuki Poulose <suzuki.poulose@arm.com> > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > drivers/acpi/acpi_amba.c | 1 - > drivers/hwtracing/coresight/coresight-etm4x-core.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c > index f5b443ab01c2..099966cbac5a 100644 > --- a/drivers/acpi/acpi_amba.c > +++ b/drivers/acpi/acpi_amba.c > @@ -22,7 +22,6 @@ > static const struct acpi_device_id amba_id_list[] = { > {"ARMH0061", 0}, /* PL061 GPIO Device */ > {"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */ > - {"ARMHC500", 0}, /* ARM CoreSight ETM4x */ > {"ARMHC501", 0}, /* ARM CoreSight ETR */ > {"ARMHC502", 0}, /* ARM CoreSight STM */ > {"ARMHC503", 0}, /* ARM CoreSight Debug */ > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 60f027e33aa0..fe494c9c6bad 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -3,6 +3,7 @@ > * Copyright (c) 2014, The Linux Foundation. All rights reserved. > */ > > +#include <linux/acpi.h> > #include <linux/bitops.h> > #include <linux/kernel.h> > #include <linux/moduleparam.h> > @@ -2344,12 +2345,21 @@ static const struct of_device_id etm4_match[] = { > {} > }; > > +#ifdef CONFIG_ACPI > +static const struct acpi_device_id etm4x_acpi_ids[] = { > + {"ARMHC500", 0}, /* ARM CoreSight ETM4x */ > + {} > +}; > +MODULE_DEVICE_TABLE(acpi, etm4x_acpi_ids); > +#endif > + > static struct platform_driver etm4_platform_driver = { > .probe = etm4_probe_platform_dev, > .remove = etm4_remove_platform_dev, > .driver = { > .name = "coresight-etm4x", > .of_match_table = etm4_match, > + .acpi_match_table = ACPI_PTR(etm4x_acpi_ids), > .suppress_bind_attrs = true, > }, > };
diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c index f5b443ab01c2..099966cbac5a 100644 --- a/drivers/acpi/acpi_amba.c +++ b/drivers/acpi/acpi_amba.c @@ -22,7 +22,6 @@ static const struct acpi_device_id amba_id_list[] = { {"ARMH0061", 0}, /* PL061 GPIO Device */ {"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */ - {"ARMHC500", 0}, /* ARM CoreSight ETM4x */ {"ARMHC501", 0}, /* ARM CoreSight ETR */ {"ARMHC502", 0}, /* ARM CoreSight STM */ {"ARMHC503", 0}, /* ARM CoreSight Debug */ diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 60f027e33aa0..fe494c9c6bad 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -3,6 +3,7 @@ * Copyright (c) 2014, The Linux Foundation. All rights reserved. */ +#include <linux/acpi.h> #include <linux/bitops.h> #include <linux/kernel.h> #include <linux/moduleparam.h> @@ -2344,12 +2345,21 @@ static const struct of_device_id etm4_match[] = { {} }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id etm4x_acpi_ids[] = { + {"ARMHC500", 0}, /* ARM CoreSight ETM4x */ + {} +}; +MODULE_DEVICE_TABLE(acpi, etm4x_acpi_ids); +#endif + static struct platform_driver etm4_platform_driver = { .probe = etm4_probe_platform_dev, .remove = etm4_remove_platform_dev, .driver = { .name = "coresight-etm4x", .of_match_table = etm4_match, + .acpi_match_table = ACPI_PTR(etm4x_acpi_ids), .suppress_bind_attrs = true, }, };