rk3026: devices.c: rename device_vpu_service to device_vpu, prevent duplicate add...

diff --git a/arch/arm/mach-rk2928/devices.c b/arch/arm/mach-rk2928/devices.c
index 78b3c9dacd644842c19b954d6e0d37905ecffce1..958b55dd2cb6fdcb8d91628f80e1b4f64eabc3ef 100644 (file)
--- a/arch/arm/mach-rk2928/devices.c
+++ b/arch/arm/mach-rk2928/devices.c
@@ -819,7 +819,7 @@ static struct platform_device device_lvds = {
 };
 #endif
 
-static struct resource resource_vpu_service[] = {
+static struct resource resource_vpu[] = {
        {
                .start  = IRQ_VDPU,
                .end    = IRQ_VDPU,
@@ -839,11 +839,11 @@ static struct resource resource_vpu_service[] = {
        },
 };
 
-static struct platform_device device_vpu_service = {
-       .name           = "vpu_service",
+static struct platform_device device_vpu = {
+       .name           = "vpu",
        .id             = -1,
-       .num_resources  = ARRAY_SIZE(resource_vpu_service),
-       .resource       = resource_vpu_service,
+       .num_resources  = ARRAY_SIZE(resource_vpu),
+       .resource       = resource_vpu,
 };
 
 static int __init rk2928_init_devices(void)
@@ -880,7 +880,7 @@ static int __init rk2928_init_devices(void)
 #ifdef CONFIG_RK3026_LVDS
        platform_device_register(&device_lvds);
 #endif
-       platform_device_register(&device_vpu_service);
+       platform_device_register(&device_vpu);
 
        return 0;
 }