aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaresh Bhat <naresh.bhat@linaro.org>2013-11-28 11:31:28 +0530
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-28 09:20:36 +0000
commitbbf20f653272db6197488c1f1e8852e65193c0de (patch)
treedb0c53a7970dac9af0dc03f85ecd7eeffe50193c
parent15a550d62d5b73ae34b74423f29d5f04cc684cfc (diff)
downloadleg-kernel-bbf20f653272db6197488c1f1e8852e65193c0de.tar.gz
ACPI / platform: Use official HID as LNRO
Use the official HID as LNRO from temporary LINA. Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org> Acked-by: Graeme Gregory <graeme.gregory@linaro.org>
-rw-r--r--arch/arm64/kernel/perf_event.c2
-rw-r--r--drivers/acpi/acpi_platform.c10
-rw-r--r--drivers/mfd/vexpress-sysreg.c2
-rw-r--r--drivers/net/ethernet/smsc/smc91x.c2
-rw-r--r--drivers/virtio/virtio_mmio.c2
5 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index 460f158cfb67..a5d297b2f499 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -1237,7 +1237,7 @@ static struct of_device_id armpmu_of_device_ids[] = {
#ifdef CONFIG_ACPI
static const struct acpi_device_id armpmu_acpi_match[] = {
- { "LINA0007", },
+ { "LNRO0007", },
{},
};
#endif
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 74beb9418825..1359edab947c 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -31,11 +31,11 @@ static const struct acpi_device_id acpi_platform_device_ids[] = {
{ "PNP0D40" },
/* arm64 platform devices */
- { "LINA0003" }, /* smc91x for ethernet */
- { "LINA0005" }, /* virtio mmio */
- { "LINA0007" }, /* armv8 pmu */
- { "LINA0009" }, /* vexpress-sysreg */
- { "LINA000A" }, /* uart-pl011 */
+ { "LNRO0003" }, /* smc91x for ethernet */
+ { "LNRO0005" }, /* virtio mmio */
+ { "LNRO0007" }, /* armv8 pmu */
+ { "LNRO0009" }, /* vexpress-sysreg */
+ { "LNRO000A" }, /* uart-pl011 */
{ }
};
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index 9e39075d46af..31f60ff5b786 100644
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -515,7 +515,7 @@ static const struct of_device_id vexpress_sysreg_match[] = {
#ifdef CONFIG_ACPI
static const struct acpi_device_id vexpress_sysreg_acpi_match[] = {
- { "LINA0009", },
+ { "LNRO0009", },
{ }
};
#endif
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 7aa517da6da7..46f241dde065 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2387,7 +2387,7 @@ MODULE_DEVICE_TABLE(of, smc91x_match);
#ifdef CONFIG_ACPI
static const struct acpi_device_id smc91x_acpi_match[] = {
- { "LINA0003", },
+ { "LNRO0003", },
{ }
};
MODULE_DEVICE_TABLE(acpi, smc91x_acpi_match);
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 81d539f11783..39007aa1c5ef 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -637,7 +637,7 @@ MODULE_DEVICE_TABLE(of, virtio_mmio_match);
#ifdef CONFIG_ACPI
static const struct acpi_device_id virtio_mmio_acpi_match[] = {
- { "LINA0005", },
+ { "LNRO0005", },
{ }
};
MODULE_DEVICE_TABLE(acpi, virtio_mmio_acpi_match);