diff options
| author | Tomasz Nowicki <tomasz.nowicki@linaro.org> | 2013-09-23 11:23:32 +0200 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-25 14:03:37 +0100 |
| commit | ad0618b69b569902e9ce5217e841fde4cb122906 (patch) | |
| tree | 78536ebd8d0b428a63a7ed605d89d4b5b1a727b4 /arch/arm64 | |
| parent | 515b32d0f3e886a7cbcf3d80974aa180bb2346b8 (diff) | |
armv8, pmu: Add the match table and pointers for ACPI probing to the driver.
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/perf_event.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index cea1594ff933..460f158cfb67 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -28,6 +28,9 @@ #include <linux/platform_device.h> #include <linux/spinlock.h> #include <linux/uaccess.h> +#ifdef CONFIG_ACPI +#include <linux/acpi.h> +#endif #include <asm/cputype.h> #include <asm/irq.h> @@ -1232,6 +1235,13 @@ static struct of_device_id armpmu_of_device_ids[] = { {}, }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id armpmu_acpi_match[] = { + { "LINA0007", }, + {}, +}; +#endif + static int armpmu_device_probe(struct platform_device *pdev) { if (!cpu_pmu) @@ -1245,6 +1255,9 @@ static struct platform_driver armpmu_driver = { .driver = { .name = "arm-pmu", .of_match_table = armpmu_of_device_ids, +#ifdef CONFIG_ACPI + .acpi_match_table = ACPI_PTR(armpmu_acpi_match), +#endif }, .probe = armpmu_device_probe, }; |