diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:08:26 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:08:26 -0600 |
| commit | a26501a95959d86fc232ff2d1d62f2837318d62b (patch) | |
| tree | 4b33385d3fa501b2e11d61b49b224a0136990d19 | |
| parent | 8400f6f2d3618adc2b2bb95d483563982cbb6039 (diff) | |
CR ENGR00027945: Fix gpio_sensor_reset for imx27ads platform
and register mc521da camera in imx27 platform kconfig.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-fix_mx27_gpio_sensor.patch
| -rw-r--r-- | arch/arm/mach-mx27/mx27ads_gpio.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/mxc/capture/Kconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx27/mx27ads_gpio.c b/arch/arm/mach-mx27/mx27ads_gpio.c index 40f152e057b1..cbc197550dcc 100644 --- a/arch/arm/mach-mx27/mx27ads_gpio.c +++ b/arch/arm/mach-mx27/mx27ads_gpio.c @@ -542,10 +542,10 @@ void gpio_sensor_reset(bool flag) if (flag) { temp = 0x200; - __raw_writew(temp, PBC_BASE_ADDRESS + PBC_BCTRL1_CLEAR); + __raw_writew(temp, PBC_BCTRL2_CLEAR_REG); } else { temp = 0x200; - __raw_writew(temp, PBC_BASE_ADDRESS + PBC_BCTRL1_SET); + __raw_writew(temp, PBC_BCTRL2_SET_REG); } } diff --git a/drivers/media/video/mxc/capture/Kconfig b/drivers/media/video/mxc/capture/Kconfig index 316ead7b80c3..98169b26f09e 100644 --- a/drivers/media/video/mxc/capture/Kconfig +++ b/drivers/media/video/mxc/capture/Kconfig @@ -8,7 +8,7 @@ config VIDEO_MXC_IPU_CAMERA config VIDEO_MXC_EMMA_CAMERA tristate "MX27 eMMA support" - depends on VIDEO_MXC_CAMERA && MXC_EMMA && FB_MXC_SYNC_PANEL && MXC_CAMERA_MICRON111 + depends on VIDEO_MXC_CAMERA && MXC_EMMA && FB_MXC_SYNC_PANEL && (MXC_CAMERA_MICRON111 || MXC_CAMERA_MC521DA) select VIDEO_MXC_OPL default y |