1 files changed, 4 insertions, 8 deletions

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 803bc6edfca4..67b3d0b752b7 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -957,19 +957,16 @@ static struct resource csi2_resources[] = {
         },
 };
 
-static struct platform_device csi2_device = {
-        .name   = "sh-mobile-csi2",
-        .id     = 0,
+static struct sh_mobile_ceu_companion csi2 = {
+        .id             = 0,
         .num_resources  = ARRAY_SIZE(csi2_resources),
         .resource       = csi2_resources,
-        .dev    = {
-                .platform_data = &csi2_info,
-        },
+        .platform_data  = &csi2_info,
 };
 
 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
         .flags = SH_CEU_FLAG_USE_8BIT_BUS,
-        .csi2_dev = &csi2_device.dev,
+        .csi2 = &csi2,
 };
 
 static struct resource ceu_resources[] = {
@@ -1013,7 +1010,6 @@ static struct platform_device *ap4evb_devices[] __initdata = {
         &lcdc1_device,
         &lcdc_device,
         &hdmi_device,
-        &csi2_device,
         &ceu_device,
         &ap4evb_camera,
         &meram_device,