diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-11-14 04:10:26 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-21 12:52:18 -0500 |
commit | 1b65729a186b313420123f95c50dbb919569d0c9 (patch) | |
tree | 14b3919ddebb24f0f2306eb15ffd6bef82e6caf5 /arch | |
parent | c02ef64aab828d80040b5dce934729312e698c33 (diff) |
[media] mach-omap2: remove deprecated VIDEO_OMAP2 support
The omap2 camera driver has been deprecated for a year and is now
going to be removed. It is unmaintained and it uses an internal API
that has long since been superseded by a much better API. Worse, that
internal API has been abused by out-of-kernel trees (i.MX6).
In addition, Sakari stated that these drivers have never been in a
usable state in the mainline kernel due to missing platform data.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: David Cohen <dacohen@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 324f02bf8a51..1b623a06cdcd 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -101,28 +101,6 @@ static int __init omap4_l3_init(void) | |||
101 | } | 101 | } |
102 | omap_postcore_initcall(omap4_l3_init); | 102 | omap_postcore_initcall(omap4_l3_init); |
103 | 103 | ||
104 | #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE) | ||
105 | |||
106 | static struct resource omap2cam_resources[] = { | ||
107 | { | ||
108 | .start = OMAP24XX_CAMERA_BASE, | ||
109 | .end = OMAP24XX_CAMERA_BASE + 0xfff, | ||
110 | .flags = IORESOURCE_MEM, | ||
111 | }, | ||
112 | { | ||
113 | .start = 24 + OMAP_INTC_START, | ||
114 | .flags = IORESOURCE_IRQ, | ||
115 | } | ||
116 | }; | ||
117 | |||
118 | static struct platform_device omap2cam_device = { | ||
119 | .name = "omap24xxcam", | ||
120 | .id = -1, | ||
121 | .num_resources = ARRAY_SIZE(omap2cam_resources), | ||
122 | .resource = omap2cam_resources, | ||
123 | }; | ||
124 | #endif | ||
125 | |||
126 | #if defined(CONFIG_IOMMU_API) | 104 | #if defined(CONFIG_IOMMU_API) |
127 | 105 | ||
128 | #include <linux/platform_data/iommu-omap.h> | 106 | #include <linux/platform_data/iommu-omap.h> |
@@ -245,14 +223,6 @@ int omap3_init_camera(struct isp_platform_data *pdata) | |||
245 | 223 | ||
246 | #endif | 224 | #endif |
247 | 225 | ||
248 | static inline void omap_init_camera(void) | ||
249 | { | ||
250 | #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE) | ||
251 | if (cpu_is_omap24xx()) | ||
252 | platform_device_register(&omap2cam_device); | ||
253 | #endif | ||
254 | } | ||
255 | |||
256 | #if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE) | 226 | #if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE) |
257 | static inline void __init omap_init_mbox(void) | 227 | static inline void __init omap_init_mbox(void) |
258 | { | 228 | { |
@@ -431,7 +401,6 @@ static int __init omap2_init_devices(void) | |||
431 | * in alphabetical order so they're easier to sort through. | 401 | * in alphabetical order so they're easier to sort through. |
432 | */ | 402 | */ |
433 | omap_init_audio(); | 403 | omap_init_audio(); |
434 | omap_init_camera(); | ||
435 | /* If dtb is there, the devices will be created dynamically */ | 404 | /* If dtb is there, the devices will be created dynamically */ |
436 | if (!of_have_populated_dt()) { | 405 | if (!of_have_populated_dt()) { |
437 | omap_init_mbox(); | 406 | omap_init_mbox(); |