On 11/27/2013 11:01 PM, naresh.bhat@linaro.org wrote:

From: Naresh Bhat naresh.bhat@linaro.org

Use the official HID as LNRO from temporary LINA.

Signed-off-by: Naresh Bhat naresh.bhat@linaro.org

arch/arm64/kernel/perf_event.c | 2 +- drivers/acpi/acpi_platform.c | 10 +++++----- drivers/mfd/vexpress-sysreg.c | 2 +- drivers/net/ethernet/smsc/smc91x.c | 2 +- drivers/virtio/virtio_mmio.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 460f158..a5d297b 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 74beb94..1359eda 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 9e39075..31f60ff 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 7aa517d..46f241d 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 81d539f..39007aa 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);

Acked-by: Al Stone al.stone@linaro.org