diff options
| author | Robby Cai <R63905@freescale.com> | 2012-10-09 16:49:29 +0800 |
|---|---|---|
| committer | Robby Cai <R63905@freescale.com> | 2012-10-09 17:20:20 +0800 |
| commit | edafd6a749e8bdce9ae810aee9803cbcf8b16893 (patch) | |
| tree | f5af9e3765df965d57c3cfd73e360c55be0c9772 /arch | |
| parent | 00b509821d149e5bc64667558da5c2bc43f1ad1c (diff) | |
ENGR00227502-2 mx6sl: add csi v4l2 platform device
Add csi v4l2 platform device only when 'csi' is assigned in cmdline.
Because there's pin conflicts between csi and epdc.
Signed-off-by: Robby Cai <R63905@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6sl_evk.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/board-mx6sl_evk.c b/arch/arm/mach-mx6/board-mx6sl_evk.c index e656638c31d6..9bdd6c197e5c 100644 --- a/arch/arm/mach-mx6/board-mx6sl_evk.c +++ b/arch/arm/mach-mx6/board-mx6sl_evk.c @@ -1350,6 +1350,11 @@ static struct platform_device evk_max8903_charger_1 = { }, }; +/*! Device Definition for csi v4l2 device */ +static struct platform_device csi_v4l2_devices = { + .name = "csi_v4l2", + .id = 0, +}; #define SNVS_LPCR 0x38 static void mx6_snvs_poweroff(void) @@ -1419,6 +1424,7 @@ static void __init mx6_evk_init(void) ARRAY_SIZE(mxc_i2c1_board_info)); /* only camera on I2C3, that's why we can do so */ if (csi_enabled == 1) { + mxc_register_device(&csi_v4l2_devices, NULL); imx6q_add_imx_i2c(2, &mx6_evk_i2c2_data); i2c_register_board_info(2, mxc_i2c2_board_info, ARRAY_SIZE(mxc_i2c2_board_info)); |