[ARM] pxa/pcm990: don't use pxa_camera init() callback
pxa_camera init() is ambiguous, it's better to configure PXA CIF pins statically in machine init function. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
parent
a7f2bdb39e
commit
0e85190755
1 changed files with 1 additions and 7 deletions
|
@ -359,19 +359,12 @@ static unsigned long pcm990_camera_pin_config[] = {
|
||||||
GPIO44_CIF_LV,
|
GPIO44_CIF_LV,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int pcm990_pxacamera_init(struct device *dev)
|
|
||||||
{
|
|
||||||
pxa2xx_mfp_config(ARRAY_AND_SIZE(pcm990_camera_pin_config));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CICR4: PCLK_EN: Pixel clock is supplied by the sensor
|
* CICR4: PCLK_EN: Pixel clock is supplied by the sensor
|
||||||
* MCLK_EN: Master clock is generated by PXA
|
* MCLK_EN: Master clock is generated by PXA
|
||||||
* PCP: Data sampled on the falling edge of pixel clock
|
* PCP: Data sampled on the falling edge of pixel clock
|
||||||
*/
|
*/
|
||||||
struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
|
struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
|
||||||
.init = pcm990_pxacamera_init,
|
|
||||||
.flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | PXA_CAMERA_DATAWIDTH_10 |
|
.flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | PXA_CAMERA_DATAWIDTH_10 |
|
||||||
PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN/* | PXA_CAMERA_PCP*/,
|
PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN/* | PXA_CAMERA_PCP*/,
|
||||||
.mclk_10khz = 1000,
|
.mclk_10khz = 1000,
|
||||||
|
@ -532,6 +525,7 @@ void __init pcm990_baseboard_init(void)
|
||||||
pxa_set_ac97_info(NULL);
|
pxa_set_ac97_info(NULL);
|
||||||
|
|
||||||
#if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)
|
#if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)
|
||||||
|
pxa2xx_mfp_config(ARRAY_AND_SIZE(pcm990_camera_pin_config));
|
||||||
pxa_set_camera_info(&pcm990_pxacamera_platform_data);
|
pxa_set_camera_info(&pcm990_pxacamera_platform_data);
|
||||||
|
|
||||||
i2c_register_board_info(0, ARRAY_AND_SIZE(pcm990_i2c_devices));
|
i2c_register_board_info(0, ARRAY_AND_SIZE(pcm990_i2c_devices));
|
||||||
|
|
Loading…
Reference in a new issue