summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/devices/devices-common.h
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-16 16:26:20 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 10:05:41 +0800
commit27b76486a3e5be1cfd19dc59452e4185c5d43dff (patch)
tree7751490f66c7f52dc3f7e516d1fcd1b7f7076102 /arch/arm/mach-imx/devices/devices-common.h
parente51d0f0ac4b7f513808743c6a62f0387eebd0144 (diff)
downloadblackbird-op-linux-27b76486a3e5be1cfd19dc59452e4185c5d43dff.tar.gz
blackbird-op-linux-27b76486a3e5be1cfd19dc59452e4185c5d43dff.zip
media: mx2_camera: remove cpu_is_xxx by using platform_device_id
It changes the driver to use platform_device_id rather than cpu_is_xxx to determine the controller type, and updates the platform code accordingly. As the result, mach/hardware.h inclusion gets removed from the driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Tested-by: Javier Martin <javier.martin@vista-silicon.com> Cc: linux-media@vger.kernel.org
Diffstat (limited to 'arch/arm/mach-imx/devices/devices-common.h')
-rw-r--r--arch/arm/mach-imx/devices/devices-common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h
index 36eb3f09f5d7..d213da9dfd93 100644
--- a/arch/arm/mach-imx/devices/devices-common.h
+++ b/arch/arm/mach-imx/devices/devices-common.h
@@ -220,6 +220,7 @@ struct platform_device *__init imx_add_mx1_camera(
#include <linux/platform_data/camera-mx2.h>
struct imx_mx2_camera_data {
+ const char *devid;
resource_size_t iobasecsi;
resource_size_t iosizecsi;
resource_size_t irqcsi;
OpenPOWER on IntegriCloud