diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-01 10:19:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:56:08 -0400 |
commit | 6b526fed0e688e3926bd43a09f2f36cba3983ce2 (patch) | |
tree | c45123c4f78a64e54811ee46c30d3c26da8e3c9f /arch/arm/mach-shmobile | |
parent | 91c7953005247c9563408bbdbf35e27de33e6ec3 (diff) |
[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
This moves us one more step closer to eliminating the soc-camera bus
and devices on it. Besides, as a side effect, CSI-2 runtime PM on
sh-mobile secomes finer grained now: we only have to power on the
interface, when the device nodes are open.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 12 |
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[] = { | |||
957 | }, | 957 | }, |
958 | }; | 958 | }; |
959 | 959 | ||
960 | static struct platform_device csi2_device = { | 960 | static struct sh_mobile_ceu_companion csi2 = { |
961 | .name = "sh-mobile-csi2", | 961 | .id = 0, |
962 | .id = 0, | ||
963 | .num_resources = ARRAY_SIZE(csi2_resources), | 962 | .num_resources = ARRAY_SIZE(csi2_resources), |
964 | .resource = csi2_resources, | 963 | .resource = csi2_resources, |
965 | .dev = { | 964 | .platform_data = &csi2_info, |
966 | .platform_data = &csi2_info, | ||
967 | }, | ||
968 | }; | 965 | }; |
969 | 966 | ||
970 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { | 967 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { |
971 | .flags = SH_CEU_FLAG_USE_8BIT_BUS, | 968 | .flags = SH_CEU_FLAG_USE_8BIT_BUS, |
972 | .csi2_dev = &csi2_device.dev, | 969 | .csi2 = &csi2, |
973 | }; | 970 | }; |
974 | 971 | ||
975 | static struct resource ceu_resources[] = { | 972 | static struct resource ceu_resources[] = { |
@@ -1013,7 +1010,6 @@ static struct platform_device *ap4evb_devices[] __initdata = { | |||
1013 | &lcdc1_device, | 1010 | &lcdc1_device, |
1014 | &lcdc_device, | 1011 | &lcdc_device, |
1015 | &hdmi_device, | 1012 | &hdmi_device, |
1016 | &csi2_device, | ||
1017 | &ceu_device, | 1013 | &ceu_device, |
1018 | &ap4evb_camera, | 1014 | &ap4evb_camera, |
1019 | &meram_device, | 1015 | &meram_device, |