aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-07-26 17:55:02 +0100
committerGraeme Gregory <graeme.gregory@linaro.org>2014-06-03 09:24:33 +0100
commit99f86e210b19e0b8d3e717d3932022abe85f0edf (patch)
tree5f5035e9eff49c42a84d95703ab34138e0c7ca2c
parente8ee9a7b7d60958e6778945f6f958dd297c077b9 (diff)
downloadleg-kernel-99f86e210b19e0b8d3e717d3932022abe85f0edf.tar.gz
virtio-mmio: add ACPI probing
Added the match table and pointers for ACPI probing to the driver. Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-rw-r--r--drivers/virtio/virtio_mmio.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index c600ccfd6922..10c4775368b7 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -100,8 +100,7 @@
#include <linux/virtio_config.h>
#include <linux/virtio_mmio.h>
#include <linux/virtio_ring.h>
-
-
+#include <linux/acpi.h>
/* The alignment to use between consumer and producer parts of vring.
* Currently hardcoded to the page size. */
@@ -637,6 +636,14 @@ static struct of_device_id virtio_mmio_match[] = {
};
MODULE_DEVICE_TABLE(of, virtio_mmio_match);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id virtio_mmio_acpi_match[] = {
+ { "LNRO0005", },
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, virtio_mmio_acpi_match);
+#endif
+
static struct platform_driver virtio_mmio_driver = {
.probe = virtio_mmio_probe,
.remove = virtio_mmio_remove,
@@ -644,6 +651,7 @@ static struct platform_driver virtio_mmio_driver = {
.name = "virtio-mmio",
.owner = THIS_MODULE,
.of_match_table = virtio_mmio_match,
+ .acpi_match_table = ACPI_PTR(virtio_mmio_acpi_match),
},
};