aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Nowicki <tomasz.nowicki@linaro.org>2013-09-23 11:23:32 +0200
committerGraeme Gregory <graeme.gregory@linaro.org>2014-06-03 09:24:34 +0100
commite199f9a49c8ae6bff2a2f1add5554d90fe328011 (patch)
treee725a351b7a80b2df3ff594dae044dac68803fb4
parent99f86e210b19e0b8d3e717d3932022abe85f0edf (diff)
downloadleg-kernel-e199f9a49c8ae6bff2a2f1add5554d90fe328011.tar.gz
armv8, pmu: Add the match table and pointers for ACPI probing to the driver.
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-rw-r--r--arch/arm64/kernel/perf_event.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index baf5afb7e6a0..87d55dc13b60 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -29,6 +29,7 @@
#include <linux/platform_device.h>
#include <linux/spinlock.h>
#include <linux/uaccess.h>
+#include <linux/acpi.h>
#include <asm/cputype.h>
#include <asm/irq.h>
@@ -1281,6 +1282,13 @@ static struct of_device_id armpmu_of_device_ids[] = {
{},
};
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id armpmu_acpi_match[] = {
+ { "LNRO0007", },
+ {},
+};
+#endif
+
static int armpmu_device_probe(struct platform_device *pdev)
{
if (!cpu_pmu)
@@ -1294,6 +1302,7 @@ static struct platform_driver armpmu_driver = {
.driver = {
.name = "arm-pmu",
.of_match_table = armpmu_of_device_ids,
+ .acpi_match_table = ACPI_PTR(armpmu_acpi_match),
},
.probe = armpmu_device_probe,
};