From patchwork Mon Aug 17 22:01:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 7027491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4A2A09F372 for ; Mon, 17 Aug 2015 22:00:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 721FB20712 for ; Mon, 17 Aug 2015 22:00:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 82F34205E5 for ; Mon, 17 Aug 2015 22:00:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZRSQP-0007rG-V8; Mon, 17 Aug 2015 21:58:37 +0000 Received: from bubo.tul.cz ([2001:718:1c01:16::aa]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZRSQN-0007YW-6L for linux-arm-kernel@lists.infradead.org; Mon, 17 Aug 2015 21:58:35 +0000 Received: from [78.80.185.17] (78-80-185-17.tmcz.cz [78.80.185.17]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by bubo.tul.cz (Postfix) with ESMTPSA id 49C1B1F0006; Mon, 17 Aug 2015 23:57:50 +0200 (CEST) From: Petr Cvek Subject: [PATCH v2 09/21] ARM: pxa: magician: Add OV9640 camera support To: robert.jarzmik@free.fr, philipp.zabel@gmail.com, daniel@zonque.org, haojian.zhuang@gmail.com, sameo@linux.intel.com, lee.jones@linaro.org, cooloney@gmail.com, rpurdie@rpsys.net, j.anaszewski@samsung.com, linux@arm.linux.org.uk, sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org References: Message-ID: <55D259A1.6090102@tul.cz> Date: Tue, 18 Aug 2015 00:01:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150817_145835_419419_B8E0CF8F X-CRM114-Status: GOOD ( 11.30 ) X-Spam-Score: -2.5 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, linux-leds@vger.kernel.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add OV9640 camera support for HTC Magician. Signed-off-by: Petr Cvek --- arch/arm/mach-pxa/magician.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 7331b34..63604e1 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -91,6 +91,9 @@ #include #include +#include +#include + #include "devices.h" #include "generic.h" @@ -634,6 +637,60 @@ static struct platform_device pasic3 = { }; /* + * SoC Camera + */ + +static struct pxacamera_platform_data magician_pxacamera_pdata = { + .flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | + PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN, + .mclk_10khz = 4800, +}; + +static int magician_camera_power(struct device *dev, int power) +{ + pr_debug("Camera power = %i\n", power); + + gpio_set_value(GPIO116_MAGICIAN_nCAM_EN, !power); + mdelay(3); + + return 0; +} + +static int magician_camera_reset(struct device *dev) +{ + pr_debug("Camera reset\n"); + + gpio_set_value(GPIO57_MAGICIAN_CAM_RESET, 1); + mdelay(3); + gpio_set_value(GPIO57_MAGICIAN_CAM_RESET, 0); + mdelay(3); + + return 0; +} + +static struct i2c_board_info magician_camera_i2c_board_info = { + I2C_BOARD_INFO("ov9640", 0x30), + .flags = I2C_CLIENT_SCCB, +}; + +static struct soc_camera_link magician_camera_iclink = { + .bus_id = 0, + .flags = SOCAM_DATAWIDTH_8, + .i2c_adapter_id = 0, + .board_info = &magician_camera_i2c_board_info, + .power = magician_camera_power, + .reset = magician_camera_reset, +}; + +static struct platform_device magician_camera = { + .name = "soc-camera-pdrv", + .id = 0, + .dev = { + .platform_data = &magician_camera_iclink, + }, +}; + +/* * USB "Transceiver" */ @@ -1038,6 +1095,7 @@ static struct platform_device *devices[] __initdata = { &gpio_vbus, &power_supply, &leds_gpio, + &magician_camera, /* NOTICE mutually exclusive with PXA I2C */ &i2c_gpio_bus_alt, @@ -1058,6 +1116,10 @@ static struct gpio magician_global_gpios[] = { "LCD VOFF enable" }, { GPIO105_MAGICIAN_LCD_VON_EN, GPIOF_OUT_INIT_HIGH, "LCD VON enable" }, + { GPIO57_MAGICIAN_CAM_RESET, GPIOF_OUT_INIT_HIGH, + "Camera reset" }, + { GPIO116_MAGICIAN_nCAM_EN, GPIOF_OUT_INIT_HIGH, + "Camera power" }, }; static void __init magician_init(void) @@ -1105,6 +1167,7 @@ static void __init magician_init(void) pxa2xx_set_spi_info(2, &magician_spi_info); spi_register_board_info(ARRAY_AND_SIZE(ads7846_spi_board_info)); + pxa_set_camera_info(&magician_pxacamera_pdata); } MACHINE_START(MAGICIAN, "HTC Magician")