| Message ID | 20190726160839.12478-1-suzuki.poulose@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6c87bedc9e9c922093bec602687d991669eccc64 |
| Headers | show |
| Series | coresight: acpi: Static funnel support | expand |
On Fri, 26 Jul 2019 at 10:08, Suzuki K Poulose <suzuki.poulose@arm.com> wrote: > > The ACPI bindings for CoreSight has been updated to add the device > id for non-programmable CoreSight funnels (aka static funnels) as of > v1.1 [0]. Add the ACPI id for static funnels in the driver. > > [0] https://static.docs.arm.com/den0067/a/DEN0067_CoreSight_ACPI_1.1.pdf > > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> > --- > drivers/hwtracing/coresight/coresight-funnel.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c > index fa97cb9ab4f9..0c99848a5d69 100644 > --- a/drivers/hwtracing/coresight/coresight-funnel.c > +++ b/drivers/hwtracing/coresight/coresight-funnel.c > @@ -5,6 +5,7 @@ > * Description: CoreSight Funnel driver > */ > > +#include <linux/acpi.h> > #include <linux/kernel.h> > #include <linux/init.h> > #include <linux/types.h> > @@ -302,11 +303,19 @@ static const struct of_device_id static_funnel_match[] = { > {} > }; > > +#ifdef CONFIG_ACPI > +static const struct acpi_device_id static_funnel_ids[] = { > + {"ARMHC9FE", 0}, > + {}, > +}; > +#endif > + > static struct platform_driver static_funnel_driver = { > .probe = static_funnel_probe, > .driver = { > .name = "coresight-static-funnel", > .of_match_table = static_funnel_match, > + .acpi_match_table = ACPI_PTR(static_funnel_ids), > .pm = &funnel_dev_pm_ops, > .suppress_bind_attrs = true, > }, I haved also applied this patch. Mathieu > -- > 2.21.0 >
diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index fa97cb9ab4f9..0c99848a5d69 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -5,6 +5,7 @@ * Description: CoreSight Funnel driver */ +#include <linux/acpi.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/types.h> @@ -302,11 +303,19 @@ static const struct of_device_id static_funnel_match[] = { {} }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id static_funnel_ids[] = { + {"ARMHC9FE", 0}, + {}, +}; +#endif + static struct platform_driver static_funnel_driver = { .probe = static_funnel_probe, .driver = { .name = "coresight-static-funnel", .of_match_table = static_funnel_match, + .acpi_match_table = ACPI_PTR(static_funnel_ids), .pm = &funnel_dev_pm_ops, .suppress_bind_attrs = true, },
The ACPI bindings for CoreSight has been updated to add the device id for non-programmable CoreSight funnels (aka static funnels) as of v1.1 [0]. Add the ACPI id for static funnels in the driver. [0] https://static.docs.arm.com/den0067/a/DEN0067_CoreSight_ACPI_1.1.pdf Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> --- drivers/hwtracing/coresight/coresight-funnel.c | 9 +++++++++ 1 file changed, 9 insertions(+)