From patchwork Wed Aug 15 13:30:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10566575 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BDF7A1515 for ; Wed, 15 Aug 2018 13:30:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD86B2A06B for ; Wed, 15 Aug 2018 13:30:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB9AE2A16B; Wed, 15 Aug 2018 13:30:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 874952A1A8 for ; Wed, 15 Aug 2018 13:30:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729309AbeHOQW3 (ORCPT ); Wed, 15 Aug 2018 12:22:29 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:37322 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728885AbeHOQW3 (ORCPT ); Wed, 15 Aug 2018 12:22:29 -0400 Received: by mail-wm0-f66.google.com with SMTP id n11-v6so1354007wmc.2 for ; Wed, 15 Aug 2018 06:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oZ9wOUXXnQ1xL64JrNd5zewpQUEFr9szVvDvJOcA3SM=; b=TxaLLkV9437epLczXuKqBDS214aUSgGRsrpz9R/T9vAKy2yVgVq1Y9Mm/Sb6+lf5+1 Y8TWm1l6BNkefT1SW6o23XnTxzxqhgm5gjmoEPBEV1XQbr5L0aviPUqbNVdVbDQ7gEvV XASgojSn1rxKeWUNHAwEPcUHgqhI96Cf5kDkd/KxFu7xnrB40pPxCIc+teMBIQdYES2n yP/yxVbyrz0VmjxS39Nyhz3v0W2JT0iH1DhurZKu4TgfS971L7Og6epsF50uoLzmcBQk 2yNoqtZIF72k85Kq/fX0BEEYk3cU8x0r7xPo1L6UvmtG1E1x5V9WWPZ/6h6suBvgWfaz /zlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oZ9wOUXXnQ1xL64JrNd5zewpQUEFr9szVvDvJOcA3SM=; b=G4pZPmBKJncgRNrGepAUqM95vaBWwazaWWIRADbWDLAVC3kaC8iJoaFw7rS26g2/Ee epXwzl131/VUFL3PRqo5W8OqrNsLvvfXDopPi5Ux8Ws5sbjm7qgJoPn3ykSutNWEwasp gZ7g7FMmzOQfMdao0oApMytrLtxpxvDJeb46OTDFIa5r9sT+EJbogrhk3ALb3U/8XKql sDNUEHECX4+20VmmbTm/c4Qu8dFJtFNgXAfX7Qze5RYgNQl3nl1WAe0lwJ4Eu/eu2nI0 SDLkTIhgQzC3P7ieX1qYWDITl2qPGjA6W+lH2wfQ5lRAJft/uZhOJzk2sXOqSUADimCO nJpA== X-Gm-Message-State: AOUpUlHVGQc1AQ55lRSHMtGtRqI6bP9qpqMRBHRVypyApfQ+xv85I8uV vMjcBjrJ7/KxCF85C0+h+5J+o0Mrrls= X-Google-Smtp-Source: AA+uWPw1lwC/jjpm3mxJf36PeDyr0njSbmEPHg3G9In2/LT2pdJ7N4nl2euO6ScCsLcdGDnvDbXs4A== X-Received: by 2002:a1c:6d9a:: with SMTP id b26-v6mr12482165wmi.74.1534339816403; Wed, 15 Aug 2018 06:30:16 -0700 (PDT) Received: from kontron.lan ([2001:1ae9:ff1:f191:3944:7b93:9d06:9719]) by smtp.gmail.com with ESMTPSA id g133-v6sm2416005wmf.44.2018.08.15.06.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 06:30:15 -0700 (PDT) From: petrcvekcz@gmail.com X-Google-Original-From: petrcvekcz.gmail.com To: hans.verkuil@cisco.com, jacopo@jmondi.org, mchehab@kernel.org, marek.vasut@gmail.com Cc: Petr Cvek , linux-media@vger.kernel.org, robert.jarzmik@free.fr, slapin@ossfans.org, philipp.zabel@gmail.com Subject: [PATCH v2 2/4] media: i2c: ov9640: drop soc_camera code and switch to v4l2_async Date: Wed, 15 Aug 2018 15:30:25 +0200 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Petr Cvek This patch removes the dependency on an obsoleted soc_camera from ov9640 driver and changes the code to be a standalone v4l2 async subdevice. It also adds GPIO allocations for power and reset signals (as they are not handled by soc_camera now). The values for waiting on GPIOs (reset and power) settling down were taken from the datasheet (> 1 ms after HW/SW reset). The upper limit was chosen as an arbitrary value. Also one occurrence of mdelay() was changed to msleep(). The delays were successfully tested on a real hardware. The patch makes ov9640 sensor again compatible with the pxa_camera driver. Signed-off-by: Petr Cvek --- drivers/media/i2c/ov9640.c | 76 ++++++++++++++++++++++++++------------ drivers/media/i2c/ov9640.h | 2 + 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c index c63948989688..ae55d13233f0 100644 --- a/drivers/media/i2c/ov9640.c +++ b/drivers/media/i2c/ov9640.c @@ -9,6 +9,7 @@ * Kuninori Morimoto * * Based on ov7670 and soc_camera_platform driver, + * transition from soc_camera to pxa_camera based on mt9m111 * * Copyright 2006-7 Jonathan Corbet * Copyright (C) 2008 Magnus Damm @@ -27,10 +28,14 @@ #include #include -#include +#include #include #include #include +#include +#include + +#include #include "ov9640.h" @@ -323,11 +328,23 @@ static int ov9640_set_register(struct v4l2_subdev *sd, static int ov9640_s_power(struct v4l2_subdev *sd, int on) { - struct i2c_client *client = v4l2_get_subdevdata(sd); - struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); struct ov9640_priv *priv = to_ov9640_sensor(sd); - - return soc_camera_set_power(&client->dev, ssdd, priv->clk, on); + int ret = 0; + + if (on) { + gpiod_set_value(priv->gpio_power, 1); + usleep_range(1000, 2000); + ret = v4l2_clk_enable(priv->clk); + usleep_range(1000, 2000); + gpiod_set_value(priv->gpio_reset, 0); + } else { + gpiod_set_value(priv->gpio_reset, 1); + usleep_range(1000, 2000); + v4l2_clk_disable(priv->clk); + usleep_range(1000, 2000); + gpiod_set_value(priv->gpio_power, 0); + } + return ret; } /* select nearest higher resolution for capture */ @@ -475,7 +492,7 @@ static int ov9640_prog_dflt(struct i2c_client *client) } /* wait for the changes to actually happen, 140ms are not enough yet */ - mdelay(150); + msleep(150); return 0; } @@ -631,14 +648,10 @@ static const struct v4l2_subdev_core_ops ov9640_core_ops = { static int ov9640_g_mbus_config(struct v4l2_subdev *sd, struct v4l2_mbus_config *cfg) { - struct i2c_client *client = v4l2_get_subdevdata(sd); - struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); - cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH; cfg->type = V4L2_MBUS_PARALLEL; - cfg->flags = soc_camera_apply_board_flags(ssdd, cfg); return 0; } @@ -667,18 +680,27 @@ static int ov9640_probe(struct i2c_client *client, const struct i2c_device_id *did) { struct ov9640_priv *priv; - struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); int ret; - if (!ssdd) { - dev_err(&client->dev, "Missing platform_data for driver\n"); - return -EINVAL; - } - - priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL); + priv = devm_kzalloc(&client->dev, sizeof(*priv), + GFP_KERNEL); if (!priv) return -ENOMEM; + priv->gpio_power = devm_gpiod_get(&client->dev, "Camera power", + GPIOD_OUT_LOW); + if (IS_ERR_OR_NULL(priv->gpio_power)) { + ret = PTR_ERR(priv->gpio_power); + return ret; + } + + priv->gpio_reset = devm_gpiod_get(&client->dev, "Camera reset", + GPIOD_OUT_HIGH); + if (IS_ERR_OR_NULL(priv->gpio_reset)) { + ret = PTR_ERR(priv->gpio_reset); + return ret; + } + v4l2_i2c_subdev_init(&priv->subdev, client, &ov9640_subdev_ops); v4l2_ctrl_handler_init(&priv->hdl, 2); @@ -697,12 +719,20 @@ static int ov9640_probe(struct i2c_client *client, } ret = ov9640_video_probe(client); - if (ret) { - v4l2_clk_put(priv->clk); -eclkget: - v4l2_ctrl_handler_free(&priv->hdl); - } + if (ret) + goto eprobe; + priv->subdev.dev = &client->dev; + ret = v4l2_async_register_subdev(&priv->subdev); + if (ret) + goto eprobe; + + return 0; + +eprobe: + v4l2_clk_put(priv->clk); +eclkget: + v4l2_ctrl_handler_free(&priv->hdl); return ret; } @@ -712,7 +742,7 @@ static int ov9640_remove(struct i2c_client *client) struct ov9640_priv *priv = to_ov9640_sensor(sd); v4l2_clk_put(priv->clk); - v4l2_device_unregister_subdev(&priv->subdev); + v4l2_async_unregister_subdev(&priv->subdev); v4l2_ctrl_handler_free(&priv->hdl); return 0; } diff --git a/drivers/media/i2c/ov9640.h b/drivers/media/i2c/ov9640.h index 65d13ff17536..be5e4b29ac69 100644 --- a/drivers/media/i2c/ov9640.h +++ b/drivers/media/i2c/ov9640.h @@ -200,6 +200,8 @@ struct ov9640_priv { struct v4l2_subdev subdev; struct v4l2_ctrl_handler hdl; struct v4l2_clk *clk; + struct gpio_desc *gpio_power; + struct gpio_desc *gpio_reset; int model; int revision;