From patchwork Wed Nov 4 20:47:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 1971 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Wed, 04 Nov 2009 20:47:58 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Wed, 04 Nov 2009 18:48:21 -0200 (BRST) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1N5mlp-0002bx-Ox; Wed, 04 Nov 2009 20:47:58 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758155AbZKDUru (ORCPT + 1 other); Wed, 4 Nov 2009 15:47:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757271AbZKDUru (ORCPT ); Wed, 4 Nov 2009 15:47:50 -0500 Received: from smtp-OUT05A.alice.it ([85.33.3.5]:3802 "EHLO smtp-OUT05A.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757253AbZKDUru (ORCPT ); Wed, 4 Nov 2009 15:47:50 -0500 Received: from FBCMMO01.fbc.local ([192.168.68.195]) by smtp-OUT05A.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Wed, 4 Nov 2009 21:47:53 +0100 Received: from FBCMCL01B02.fbc.local ([192.168.69.83]) by FBCMMO01.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Wed, 4 Nov 2009 21:47:53 +0100 Received: from badebec ([87.10.137.149]) by FBCMCL01B02.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Wed, 4 Nov 2009 21:47:52 +0100 Received: by badebec with local (Exim 4.69) (envelope-from ) id 1N5mli-0003vM-Si; Wed, 04 Nov 2009 21:47:50 +0100 From: Antonio Ospite To: linux-arm-kernel@lists.infradead.org Cc: Antonio Ospite , Eric Miao , openezx-devel@lists.openezx.org, Bart Visscher , linux-media@vger.kernel.org, Guennadi Liakhovetski Subject: [PATCH 1/3 v2] ezx: Add camera support for A780 and A910 EZX phones Date: Wed, 4 Nov 2009 21:47:30 +0100 Message-Id: <1257367650-15056-1-git-send-email-ospite@studenti.unina.it> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: References: X-OriginalArrivalTime: 04 Nov 2009 20:47:52.0834 (UTC) FILETIME=[14284E20:01CA5D90] Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Antonio Ospite Signed-off-by: Bart Visscher --- Changes since previous version: Addressed all the comments from Eric and Guennadi. CAM_RST gpios are different for different platform generations, as also shown in current MFP pins setup. arch/arm/mach-pxa/ezx.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 164 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index 588b265..7cfd633 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c @@ -17,8 +17,11 @@ #include #include #include +#include #include +#include + #include #include #include @@ -29,6 +32,7 @@ #include #include #include +#include #include "devices.h" #include "generic.h" @@ -38,6 +42,9 @@ #define GPIO15_A910_FLIP_LID 15 #define GPIO12_E680_LOCK_SWITCH 12 #define GPIO15_E6_LOCK_SWITCH 15 +#define GPIO50_nCAM_EN 50 +#define GPIO19_GEN1_CAM_RST 19 +#define GPIO28_GEN2_CAM_RST 28 static struct platform_pwm_backlight_data ezx_backlight_data = { .pwm_id = 0, @@ -683,8 +690,85 @@ static struct platform_device a780_gpio_keys = { }, }; +/* camera */ +static int a780_pxacamera_init(struct device *dev) +{ + int err; + + /* + * GPIO50_nCAM_EN is active low + * GPIO19_GEN1_CAM_RST is active high + */ + err = gpio_request(GPIO50_nCAM_EN, "nCAM_EN"); + if (err) { + pr_err("%s: Failed to request nCAM_EN\n", __func__); + goto fail; + } + + err = gpio_request(GPIO19_GEN1_CAM_RST, "CAM_RST"); + if (err) { + pr_err("%s: Failed to request CAM_RST\n", __func__); + goto fail_gpio_cam_rst; + } + + gpio_direction_output(GPIO50_nCAM_EN, 0); + gpio_direction_output(GPIO19_GEN1_CAM_RST, 1); + + return 0; + +fail_gpio_cam_rst: + gpio_free(GPIO50_nCAM_EN); +fail: + return err; +} + +static int a780_pxacamera_power(struct device *dev, int on) +{ + gpio_set_value(GPIO50_nCAM_EN, !on); + return 0; +} + +static int a780_pxacamera_reset(struct device *dev) +{ + gpio_set_value(GPIO19_GEN1_CAM_RST, 0); + msleep(10); + gpio_set_value(GPIO19_GEN1_CAM_RST, 1); + + return 0; +} + +struct pxacamera_platform_data a780_pxacamera_platform_data = { + .init = a780_pxacamera_init, + .flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | + PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN, + .mclk_10khz = 5000, +}; + +static struct i2c_board_info a780_camera_i2c_board_info = { + I2C_BOARD_INFO("mt9m111", 0x5d), +}; + +static struct soc_camera_link a780_iclink = { + .bus_id = 0, + .flags = SOCAM_SENSOR_INVERT_PCLK, + .i2c_adapter_id = 0, + .board_info = &a780_camera_i2c_board_info, + .module_name = "mt9m111", + .power = a780_pxacamera_power, + .reset = a780_pxacamera_reset, +}; + +static struct platform_device a780_camera = { + .name = "soc-camera-pdrv", + .id = 0, + .dev = { + .platform_data = &a780_iclink, + }, +}; + static struct platform_device *a780_devices[] __initdata = { &a780_gpio_keys, + &a780_camera, }; static void __init a780_init(void) @@ -699,6 +783,8 @@ static void __init a780_init(void) pxa_set_keypad_info(&a780_keypad_platform_data); + pxa_set_camera_info(&a780_pxacamera_platform_data); + platform_add_devices(ARRAY_AND_SIZE(ezx_devices)); platform_add_devices(ARRAY_AND_SIZE(a780_devices)); } @@ -864,8 +950,84 @@ static struct platform_device a910_gpio_keys = { }, }; +/* camera */ +static int a910_pxacamera_init(struct device *dev) +{ + int err; + + /* + * GPIO50_nCAM_EN is active low + * GPIO28_GEN2_CAM_RST is active high + */ + err = gpio_request(GPIO50_nCAM_EN, "nCAM_EN"); + if (err) { + pr_err("%s: Failed to request nCAM_EN\n", __func__); + goto fail; + } + + err = gpio_request(GPIO28_GEN2_CAM_RST, "CAM_RST"); + if (err) { + pr_err("%s: Failed to request CAM_RST\n", __func__); + goto fail_gpio_cam_rst; + } + + gpio_direction_output(GPIO50_nCAM_EN, 0); + gpio_direction_output(GPIO28_GEN2_CAM_RST, 1); + + return 0; + +fail_gpio_cam_rst: + gpio_free(GPIO50_nCAM_EN); +fail: + return err; +} + +static int a910_pxacamera_power(struct device *dev, int on) +{ + gpio_set_value(GPIO50_nCAM_EN, !on); + return 0; +} + +static int a910_pxacamera_reset(struct device *dev) +{ + gpio_set_value(GPIO28_GEN2_CAM_RST, 0); + msleep(10); + gpio_set_value(GPIO28_GEN2_CAM_RST, 1); + + return 0; +} + +struct pxacamera_platform_data a910_pxacamera_platform_data = { + .init = a910_pxacamera_init, + .flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | + PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN, + .mclk_10khz = 5000, +}; + +static struct i2c_board_info a910_camera_i2c_board_info = { + I2C_BOARD_INFO("mt9m111", 0x5d), +}; + +static struct soc_camera_link a910_iclink = { + .bus_id = 0, + .i2c_adapter_id = 0, + .board_info = &a910_camera_i2c_board_info, + .module_name = "mt9m111", + .power = a910_pxacamera_power, + .reset = a910_pxacamera_reset, +}; + +static struct platform_device a910_camera = { + .name = "soc-camera-pdrv", + .id = 0, + .dev = { + .platform_data = &a910_iclink, + }, +}; + static struct platform_device *a910_devices[] __initdata = { &a910_gpio_keys, + &a910_camera, }; static void __init a910_init(void) @@ -880,6 +1042,8 @@ static void __init a910_init(void) pxa_set_keypad_info(&a910_keypad_platform_data); + pxa_set_camera_info(&a910_pxacamera_platform_data); + platform_add_devices(ARRAY_AND_SIZE(ezx_devices)); platform_add_devices(ARRAY_AND_SIZE(a910_devices)); }