From patchwork Thu Dec 13 15:39:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10728993 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 599921759 for ; Thu, 13 Dec 2018 15:39:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 462852C2CB for ; Thu, 13 Dec 2018 15:39:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 394F42C43E; Thu, 13 Dec 2018 15:39:11 +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 871682C2CB for ; Thu, 13 Dec 2018 15:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729135AbeLMPjJ (ORCPT ); Thu, 13 Dec 2018 10:39:09 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:43481 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726150AbeLMPjI (ORCPT ); Thu, 13 Dec 2018 10:39:08 -0500 Received: by mail-lf1-f68.google.com with SMTP id u18so1881436lff.10 for ; Thu, 13 Dec 2018 07:39:06 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=eTF+sYSSeYeOGrBNwXwA41PJWgk/VhNUS5rTrDQx6rY=; b=R+tcJqmmcZHhFemuPnLfIConLnXxitjowIFDorV2MRGwsVJZaNFoE8VF69R0YDIsVI yrZYF4Gw5RtYehicwALo8MQttrm+HXRism8yRqAVgTwm3A0wFqzFK2Kf9CR5uV2PAJxg AcD3Zj201aterMso+MvQmAxu9BsaZ6+3XBZUlPWx+k1FxHrfiwVdKh2i25p0e46EGWXS IOrp6oHxbbXvjus6D3R0lxLWk3sRk52GiDMiZC3JvkquzCpdSicyIF2SJIzOjVHA3Znx scbr7+ecSwRtbQM3dA4CLk+HZ49+11krdyEGBFvLO1uX18ac++DPCfIGrDGXHqTwpt3Q 7d4g== 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:mime-version:content-transfer-encoding; bh=eTF+sYSSeYeOGrBNwXwA41PJWgk/VhNUS5rTrDQx6rY=; b=a0nYEVUgCPOb3QFuF1AvCOiKKW5W2TBN8PQTsczhXtRPkk98LudhCjJXL+8LHXSZZS rPkE5mZX9n1P9dBPFeV0C/eMHN7O/OC+JOdGwGI5iPL0GeOyy4W2jxOo7mhvlBa2jKGh CwTFof/tDWoPLDjBOKohl4rG8MbBf3F/zp3fJm9y6YYvVWEZBKeLzJhemUZKvAR6x4QG iSKi36jlSawtT7GrelVGFhGhY+hRdsYcTThWg1La7NDIzz0O5ym8HFkuRRdriaxfYa/g QHniJ90VmvD8lTt6nSBWnoLGuqlur+XpVsMpmJDYLrokW21GEelohz/aRgG4jxvZReRK Rm0g== X-Gm-Message-State: AA+aEWacmzp00bLkQNWfWXLokiqj+Ur3TDbXpACF+SOvYbIVYHXHBNTD wNYUxQYOASWXq21cgRbEX7s= X-Google-Smtp-Source: AFSGD/XEnuxpu4rlBVZRFP3h6c513cXFR8v8zONWegMy6dwkghr5GqI4NjQyXsFqY7IiXibjTSOkyg== X-Received: by 2002:a19:d8d8:: with SMTP id r85mr1055582lfi.92.1544715544980; Thu, 13 Dec 2018 07:39:04 -0800 (PST) Received: from kontron.lan (2001-1ae9-0ff1-f191-41f2-812a-df1c-0485.ip6.tmcz.cz. [2001:1ae9:ff1:f191:41f2:812a:df1c:485]) by smtp.gmail.com with ESMTPSA id q67sm412869lfe.19.2018.12.13.07.39.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 07:39:04 -0800 (PST) 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, sakari.ailus@iki.fi Subject: [PATCH v3 1/8] media: soc_camera: ov9640: move ov9640 out of soc_camera Date: Thu, 13 Dec 2018 16:39:12 +0100 Message-Id: <21fca7a936b3bdd1861f93312180f5cc2268ac6c.1544713575.git.petrcvekcz@gmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: References: MIME-Version: 1.0 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 Initial part of ov9640 transition from soc_camera subsystem to a standalone v4l2 subdevice. The soc_camera version seems to be used only in Palm Zire72 and in (the future) HTC Magician. On these two devices the support is broken as pxa_camera driver doesn't use soc_camera anymore. The other mentions from git grep are "TODOs" (in board-osk.c) or chip names for unsupported sensors on HW which doesn't use soc_camera at all (irelevant). Copy the driver files from soc_camera and mark the original ones in the Kconfig description as obsoleted. Add config option VIDEO_OV9640 to the build files in drivers/media/i2c. Signed-off-by: Petr Cvek --- drivers/media/i2c/Kconfig | 7 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/ov9640.c | 738 +++++++++++++++++++++++++++ drivers/media/i2c/ov9640.h | 208 ++++++++ drivers/media/i2c/soc_camera/Kconfig | 6 +- 5 files changed, 958 insertions(+), 2 deletions(-) create mode 100644 drivers/media/i2c/ov9640.c create mode 100644 drivers/media/i2c/ov9640.h diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 4c936e129500..119aaee5318b 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -820,6 +820,13 @@ config VIDEO_OV7740 This is a Video4Linux2 sensor driver for the OmniVision OV7740 VGA camera sensor. +config VIDEO_OV9640 + tristate "OmniVision OV9640 sensor support" + depends on I2C && VIDEO_V4L2 + help + This is a Video4Linux2 sensor driver for the OmniVision + OV9640 camera sensor. + config VIDEO_OV9650 tristate "OmniVision OV9650/OV9652 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index 65fae7732de0..5639cb2f20aa 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -78,6 +78,7 @@ obj-$(CONFIG_VIDEO_OV7640) += ov7640.o obj-$(CONFIG_VIDEO_OV7670) += ov7670.o obj-$(CONFIG_VIDEO_OV772X) += ov772x.o obj-$(CONFIG_VIDEO_OV7740) += ov7740.o +obj-$(CONFIG_VIDEO_OV9640) += ov9640.o obj-$(CONFIG_VIDEO_OV9650) += ov9650.o obj-$(CONFIG_VIDEO_OV13858) += ov13858.o obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c new file mode 100644 index 000000000000..eb91b8240083 --- /dev/null +++ b/drivers/media/i2c/ov9640.c @@ -0,0 +1,738 @@ +/* + * OmniVision OV96xx Camera Driver + * + * Copyright (C) 2009 Marek Vasut + * + * Based on ov772x camera driver: + * + * Copyright (C) 2008 Renesas Solutions Corp. + * Kuninori Morimoto + * + * Based on ov7670 and soc_camera_platform driver, + * + * Copyright 2006-7 Jonathan Corbet + * Copyright (C) 2008 Magnus Damm + * Copyright (C) 2008, Guennadi Liakhovetski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "ov9640.h" + +#define to_ov9640_sensor(sd) container_of(sd, struct ov9640_priv, subdev) + +/* default register setup */ +static const struct ov9640_reg ov9640_regs_dflt[] = { + { OV9640_COM5, OV9640_COM5_SYSCLK | OV9640_COM5_LONGEXP }, + { OV9640_COM6, OV9640_COM6_OPT_BLC | OV9640_COM6_ADBLC_BIAS | + OV9640_COM6_FMT_RST | OV9640_COM6_ADBLC_OPTEN }, + { OV9640_PSHFT, OV9640_PSHFT_VAL(0x01) }, + { OV9640_ACOM, OV9640_ACOM_2X_ANALOG | OV9640_ACOM_RSVD }, + { OV9640_TSLB, OV9640_TSLB_YUYV_UYVY }, + { OV9640_COM16, OV9640_COM16_RB_AVG }, + + /* Gamma curve P */ + { 0x6c, 0x40 }, { 0x6d, 0x30 }, { 0x6e, 0x4b }, { 0x6f, 0x60 }, + { 0x70, 0x70 }, { 0x71, 0x70 }, { 0x72, 0x70 }, { 0x73, 0x70 }, + { 0x74, 0x60 }, { 0x75, 0x60 }, { 0x76, 0x50 }, { 0x77, 0x48 }, + { 0x78, 0x3a }, { 0x79, 0x2e }, { 0x7a, 0x28 }, { 0x7b, 0x22 }, + + /* Gamma curve T */ + { 0x7c, 0x04 }, { 0x7d, 0x07 }, { 0x7e, 0x10 }, { 0x7f, 0x28 }, + { 0x80, 0x36 }, { 0x81, 0x44 }, { 0x82, 0x52 }, { 0x83, 0x60 }, + { 0x84, 0x6c }, { 0x85, 0x78 }, { 0x86, 0x8c }, { 0x87, 0x9e }, + { 0x88, 0xbb }, { 0x89, 0xd2 }, { 0x8a, 0xe6 }, +}; + +/* Configurations + * NOTE: for YUV, alter the following registers: + * COM12 |= OV9640_COM12_YUV_AVG + * + * for RGB, alter the following registers: + * COM7 |= OV9640_COM7_RGB + * COM13 |= OV9640_COM13_RGB_AVG + * COM15 |= proper RGB color encoding mode + */ +static const struct ov9640_reg ov9640_regs_qqcif[] = { + { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x0f) }, + { OV9640_COM1, OV9640_COM1_QQFMT | OV9640_COM1_HREF_2SKIP }, + { OV9640_COM4, OV9640_COM4_QQ_VP | OV9640_COM4_RSVD }, + { OV9640_COM7, OV9640_COM7_QCIF }, + { OV9640_COM12, OV9640_COM12_RSVD }, + { OV9640_COM13, OV9640_COM13_GAMMA_RAW | OV9640_COM13_MATRIX_EN }, + { OV9640_COM15, OV9640_COM15_OR_10F0 }, +}; + +static const struct ov9640_reg ov9640_regs_qqvga[] = { + { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x07) }, + { OV9640_COM1, OV9640_COM1_QQFMT | OV9640_COM1_HREF_2SKIP }, + { OV9640_COM4, OV9640_COM4_QQ_VP | OV9640_COM4_RSVD }, + { OV9640_COM7, OV9640_COM7_QVGA }, + { OV9640_COM12, OV9640_COM12_RSVD }, + { OV9640_COM13, OV9640_COM13_GAMMA_RAW | OV9640_COM13_MATRIX_EN }, + { OV9640_COM15, OV9640_COM15_OR_10F0 }, +}; + +static const struct ov9640_reg ov9640_regs_qcif[] = { + { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x07) }, + { OV9640_COM4, OV9640_COM4_QQ_VP | OV9640_COM4_RSVD }, + { OV9640_COM7, OV9640_COM7_QCIF }, + { OV9640_COM12, OV9640_COM12_RSVD }, + { OV9640_COM13, OV9640_COM13_GAMMA_RAW | OV9640_COM13_MATRIX_EN }, + { OV9640_COM15, OV9640_COM15_OR_10F0 }, +}; + +static const struct ov9640_reg ov9640_regs_qvga[] = { + { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x03) }, + { OV9640_COM4, OV9640_COM4_QQ_VP | OV9640_COM4_RSVD }, + { OV9640_COM7, OV9640_COM7_QVGA }, + { OV9640_COM12, OV9640_COM12_RSVD }, + { OV9640_COM13, OV9640_COM13_GAMMA_RAW | OV9640_COM13_MATRIX_EN }, + { OV9640_COM15, OV9640_COM15_OR_10F0 }, +}; + +static const struct ov9640_reg ov9640_regs_cif[] = { + { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x03) }, + { OV9640_COM3, OV9640_COM3_VP }, + { OV9640_COM7, OV9640_COM7_CIF }, + { OV9640_COM12, OV9640_COM12_RSVD }, + { OV9640_COM13, OV9640_COM13_GAMMA_RAW | OV9640_COM13_MATRIX_EN }, + { OV9640_COM15, OV9640_COM15_OR_10F0 }, +}; + +static const struct ov9640_reg ov9640_regs_vga[] = { + { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x01) }, + { OV9640_COM3, OV9640_COM3_VP }, + { OV9640_COM7, OV9640_COM7_VGA }, + { OV9640_COM12, OV9640_COM12_RSVD }, + { OV9640_COM13, OV9640_COM13_GAMMA_RAW | OV9640_COM13_MATRIX_EN }, + { OV9640_COM15, OV9640_COM15_OR_10F0 }, +}; + +static const struct ov9640_reg ov9640_regs_sxga[] = { + { OV9640_CLKRC, OV9640_CLKRC_DPLL_EN | OV9640_CLKRC_DIV(0x01) }, + { OV9640_COM3, OV9640_COM3_VP }, + { OV9640_COM7, 0 }, + { OV9640_COM12, OV9640_COM12_RSVD }, + { OV9640_COM13, OV9640_COM13_GAMMA_RAW | OV9640_COM13_MATRIX_EN }, + { OV9640_COM15, OV9640_COM15_OR_10F0 }, +}; + +static const struct ov9640_reg ov9640_regs_yuv[] = { + { OV9640_MTX1, 0x58 }, + { OV9640_MTX2, 0x48 }, + { OV9640_MTX3, 0x10 }, + { OV9640_MTX4, 0x28 }, + { OV9640_MTX5, 0x48 }, + { OV9640_MTX6, 0x70 }, + { OV9640_MTX7, 0x40 }, + { OV9640_MTX8, 0x40 }, + { OV9640_MTX9, 0x40 }, + { OV9640_MTXS, 0x0f }, +}; + +static const struct ov9640_reg ov9640_regs_rgb[] = { + { OV9640_MTX1, 0x71 }, + { OV9640_MTX2, 0x3e }, + { OV9640_MTX3, 0x0c }, + { OV9640_MTX4, 0x33 }, + { OV9640_MTX5, 0x72 }, + { OV9640_MTX6, 0x00 }, + { OV9640_MTX7, 0x2b }, + { OV9640_MTX8, 0x66 }, + { OV9640_MTX9, 0xd2 }, + { OV9640_MTXS, 0x65 }, +}; + +static u32 ov9640_codes[] = { + MEDIA_BUS_FMT_UYVY8_2X8, + MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE, + MEDIA_BUS_FMT_RGB565_2X8_LE, +}; + +/* read a register */ +static int ov9640_reg_read(struct i2c_client *client, u8 reg, u8 *val) +{ + int ret; + u8 data = reg; + struct i2c_msg msg = { + .addr = client->addr, + .flags = 0, + .len = 1, + .buf = &data, + }; + + ret = i2c_transfer(client->adapter, &msg, 1); + if (ret < 0) + goto err; + + msg.flags = I2C_M_RD; + ret = i2c_transfer(client->adapter, &msg, 1); + if (ret < 0) + goto err; + + *val = data; + return 0; + +err: + dev_err(&client->dev, "Failed reading register 0x%02x!\n", reg); + return ret; +} + +/* write a register */ +static int ov9640_reg_write(struct i2c_client *client, u8 reg, u8 val) +{ + int ret; + u8 _val; + unsigned char data[2] = { reg, val }; + struct i2c_msg msg = { + .addr = client->addr, + .flags = 0, + .len = 2, + .buf = data, + }; + + ret = i2c_transfer(client->adapter, &msg, 1); + if (ret < 0) { + dev_err(&client->dev, "Failed writing register 0x%02x!\n", reg); + return ret; + } + + /* we have to read the register back ... no idea why, maybe HW bug */ + ret = ov9640_reg_read(client, reg, &_val); + if (ret) + dev_err(&client->dev, + "Failed reading back register 0x%02x!\n", reg); + + return 0; +} + + +/* Read a register, alter its bits, write it back */ +static int ov9640_reg_rmw(struct i2c_client *client, u8 reg, u8 set, u8 unset) +{ + u8 val; + int ret; + + ret = ov9640_reg_read(client, reg, &val); + if (ret) { + dev_err(&client->dev, + "[Read]-Modify-Write of register %02x failed!\n", reg); + return ret; + } + + val |= set; + val &= ~unset; + + ret = ov9640_reg_write(client, reg, val); + if (ret) + dev_err(&client->dev, + "Read-Modify-[Write] of register %02x failed!\n", reg); + + return ret; +} + +/* Soft reset the camera. This has nothing to do with the RESET pin! */ +static int ov9640_reset(struct i2c_client *client) +{ + int ret; + + ret = ov9640_reg_write(client, OV9640_COM7, OV9640_COM7_SCCB_RESET); + if (ret) + dev_err(&client->dev, + "An error occurred while entering soft reset!\n"); + + return ret; +} + +/* Start/Stop streaming from the device */ +static int ov9640_s_stream(struct v4l2_subdev *sd, int enable) +{ + return 0; +} + +/* Set status of additional camera capabilities */ +static int ov9640_s_ctrl(struct v4l2_ctrl *ctrl) +{ + struct ov9640_priv *priv = container_of(ctrl->handler, struct ov9640_priv, hdl); + struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev); + + switch (ctrl->id) { + case V4L2_CID_VFLIP: + if (ctrl->val) + return ov9640_reg_rmw(client, OV9640_MVFP, + OV9640_MVFP_V, 0); + return ov9640_reg_rmw(client, OV9640_MVFP, 0, OV9640_MVFP_V); + case V4L2_CID_HFLIP: + if (ctrl->val) + return ov9640_reg_rmw(client, OV9640_MVFP, + OV9640_MVFP_H, 0); + return ov9640_reg_rmw(client, OV9640_MVFP, 0, OV9640_MVFP_H); + } + return -EINVAL; +} + +#ifdef CONFIG_VIDEO_ADV_DEBUG +static int ov9640_get_register(struct v4l2_subdev *sd, + struct v4l2_dbg_register *reg) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + int ret; + u8 val; + + if (reg->reg & ~0xff) + return -EINVAL; + + reg->size = 1; + + ret = ov9640_reg_read(client, reg->reg, &val); + if (ret) + return ret; + + reg->val = (__u64)val; + + return 0; +} + +static int ov9640_set_register(struct v4l2_subdev *sd, + const struct v4l2_dbg_register *reg) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + + if (reg->reg & ~0xff || reg->val & ~0xff) + return -EINVAL; + + return ov9640_reg_write(client, reg->reg, reg->val); +} +#endif + +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); +} + +/* select nearest higher resolution for capture */ +static void ov9640_res_roundup(u32 *width, u32 *height) +{ + int i; + enum { QQCIF, QQVGA, QCIF, QVGA, CIF, VGA, SXGA }; + static const int res_x[] = { 88, 160, 176, 320, 352, 640, 1280 }; + static const int res_y[] = { 72, 120, 144, 240, 288, 480, 960 }; + + for (i = 0; i < ARRAY_SIZE(res_x); i++) { + if (res_x[i] >= *width && res_y[i] >= *height) { + *width = res_x[i]; + *height = res_y[i]; + return; + } + } + + *width = res_x[SXGA]; + *height = res_y[SXGA]; +} + +/* Prepare necessary register changes depending on color encoding */ +static void ov9640_alter_regs(u32 code, + struct ov9640_reg_alt *alt) +{ + switch (code) { + default: + case MEDIA_BUS_FMT_UYVY8_2X8: + alt->com12 = OV9640_COM12_YUV_AVG; + alt->com13 = OV9640_COM13_Y_DELAY_EN | + OV9640_COM13_YUV_DLY(0x01); + break; + case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE: + alt->com7 = OV9640_COM7_RGB; + alt->com13 = OV9640_COM13_RGB_AVG; + alt->com15 = OV9640_COM15_RGB_555; + break; + case MEDIA_BUS_FMT_RGB565_2X8_LE: + alt->com7 = OV9640_COM7_RGB; + alt->com13 = OV9640_COM13_RGB_AVG; + alt->com15 = OV9640_COM15_RGB_565; + break; + } +} + +/* Setup registers according to resolution and color encoding */ +static int ov9640_write_regs(struct i2c_client *client, u32 width, + u32 code, struct ov9640_reg_alt *alts) +{ + const struct ov9640_reg *ov9640_regs, *matrix_regs; + int ov9640_regs_len, matrix_regs_len; + int i, ret; + u8 val; + + /* select register configuration for given resolution */ + switch (width) { + case W_QQCIF: + ov9640_regs = ov9640_regs_qqcif; + ov9640_regs_len = ARRAY_SIZE(ov9640_regs_qqcif); + break; + case W_QQVGA: + ov9640_regs = ov9640_regs_qqvga; + ov9640_regs_len = ARRAY_SIZE(ov9640_regs_qqvga); + break; + case W_QCIF: + ov9640_regs = ov9640_regs_qcif; + ov9640_regs_len = ARRAY_SIZE(ov9640_regs_qcif); + break; + case W_QVGA: + ov9640_regs = ov9640_regs_qvga; + ov9640_regs_len = ARRAY_SIZE(ov9640_regs_qvga); + break; + case W_CIF: + ov9640_regs = ov9640_regs_cif; + ov9640_regs_len = ARRAY_SIZE(ov9640_regs_cif); + break; + case W_VGA: + ov9640_regs = ov9640_regs_vga; + ov9640_regs_len = ARRAY_SIZE(ov9640_regs_vga); + break; + case W_SXGA: + ov9640_regs = ov9640_regs_sxga; + ov9640_regs_len = ARRAY_SIZE(ov9640_regs_sxga); + break; + default: + dev_err(&client->dev, "Failed to select resolution!\n"); + return -EINVAL; + } + + /* select color matrix configuration for given color encoding */ + if (code == MEDIA_BUS_FMT_UYVY8_2X8) { + matrix_regs = ov9640_regs_yuv; + matrix_regs_len = ARRAY_SIZE(ov9640_regs_yuv); + } else { + matrix_regs = ov9640_regs_rgb; + matrix_regs_len = ARRAY_SIZE(ov9640_regs_rgb); + } + + /* write register settings into the module */ + for (i = 0; i < ov9640_regs_len; i++) { + val = ov9640_regs[i].val; + + switch (ov9640_regs[i].reg) { + case OV9640_COM7: + val |= alts->com7; + break; + case OV9640_COM12: + val |= alts->com12; + break; + case OV9640_COM13: + val |= alts->com13; + break; + case OV9640_COM15: + val |= alts->com15; + break; + } + + ret = ov9640_reg_write(client, ov9640_regs[i].reg, val); + if (ret) + return ret; + } + + /* write color matrix configuration into the module */ + for (i = 0; i < matrix_regs_len; i++) { + ret = ov9640_reg_write(client, matrix_regs[i].reg, + matrix_regs[i].val); + if (ret) + return ret; + } + + return 0; +} + +/* program default register values */ +static int ov9640_prog_dflt(struct i2c_client *client) +{ + int i, ret; + + for (i = 0; i < ARRAY_SIZE(ov9640_regs_dflt); i++) { + ret = ov9640_reg_write(client, ov9640_regs_dflt[i].reg, + ov9640_regs_dflt[i].val); + if (ret) + return ret; + } + + /* wait for the changes to actually happen, 140ms are not enough yet */ + mdelay(150); + + return 0; +} + +/* set the format we will capture in */ +static int ov9640_s_fmt(struct v4l2_subdev *sd, + struct v4l2_mbus_framefmt *mf) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + struct ov9640_reg_alt alts = {0}; + int ret; + + ov9640_alter_regs(mf->code, &alts); + + ov9640_reset(client); + + ret = ov9640_prog_dflt(client); + if (ret) + return ret; + + return ov9640_write_regs(client, mf->width, mf->code, &alts); +} + +static int ov9640_set_fmt(struct v4l2_subdev *sd, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_format *format) +{ + struct v4l2_mbus_framefmt *mf = &format->format; + + if (format->pad) + return -EINVAL; + + ov9640_res_roundup(&mf->width, &mf->height); + + mf->field = V4L2_FIELD_NONE; + + switch (mf->code) { + case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE: + case MEDIA_BUS_FMT_RGB565_2X8_LE: + mf->colorspace = V4L2_COLORSPACE_SRGB; + break; + default: + mf->code = MEDIA_BUS_FMT_UYVY8_2X8; + /* fall through */ + case MEDIA_BUS_FMT_UYVY8_2X8: + mf->colorspace = V4L2_COLORSPACE_JPEG; + break; + } + + if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) + return ov9640_s_fmt(sd, mf); + + cfg->try_fmt = *mf; + return 0; +} + +static int ov9640_enum_mbus_code(struct v4l2_subdev *sd, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_mbus_code_enum *code) +{ + if (code->pad || code->index >= ARRAY_SIZE(ov9640_codes)) + return -EINVAL; + + code->code = ov9640_codes[code->index]; + return 0; +} + +static int ov9640_get_selection(struct v4l2_subdev *sd, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_selection *sel) +{ + if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE) + return -EINVAL; + + sel->r.left = 0; + sel->r.top = 0; + switch (sel->target) { + case V4L2_SEL_TGT_CROP_BOUNDS: + case V4L2_SEL_TGT_CROP: + sel->r.width = W_SXGA; + sel->r.height = H_SXGA; + return 0; + default: + return -EINVAL; + } +} + +static int ov9640_video_probe(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct ov9640_priv *priv = to_ov9640_sensor(sd); + u8 pid, ver, midh, midl; + const char *devname; + int ret; + + ret = ov9640_s_power(&priv->subdev, 1); + if (ret < 0) + return ret; + + /* + * check and show product ID and manufacturer ID + */ + + ret = ov9640_reg_read(client, OV9640_PID, &pid); + if (!ret) + ret = ov9640_reg_read(client, OV9640_VER, &ver); + if (!ret) + ret = ov9640_reg_read(client, OV9640_MIDH, &midh); + if (!ret) + ret = ov9640_reg_read(client, OV9640_MIDL, &midl); + if (ret) + goto done; + + switch (VERSION(pid, ver)) { + case OV9640_V2: + devname = "ov9640"; + priv->revision = 2; + break; + case OV9640_V3: + devname = "ov9640"; + priv->revision = 3; + break; + default: + dev_err(&client->dev, "Product ID error %x:%x\n", pid, ver); + ret = -ENODEV; + goto done; + } + + dev_info(&client->dev, "%s Product ID %0x:%0x Manufacturer ID %x:%x\n", + devname, pid, ver, midh, midl); + + ret = v4l2_ctrl_handler_setup(&priv->hdl); + +done: + ov9640_s_power(&priv->subdev, 0); + return ret; +} + +static const struct v4l2_ctrl_ops ov9640_ctrl_ops = { + .s_ctrl = ov9640_s_ctrl, +}; + +static const struct v4l2_subdev_core_ops ov9640_core_ops = { +#ifdef CONFIG_VIDEO_ADV_DEBUG + .g_register = ov9640_get_register, + .s_register = ov9640_set_register, +#endif + .s_power = ov9640_s_power, +}; + +/* Request bus settings on camera side */ +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; +} + +static const struct v4l2_subdev_video_ops ov9640_video_ops = { + .s_stream = ov9640_s_stream, + .g_mbus_config = ov9640_g_mbus_config, +}; + +static const struct v4l2_subdev_pad_ops ov9640_pad_ops = { + .enum_mbus_code = ov9640_enum_mbus_code, + .get_selection = ov9640_get_selection, + .set_fmt = ov9640_set_fmt, +}; + +static const struct v4l2_subdev_ops ov9640_subdev_ops = { + .core = &ov9640_core_ops, + .video = &ov9640_video_ops, + .pad = &ov9640_pad_ops, +}; + +/* + * i2c_driver function + */ +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); + if (!priv) + return -ENOMEM; + + v4l2_i2c_subdev_init(&priv->subdev, client, &ov9640_subdev_ops); + + v4l2_ctrl_handler_init(&priv->hdl, 2); + v4l2_ctrl_new_std(&priv->hdl, &ov9640_ctrl_ops, + V4L2_CID_VFLIP, 0, 1, 1, 0); + v4l2_ctrl_new_std(&priv->hdl, &ov9640_ctrl_ops, + V4L2_CID_HFLIP, 0, 1, 1, 0); + priv->subdev.ctrl_handler = &priv->hdl; + if (priv->hdl.error) + return priv->hdl.error; + + priv->clk = v4l2_clk_get(&client->dev, "mclk"); + if (IS_ERR(priv->clk)) { + ret = PTR_ERR(priv->clk); + goto eclkget; + } + + ret = ov9640_video_probe(client); + if (ret) { + v4l2_clk_put(priv->clk); +eclkget: + v4l2_ctrl_handler_free(&priv->hdl); + } + + return ret; +} + +static int ov9640_remove(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct ov9640_priv *priv = to_ov9640_sensor(sd); + + v4l2_clk_put(priv->clk); + v4l2_device_unregister_subdev(&priv->subdev); + v4l2_ctrl_handler_free(&priv->hdl); + return 0; +} + +static const struct i2c_device_id ov9640_id[] = { + { "ov9640", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, ov9640_id); + +static struct i2c_driver ov9640_i2c_driver = { + .driver = { + .name = "ov9640", + }, + .probe = ov9640_probe, + .remove = ov9640_remove, + .id_table = ov9640_id, +}; + +module_i2c_driver(ov9640_i2c_driver); + +MODULE_DESCRIPTION("SoC Camera driver for OmniVision OV96xx"); +MODULE_AUTHOR("Marek Vasut "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/ov9640.h b/drivers/media/i2c/ov9640.h new file mode 100644 index 000000000000..65d13ff17536 --- /dev/null +++ b/drivers/media/i2c/ov9640.h @@ -0,0 +1,208 @@ +/* + * OmniVision OV96xx Camera Header File + * + * Copyright (C) 2009 Marek Vasut + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __DRIVERS_MEDIA_VIDEO_OV9640_H__ +#define __DRIVERS_MEDIA_VIDEO_OV9640_H__ + +/* Register definitions */ +#define OV9640_GAIN 0x00 +#define OV9640_BLUE 0x01 +#define OV9640_RED 0x02 +#define OV9640_VFER 0x03 +#define OV9640_COM1 0x04 +#define OV9640_BAVE 0x05 +#define OV9640_GEAVE 0x06 +#define OV9640_RSID 0x07 +#define OV9640_RAVE 0x08 +#define OV9640_COM2 0x09 +#define OV9640_PID 0x0a +#define OV9640_VER 0x0b +#define OV9640_COM3 0x0c +#define OV9640_COM4 0x0d +#define OV9640_COM5 0x0e +#define OV9640_COM6 0x0f +#define OV9640_AECH 0x10 +#define OV9640_CLKRC 0x11 +#define OV9640_COM7 0x12 +#define OV9640_COM8 0x13 +#define OV9640_COM9 0x14 +#define OV9640_COM10 0x15 +/* 0x16 - RESERVED */ +#define OV9640_HSTART 0x17 +#define OV9640_HSTOP 0x18 +#define OV9640_VSTART 0x19 +#define OV9640_VSTOP 0x1a +#define OV9640_PSHFT 0x1b +#define OV9640_MIDH 0x1c +#define OV9640_MIDL 0x1d +#define OV9640_MVFP 0x1e +#define OV9640_LAEC 0x1f +#define OV9640_BOS 0x20 +#define OV9640_GBOS 0x21 +#define OV9640_GROS 0x22 +#define OV9640_ROS 0x23 +#define OV9640_AEW 0x24 +#define OV9640_AEB 0x25 +#define OV9640_VPT 0x26 +#define OV9640_BBIAS 0x27 +#define OV9640_GBBIAS 0x28 +/* 0x29 - RESERVED */ +#define OV9640_EXHCH 0x2a +#define OV9640_EXHCL 0x2b +#define OV9640_RBIAS 0x2c +#define OV9640_ADVFL 0x2d +#define OV9640_ADVFH 0x2e +#define OV9640_YAVE 0x2f +#define OV9640_HSYST 0x30 +#define OV9640_HSYEN 0x31 +#define OV9640_HREF 0x32 +#define OV9640_CHLF 0x33 +#define OV9640_ARBLM 0x34 +/* 0x35..0x36 - RESERVED */ +#define OV9640_ADC 0x37 +#define OV9640_ACOM 0x38 +#define OV9640_OFON 0x39 +#define OV9640_TSLB 0x3a +#define OV9640_COM11 0x3b +#define OV9640_COM12 0x3c +#define OV9640_COM13 0x3d +#define OV9640_COM14 0x3e +#define OV9640_EDGE 0x3f +#define OV9640_COM15 0x40 +#define OV9640_COM16 0x41 +#define OV9640_COM17 0x42 +/* 0x43..0x4e - RESERVED */ +#define OV9640_MTX1 0x4f +#define OV9640_MTX2 0x50 +#define OV9640_MTX3 0x51 +#define OV9640_MTX4 0x52 +#define OV9640_MTX5 0x53 +#define OV9640_MTX6 0x54 +#define OV9640_MTX7 0x55 +#define OV9640_MTX8 0x56 +#define OV9640_MTX9 0x57 +#define OV9640_MTXS 0x58 +/* 0x59..0x61 - RESERVED */ +#define OV9640_LCC1 0x62 +#define OV9640_LCC2 0x63 +#define OV9640_LCC3 0x64 +#define OV9640_LCC4 0x65 +#define OV9640_LCC5 0x66 +#define OV9640_MANU 0x67 +#define OV9640_MANV 0x68 +#define OV9640_HV 0x69 +#define OV9640_MBD 0x6a +#define OV9640_DBLV 0x6b +#define OV9640_GSP 0x6c /* ... till 0x7b */ +#define OV9640_GST 0x7c /* ... till 0x8a */ + +#define OV9640_CLKRC_DPLL_EN 0x80 +#define OV9640_CLKRC_DIRECT 0x40 +#define OV9640_CLKRC_DIV(x) ((x) & 0x3f) + +#define OV9640_PSHFT_VAL(x) ((x) & 0xff) + +#define OV9640_ACOM_2X_ANALOG 0x80 +#define OV9640_ACOM_RSVD 0x12 + +#define OV9640_MVFP_V 0x10 +#define OV9640_MVFP_H 0x20 + +#define OV9640_COM1_HREF_NOSKIP 0x00 +#define OV9640_COM1_HREF_2SKIP 0x04 +#define OV9640_COM1_HREF_3SKIP 0x08 +#define OV9640_COM1_QQFMT 0x20 + +#define OV9640_COM2_SSM 0x10 + +#define OV9640_COM3_VP 0x04 + +#define OV9640_COM4_QQ_VP 0x80 +#define OV9640_COM4_RSVD 0x40 + +#define OV9640_COM5_SYSCLK 0x80 +#define OV9640_COM5_LONGEXP 0x01 + +#define OV9640_COM6_OPT_BLC 0x40 +#define OV9640_COM6_ADBLC_BIAS 0x08 +#define OV9640_COM6_FMT_RST 0x82 +#define OV9640_COM6_ADBLC_OPTEN 0x01 + +#define OV9640_COM7_RAW_RGB 0x01 +#define OV9640_COM7_RGB 0x04 +#define OV9640_COM7_QCIF 0x08 +#define OV9640_COM7_QVGA 0x10 +#define OV9640_COM7_CIF 0x20 +#define OV9640_COM7_VGA 0x40 +#define OV9640_COM7_SCCB_RESET 0x80 + +#define OV9640_TSLB_YVYU_YUYV 0x04 +#define OV9640_TSLB_YUYV_UYVY 0x08 + +#define OV9640_COM12_YUV_AVG 0x04 +#define OV9640_COM12_RSVD 0x40 + +#define OV9640_COM13_GAMMA_NONE 0x00 +#define OV9640_COM13_GAMMA_Y 0x40 +#define OV9640_COM13_GAMMA_RAW 0x80 +#define OV9640_COM13_RGB_AVG 0x20 +#define OV9640_COM13_MATRIX_EN 0x10 +#define OV9640_COM13_Y_DELAY_EN 0x08 +#define OV9640_COM13_YUV_DLY(x) ((x) & 0x07) + +#define OV9640_COM15_OR_00FF 0x00 +#define OV9640_COM15_OR_01FE 0x40 +#define OV9640_COM15_OR_10F0 0xc0 +#define OV9640_COM15_RGB_NORM 0x00 +#define OV9640_COM15_RGB_565 0x10 +#define OV9640_COM15_RGB_555 0x30 + +#define OV9640_COM16_RB_AVG 0x01 + +/* IDs */ +#define OV9640_V2 0x9648 +#define OV9640_V3 0x9649 +#define VERSION(pid, ver) (((pid) << 8) | ((ver) & 0xFF)) + +/* supported resolutions */ +enum { + W_QQCIF = 88, + W_QQVGA = 160, + W_QCIF = 176, + W_QVGA = 320, + W_CIF = 352, + W_VGA = 640, + W_SXGA = 1280 +}; +#define H_SXGA 960 + +/* Misc. structures */ +struct ov9640_reg_alt { + u8 com7; + u8 com12; + u8 com13; + u8 com15; +}; + +struct ov9640_reg { + u8 reg; + u8 val; +}; + +struct ov9640_priv { + struct v4l2_subdev subdev; + struct v4l2_ctrl_handler hdl; + struct v4l2_clk *clk; + + int model; + int revision; +}; + +#endif /* __DRIVERS_MEDIA_VIDEO_OV9640_H__ */ diff --git a/drivers/media/i2c/soc_camera/Kconfig b/drivers/media/i2c/soc_camera/Kconfig index 7c2aabc8a3f6..7d7b801ab2ce 100644 --- a/drivers/media/i2c/soc_camera/Kconfig +++ b/drivers/media/i2c/soc_camera/Kconfig @@ -42,10 +42,12 @@ config SOC_CAMERA_OV772X This is a ov772x camera driver config SOC_CAMERA_OV9640 - tristate "ov9640 camera support" + tristate "ov9640 camera support (OBSOLETE)" + default n depends on SOC_CAMERA && I2C help - This is a ov9640 camera driver + This is an obsoleted version of ov9640 camera driver. Please use + the v4l2 standalone one (VIDEO_OV9640). config SOC_CAMERA_OV9740 tristate "ov9740 camera support" From patchwork Thu Dec 13 15:39:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10728991 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 C998D14DE for ; Thu, 13 Dec 2018 15:39:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B94C92C347 for ; Thu, 13 Dec 2018 15:39:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC1FF2C456; Thu, 13 Dec 2018 15:39:10 +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 2CE822C347 for ; Thu, 13 Dec 2018 15:39:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729172AbeLMPjJ (ORCPT ); Thu, 13 Dec 2018 10:39:09 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:41627 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728983AbeLMPjJ (ORCPT ); Thu, 13 Dec 2018 10:39:09 -0500 Received: by mail-lj1-f193.google.com with SMTP id k15-v6so2156991ljc.8 for ; Thu, 13 Dec 2018 07:39:07 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=UR7uJt73LdC9cnsa2muUxsJSkIHi1mCj0tRdDPciJws=; b=ILtLu5mxYbsdxI1ImENHlZTyi2IkiiscgkeWNIwu2RSLRRHoYbmLNzi1bG+GHiNNLs vjednPB3tURk52UtFanCT6hg9vEl0LJYnV1ys6WRqraoe817nt8Qy6gM+CBzx5zhswJf u1HtJq4Tn25BZpuaVRmC2gqgtz/qTwQryvB446CVoatG5Zi6y1Uac0vGrO4P3VME6spZ HLMxAaaPA9tTY1j5E8fvwNvnlJa8gpAhLZxoupAchMyeqbt15TmXuDxV85/r1yLJ7Igo Ctj0AAoNKWwBdjaulcb6fF4QOc7rHNbiDCgpF404DhodqvCLYlvzwkRmmVR5CdyPbzgl eKqg== 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:mime-version:content-transfer-encoding; bh=UR7uJt73LdC9cnsa2muUxsJSkIHi1mCj0tRdDPciJws=; b=OFYrNeKSlFVlxf+hl+L1/rtM0hnO/GbAqpqPA8WNMlEM/JifzyhAOu0xQqNIv8MXzV ZYKDKhCIDp/x96bpZuUBv3JE4MwC0Sq+6184pDbHIQ/HUuboRWiGyB/NkBF3l2Sy/PtH /Y6brukpC4MMG2x2chNltxcDJSntGNnbm+V6obe/rXSuPmpvZmrWVyo0EVae/X6vQLJx w0jKlbHz9rZoMdUz5FmkxH4UGRxtW1PzitfHJmK8hqw4/nc/Bw3V1oWG1wivuTeQJhF/ gBpLin1XQ23KxEX3Vwx2YNlSR11I5hyf3Tnkb7l3jDsswBLkRnCkmguULWkdrD3JUFSh 0RgQ== X-Gm-Message-State: AA+aEWYKGqQJKVfgW0h04z1ZeLuel8yL9uhkBrpiL9wC4mWgYlVNJROz sQj3T4jiBIS1x5wg6dNPzOY= X-Google-Smtp-Source: AFSGD/X0zUFCPZD4lS/d1hJw1EWau/t9+F1Au8tenC72EzDL/Qbmb6KazZYwrhxCrKfdCqDvPkytxA== X-Received: by 2002:a2e:5d12:: with SMTP id r18-v6mr16635067ljb.89.1544715546839; Thu, 13 Dec 2018 07:39:06 -0800 (PST) Received: from kontron.lan (2001-1ae9-0ff1-f191-41f2-812a-df1c-0485.ip6.tmcz.cz. [2001:1ae9:ff1:f191:41f2:812a:df1c:485]) by smtp.gmail.com with ESMTPSA id q67sm412869lfe.19.2018.12.13.07.39.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 07:39:06 -0800 (PST) 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, sakari.ailus@iki.fi Subject: [PATCH v3 2/8] media: i2c: ov9640: drop soc_camera code and switch to v4l2_async Date: Thu, 13 Dec 2018 16:39:13 +0100 Message-Id: X-Mailer: git-send-email 2.20.0 In-Reply-To: References: MIME-Version: 1.0 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 eb91b8240083..1f7cf01d037f 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; } @@ -630,14 +647,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; } @@ -666,18 +679,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); @@ -696,12 +718,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; } @@ -711,7 +741,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; From patchwork Thu Dec 13 15:39:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10728995 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 CC89913BF for ; Thu, 13 Dec 2018 15:39:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC48E2C2CB for ; Thu, 13 Dec 2018 15:39:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0CBF2C43E; Thu, 13 Dec 2018 15:39:12 +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 567A82C2CB for ; Thu, 13 Dec 2018 15:39:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729176AbeLMPjL (ORCPT ); Thu, 13 Dec 2018 10:39:11 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:32993 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728983AbeLMPjL (ORCPT ); Thu, 13 Dec 2018 10:39:11 -0500 Received: by mail-lf1-f67.google.com with SMTP id i26so1918438lfc.0 for ; Thu, 13 Dec 2018 07:39:09 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=3wkzbLKZKvq7/HlvPnKJHkLMUGF0b+s/ftVH520rwWk=; b=bM2hKaykaK84XGcHNSeCIUq+M2d+rbGxI8sqr83Uvy2eNnzwoqu6mTt/dpI+Do3pvs Ez1WNSbEdg+Hyjv0TeG4FZfnJJeZD6ixJsMF+H1lE9SbdaHuFdFgNjZgFXt42YHMNXdA H6ojwPktMEtQfGWUr2IndTaMFSAUfJksrwa1/KmNnc3N46sDAsL0jJ7YodlaZBYSiXUu 6EEWYb6KkdB03N+huCy8PUl0FyY427GcdSgyshGBdQK0HOcpLyaDTO3uP/GBWEUsQtzE ai0Qy/KJVKpjsRyYOjxOBLoOTQjGhQrF1+DV89Au0N+PCR3ISFgW67Cb2F51D4yJdynf RFCw== 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:mime-version:content-transfer-encoding; bh=3wkzbLKZKvq7/HlvPnKJHkLMUGF0b+s/ftVH520rwWk=; b=a+wy7OqM1EENusZQaTe/jVFmEEHGDi+cMCbakghSrs1/m1EwlpQFuBho+DYVy60ZgI tIT/DtbuFVsknmOsSMtgmSRDRrcNwcWwtiYd0McXVPVvAfrkmY9UChweXFdqb7hGOJM+ Uc2axz1sJPkoQoEbAQCQqGNyUahJXCa+ZRb2bRyfrE7mSVrnKR9xZ605Jee4t43kimKK GgZ8UzbTzBM7ZoE7ScWRHOiktESaD9ySYXQub0s68Zqh+YWLDZ5HUrVkFgZVbIqn6D9r 7qgwkdZhLeHng66FKKkYVQl9sToB96hWxbfLXG9lbFSfnT9Lrb0NovsUPeGBneZC597y fQ/Q== X-Gm-Message-State: AA+aEWZYJuXy+G9grOvHxZfjs9trtEdTkn566LhP0gNmGmtOKpgVuTKA 897h4FrFBXcu/tC5pubF24znGl7b X-Google-Smtp-Source: AFSGD/W16RsS4HF+nei/m/6SL9DZ8dMo2S/2B7Uxe5cfg8L0vEwdqCTEtgLN3HTXfzWbmbO2yh5DHw== X-Received: by 2002:a19:1019:: with SMTP id f25mr14130801lfi.54.1544715548532; Thu, 13 Dec 2018 07:39:08 -0800 (PST) Received: from kontron.lan (2001-1ae9-0ff1-f191-41f2-812a-df1c-0485.ip6.tmcz.cz. [2001:1ae9:ff1:f191:41f2:812a:df1c:485]) by smtp.gmail.com with ESMTPSA id q67sm412869lfe.19.2018.12.13.07.39.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 07:39:08 -0800 (PST) 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, sakari.ailus@iki.fi Subject: [PATCH v3 3/8] MAINTAINERS: add Petr Cvek as a maintainer for the ov9640 driver Date: Thu, 13 Dec 2018 16:39:14 +0100 Message-Id: <9cb6b4ff772f4b8e464e4ab8e96314a16fe1380a.1544713575.git.petrcvekcz@gmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: References: MIME-Version: 1.0 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 The soc_camera drivers are marked as orphaned. Add Petr Cvek as a new maintainer for ov9640 driver after its switch from the soc_camera. Signed-off-by: Petr Cvek --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index a2e686819ef8..eda47064ed55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11146,6 +11146,12 @@ S: Maintained F: drivers/media/i2c/ov7740.c F: Documentation/devicetree/bindings/media/i2c/ov7740.txt +OMNIVISION OV9640 SENSOR DRIVER +M: Petr Cvek +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/i2c/ov9640.* + OMNIVISION OV9650 SENSOR DRIVER M: Sakari Ailus R: Akinobu Mita From patchwork Thu Dec 13 15:39:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10728997 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 5C2FF14DE for ; Thu, 13 Dec 2018 15:39:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C2CD2C2CB for ; Thu, 13 Dec 2018 15:39:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 400662C43E; Thu, 13 Dec 2018 15:39:14 +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 DC8BA2C2CB for ; Thu, 13 Dec 2018 15:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729196AbeLMPjN (ORCPT ); Thu, 13 Dec 2018 10:39:13 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:39729 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728983AbeLMPjN (ORCPT ); Thu, 13 Dec 2018 10:39:13 -0500 Received: by mail-lf1-f67.google.com with SMTP id n18so1895660lfh.6 for ; Thu, 13 Dec 2018 07:39:10 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=I/WeZtUIF/kAVoZSlRa9CMWzDdQmisHIbkScuIUoHRM=; b=veYyEAOTwyCNgkpiBvWzlznlimAfFuJTcxp/Rz4D6zzMbGk/iwzFKm0arGOPP/uU/9 oIakF+ZefGxmdSNMSYm4W5GssNpd+AA2ZxIJ8emFrKu8XXFjgnIxL9S4x53gY0jZIPIk P7igIgTboyxg68Ic9C2PHg948LfjGrm13lWjFgStki95iPeoxaMedf4yiWK5RTKqI74e JIQsuyyNbgQQ+Q864DIQWOVz4NB83kd8CvQWLI71moI1wSr3+MwH2KxNBae4MTNKXKtM 5bWQ6YTyk2L8ay1v+2erk3E45fxosAN2uH1yN0Va1/ChG+gMX5I4zR+xPQECDwwG4Sj9 bwqQ== 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:mime-version:content-transfer-encoding; bh=I/WeZtUIF/kAVoZSlRa9CMWzDdQmisHIbkScuIUoHRM=; b=MBo39JMrnwAKbSUWx4TiSrVwrmXi37c6Jv9nVxDN//dFwlEBzLuZYJQKik481LpnXR gTjPAt6fSn2r8WJpLYzOuWwcPjCxe/mjrxtTFOL7jTuw7nKp+LttkxbRTg3uc1t0dbK2 PztjhPtW5YHfaH9E2SsXumR87LIbtp68kNkN3o8Kw9RImG9KaE03nreJeH/+2PV61oa1 Cs07mRZDATs6NadbwF6yv43qwJ0ybVxfJZT1jca9WSC5h+0KC5RDkeAA/m2wKJE7On1d zcWXztM4EMkZiwXHlAAyhP69879uFE6VWxvFxYwbo9/gms9I9rQAtpFHDZq0ZUB4Jpp2 6/KA== X-Gm-Message-State: AA+aEWaaw63CEOUU7O9RGWmlqQ1Zub5MFeA2WzVXtROenKz5JiS7TWK5 JWun5jTnZ8WDUHeDT8UXjHA= X-Google-Smtp-Source: AFSGD/VMZSdX3mi2JU5w69JMo5Hy9lgahLqRGxEmp6+h5pBojMwKpV1QgzLILICJaVS9pZEn9sBjOg== X-Received: by 2002:a19:789:: with SMTP id 131mr15253446lfh.11.1544715550251; Thu, 13 Dec 2018 07:39:10 -0800 (PST) Received: from kontron.lan (2001-1ae9-0ff1-f191-41f2-812a-df1c-0485.ip6.tmcz.cz. [2001:1ae9:ff1:f191:41f2:812a:df1c:485]) by smtp.gmail.com with ESMTPSA id q67sm412869lfe.19.2018.12.13.07.39.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 07:39:09 -0800 (PST) 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, sakari.ailus@iki.fi Subject: [PATCH v3 4/8] media: i2c: ov9640: add missing SPDX identifiers Date: Thu, 13 Dec 2018 16:39:15 +0100 Message-Id: <3b92813bc04a177cab684a1f2c8d77f6e2e5560e.1544713575.git.petrcvekcz@gmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: References: MIME-Version: 1.0 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 Add missing SPDX identifiers to .c and .h files of the sensor driver. Signed-off-by: Petr Cvek --- drivers/media/i2c/ov9640.c | 5 +---- drivers/media/i2c/ov9640.h | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c index 1f7cf01d037f..9a6fa609e8c4 100644 --- a/drivers/media/i2c/ov9640.c +++ b/drivers/media/i2c/ov9640.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * OmniVision OV96xx Camera Driver * @@ -14,10 +15,6 @@ * Copyright 2006-7 Jonathan Corbet * Copyright (C) 2008 Magnus Damm * Copyright (C) 2008, Guennadi Liakhovetski - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include diff --git a/drivers/media/i2c/ov9640.h b/drivers/media/i2c/ov9640.h index be5e4b29ac69..a8ed6992c1a8 100644 --- a/drivers/media/i2c/ov9640.h +++ b/drivers/media/i2c/ov9640.h @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * OmniVision OV96xx Camera Header File * * Copyright (C) 2009 Marek Vasut - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #ifndef __DRIVERS_MEDIA_VIDEO_OV9640_H__ From patchwork Thu Dec 13 15:39:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10728999 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 A15DE14DE for ; Thu, 13 Dec 2018 15:39:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 920F02C2CB for ; Thu, 13 Dec 2018 15:39:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85A872C43E; Thu, 13 Dec 2018 15:39:16 +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 2CE3F2C2CB for ; Thu, 13 Dec 2018 15:39:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729205AbeLMPjP (ORCPT ); Thu, 13 Dec 2018 10:39:15 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:34748 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728983AbeLMPjP (ORCPT ); Thu, 13 Dec 2018 10:39:15 -0500 Received: by mail-lf1-f65.google.com with SMTP id p6so1917240lfc.1 for ; Thu, 13 Dec 2018 07:39:12 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=6dGXOF0cDB4LtShhmKT4RqvqUe3HA/a5W5ibddUw/Nc=; b=NjSTYytxr+2ZIVQlQ/PwWBjwn0OrkxI832PLZI4MYQvV4MLbx4IxOXCk5xduLlifLI UocMGpVxnNlyOiTW9lDRQsso5xFh0FoYWaBprxVQsp7JV+gst+EymyiPYVlwsTPVUl66 A4RYBtx0xsH90uIuvGS/heJuys82jQ050qa8oq4Lw5b0+UZ5UF7eX7BwlvaJXmbJo4Gi d5O5TWXlmoCKqCHFeOQvZdukBIEosYUJdVT0hT7JC+ZHhZA9kOorRnXLu9vuCAtByyv1 2ym7PpfE/dIHCQiOR12jesDE7PPhTbY3ptxkW2vLG0iyWKSY9upf9zW9cHYLzeWIdU2q odsQ== 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:mime-version:content-transfer-encoding; bh=6dGXOF0cDB4LtShhmKT4RqvqUe3HA/a5W5ibddUw/Nc=; b=H+M8KBWLQosxckXCmpEbgjtnHS4QzWqKcaNdaVCI/TQkjIE8d0SaypovNq2QzqM9xe sAEmz1/uETOYsBQjLzenbe/2sxo7lYvjdZMExsoQCjiL7qrZLjUI+U7esw50DUUDx1mO CgY/dICILaSosW5uOQhkc1lJdNdkZMIvhQrCu8zeCUCMQ9aBSA9gax9wxO2/2GJ3sMQ5 CFALwZ+bdBteeN3SMREwWrD3r/BphzyCW3oZ5ubVJmwsgBADkk5fvKm6Ux2MpsjdEw40 15/xZ9VsiA560vk1gx5fy6EWUirXbKovGlOlpl1Naxh4seXjjrmQRGbVpyU6+sFHDYQL 537w== X-Gm-Message-State: AA+aEWZahVvBZzOFSzkpfrpCq65GcopwnsZ0Zwi6IROqXwuIqd/27Piu lDDx2HjWDd31CCPo65lErK3HcGdf X-Google-Smtp-Source: AFSGD/VbHJsVyhNRLWnna0Yj04fiwSGzb7/TiLlFAAItufYEYwOAwF2j6mSIS1pjdjRtsK2J7dxabQ== X-Received: by 2002:a19:1cb:: with SMTP id 194mr14369556lfb.61.1544715552003; Thu, 13 Dec 2018 07:39:12 -0800 (PST) Received: from kontron.lan (2001-1ae9-0ff1-f191-41f2-812a-df1c-0485.ip6.tmcz.cz. [2001:1ae9:ff1:f191:41f2:812a:df1c:485]) by smtp.gmail.com with ESMTPSA id q67sm412869lfe.19.2018.12.13.07.39.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 07:39:11 -0800 (PST) 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, sakari.ailus@iki.fi Subject: [PATCH v3 5/8] media: i2c: ov9640: change array index or length variables to unsigned Date: Thu, 13 Dec 2018 16:39:16 +0100 Message-Id: <7be67dac73289e3d6dbc25f16cdb051a53a76f2f.1544713575.git.petrcvekcz@gmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: References: MIME-Version: 1.0 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 The driver uses variables to store frame resolutions and to indexing various arrays. These should be unsigned. Signed-off-by: Petr Cvek --- drivers/media/i2c/ov9640.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c index 9a6fa609e8c4..08f3f8247759 100644 --- a/drivers/media/i2c/ov9640.c +++ b/drivers/media/i2c/ov9640.c @@ -347,10 +347,10 @@ static int ov9640_s_power(struct v4l2_subdev *sd, int on) /* select nearest higher resolution for capture */ static void ov9640_res_roundup(u32 *width, u32 *height) { - int i; + unsigned int i; enum { QQCIF, QQVGA, QCIF, QVGA, CIF, VGA, SXGA }; - static const int res_x[] = { 88, 160, 176, 320, 352, 640, 1280 }; - static const int res_y[] = { 72, 120, 144, 240, 288, 480, 960 }; + static const u32 res_x[] = { 88, 160, 176, 320, 352, 640, 1280 }; + static const u32 res_y[] = { 72, 120, 144, 240, 288, 480, 960 }; for (i = 0; i < ARRAY_SIZE(res_x); i++) { if (res_x[i] >= *width && res_y[i] >= *height) { @@ -393,8 +393,9 @@ static int ov9640_write_regs(struct i2c_client *client, u32 width, u32 code, struct ov9640_reg_alt *alts) { const struct ov9640_reg *ov9640_regs, *matrix_regs; - int ov9640_regs_len, matrix_regs_len; - int i, ret; + unsigned int ov9640_regs_len, matrix_regs_len; + unsigned int i; + int ret; u8 val; /* select register configuration for given resolution */ @@ -479,7 +480,8 @@ static int ov9640_write_regs(struct i2c_client *client, u32 width, /* program default register values */ static int ov9640_prog_dflt(struct i2c_client *client) { - int i, ret; + unsigned int i; + int ret; for (i = 0; i < ARRAY_SIZE(ov9640_regs_dflt); i++) { ret = ov9640_reg_write(client, ov9640_regs_dflt[i].reg, From patchwork Thu Dec 13 15:39:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10729001 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 5DC0513BF for ; Thu, 13 Dec 2018 15:39:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CEA42C40D for ; Thu, 13 Dec 2018 15:39:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40E6E2C2CB; Thu, 13 Dec 2018 15:39:17 +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 DBCCD2C2CB for ; Thu, 13 Dec 2018 15:39:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729208AbeLMPjQ (ORCPT ); Thu, 13 Dec 2018 10:39:16 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:45988 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729197AbeLMPjP (ORCPT ); Thu, 13 Dec 2018 10:39:15 -0500 Received: by mail-lj1-f194.google.com with SMTP id s5-v6so2133916ljd.12 for ; Thu, 13 Dec 2018 07:39:14 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=iA3kX9RDiY8CP1jDVJ1yKbjOQfoYKGDq1F39dMsEmn8=; b=C2CTy8sqiRNin2XutxCxQxVpg0VDYg2dTHU05GpgzllL/jMa0ODnE3Z5isTAMjar04 jiBBTYDtKdwG0ZfmjRLG1ZE4FHWmyPRdGk0tGpWufKFhgz7WTu2+sRxHhHciTGek/QE0 N1IgPzK/QZhpSTEQpmOA3KmWztAY5S5IbSsqKLoLdvrfTMpaYZ1mJB+6F8wvVUl3IC2j T7CLxnhlOSngXMPiKiAR5egpVM7/RKFug46TP4l1ZCiLffFu3VLZkK8AA0oPbIzJaLsx rKVt8Rw3P7J+o2+7MlLWL0vdu25Vxzv8FlE8PUFAavDtNi96nMK3pnyPQ6giaZbgHmap 6eCg== 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:mime-version:content-transfer-encoding; bh=iA3kX9RDiY8CP1jDVJ1yKbjOQfoYKGDq1F39dMsEmn8=; b=i4Kc7Wzc/Su/00/MvE7FLOA8js6e9n6AeV8osT8KdPWWZsxSbNB020QuOjaxtgPk0h BIKg5XU+ogttEY0rLmTZpevAAwRwJJ0FRE3Ec/Lhl+bdv3qlDxLPYJQn8n59KmTWd+Vm bAzx5EUIw9PQ6KP+JoMc+gK8gUocmEUytLLyMAPH72cgTdc23m0ipJcAhtDwG311gbfN mlvMbYWDkvmB5KaeW6q5oNDNRaciT2RiODLxk6KzLfb09kmqqET7QRV0D60ktD6sYFAh 7WDzgkt4Il1BvHJx5HkXbNTQzRfxQR+/gmvJp6WrHM2+6hcZhj0ZzJNUjQavTvhcPlyA EFGQ== X-Gm-Message-State: AA+aEWaffccSfPUURnXRDYv3Gd2ZcoW9FgUpHqpTo0hv9ViwfRlUBDN/ TIbzT4t336NQBnSJDvLpOOY= X-Google-Smtp-Source: AFSGD/W9fEA5FhgHFHd6U/fWT63x6kiIPZ3qq0yWyhZls0CRRznHKEwY3NvfasC3FTgR4u2A2QsJIw== X-Received: by 2002:a2e:3012:: with SMTP id w18-v6mr12786990ljw.75.1544715553700; Thu, 13 Dec 2018 07:39:13 -0800 (PST) Received: from kontron.lan (2001-1ae9-0ff1-f191-41f2-812a-df1c-0485.ip6.tmcz.cz. [2001:1ae9:ff1:f191:41f2:812a:df1c:485]) by smtp.gmail.com with ESMTPSA id q67sm412869lfe.19.2018.12.13.07.39.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 07:39:13 -0800 (PST) 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, sakari.ailus@iki.fi Subject: [PATCH v3 6/8] media: i2c: ov9640: add space before return for better clarity Date: Thu, 13 Dec 2018 16:39:17 +0100 Message-Id: X-Mailer: git-send-email 2.20.0 In-Reply-To: References: MIME-Version: 1.0 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 Some returns were adjoined to unrelated code blocks. This patch adds a space inbetween. Signed-off-by: Petr Cvek --- drivers/media/i2c/ov9640.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c index 08f3f8247759..2839aa3b4fb4 100644 --- a/drivers/media/i2c/ov9640.c +++ b/drivers/media/i2c/ov9640.c @@ -286,6 +286,7 @@ static int ov9640_s_ctrl(struct v4l2_ctrl *ctrl) OV9640_MVFP_H, 0); return ov9640_reg_rmw(client, OV9640_MVFP, 0, OV9640_MVFP_H); } + return -EINVAL; } @@ -341,6 +342,7 @@ static int ov9640_s_power(struct v4l2_subdev *sd, int on) usleep_range(1000, 2000); gpiod_set_value(priv->gpio_power, 0); } + return ret; } @@ -545,6 +547,7 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd, return ov9640_s_fmt(sd, mf); cfg->try_fmt = *mf; + return 0; } @@ -556,6 +559,7 @@ static int ov9640_enum_mbus_code(struct v4l2_subdev *sd, return -EINVAL; code->code = ov9640_codes[code->index]; + return 0; } @@ -731,6 +735,7 @@ static int ov9640_probe(struct i2c_client *client, v4l2_clk_put(priv->clk); eclkget: v4l2_ctrl_handler_free(&priv->hdl); + return ret; } From patchwork Thu Dec 13 15:39:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10729003 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 4C45813BF for ; Thu, 13 Dec 2018 15:39:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D8B22C40D for ; Thu, 13 Dec 2018 15:39:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 303982C43E; Thu, 13 Dec 2018 15:39:19 +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 DDF202C2CB for ; Thu, 13 Dec 2018 15:39:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729213AbeLMPjS (ORCPT ); Thu, 13 Dec 2018 10:39:18 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:44206 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729197AbeLMPjS (ORCPT ); Thu, 13 Dec 2018 10:39:18 -0500 Received: by mail-lf1-f67.google.com with SMTP id z13so1874073lfe.11 for ; Thu, 13 Dec 2018 07:39:16 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=9IIyQI0wUmhvhuuFybJykMM+fU6XPVoIyyGawZL0NBI=; b=CdQFtxnlMM/IgDO9iHT7dQx5Xxekt1d3OcbEDyzN57EN11hajzCffmZ+b5HRR0y9pl bef1/qPoMFJCRZNS3M9cTSV2qSHu5I3uwgiYPQNigP38FTigQrOMaWNHnFmMT+pJoS2u s0n/pB+1Yz+5XwjaaEQ9QlShGm2iUiLJPds7DSX/EvDXBPrk1QY8VtbyJBvke2Kwe23Z k1tG60dq8yFeQG+lSD8zdlCbE+tYJQz/OSCl8FUdUAwyCdj/Q0oabFvibEAEOJA1xXUJ TmfKLlu+PTThxURYYNCjnngz61mnWsLSw/GYxU5SEpNLvnEEQ9saxy0BxiM1sfvkxmh2 qSaQ== 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:mime-version:content-transfer-encoding; bh=9IIyQI0wUmhvhuuFybJykMM+fU6XPVoIyyGawZL0NBI=; b=GnM/RvRlr368YSC6SIUE92Jxh5djsOx0fb7DyWkK3edyf+xzgTHZNZ9dCJAYTWOjzd kNQF5LdbJgCShYCViwzf+g3KV8fjTX1Ix4mYa6EkZ+42FCJxjDFgrBW0RviVTahQK3ma WAo+0KFd15PxieMsinlds1Nfueogqk/k+L9XdE0RHcM1xDSqbsa+/+fcR3XbxaUTaU67 7R77dwnVRiI5buJZC1f3uI6KYVzGu3dQ7HDBv9MkwbOy7HxDd/OjDi3kR/YcziTlV3Dn SKjso9y9O8FoN8A9bLGb8MuvVhyhHStS1Y2a+gQRuPumHsDNUzT0AEgK8Xj8bxDalYKb VIgw== X-Gm-Message-State: AA+aEWZghoVv9z33sSbJQqfG4ikaHxFTJXrdy5s3m7vmW4yqdXryd5/H Apd7zBTNC3MCOfEuGSdfuEwC81yv X-Google-Smtp-Source: AFSGD/WfT8TETuGuCY23pvCSdtLWgIR3qSfNsXa2j5QAhQzR7rjSYHfjXsocSITLVQdHYk831mUlaQ== X-Received: by 2002:a19:ced3:: with SMTP id e202mr14393029lfg.13.1544715555820; Thu, 13 Dec 2018 07:39:15 -0800 (PST) Received: from kontron.lan (2001-1ae9-0ff1-f191-41f2-812a-df1c-0485.ip6.tmcz.cz. [2001:1ae9:ff1:f191:41f2:812a:df1c:485]) by smtp.gmail.com with ESMTPSA id q67sm412869lfe.19.2018.12.13.07.39.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 07:39:14 -0800 (PST) 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, sakari.ailus@iki.fi Subject: [PATCH v3 7/8] media: i2c: ov9640: make array of supported formats constant Date: Thu, 13 Dec 2018 16:39:18 +0100 Message-Id: X-Mailer: git-send-email 2.20.0 In-Reply-To: References: MIME-Version: 1.0 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 An array which defines sensor's supported formats is not written anywhere, so it can be constant. Signed-off-by: Petr Cvek --- drivers/media/i2c/ov9640.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c index 2839aa3b4fb4..9739fa8d433a 100644 --- a/drivers/media/i2c/ov9640.c +++ b/drivers/media/i2c/ov9640.c @@ -161,7 +161,7 @@ static const struct ov9640_reg ov9640_regs_rgb[] = { { OV9640_MTXS, 0x65 }, }; -static u32 ov9640_codes[] = { +static const u32 ov9640_codes[] = { MEDIA_BUS_FMT_UYVY8_2X8, MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE, MEDIA_BUS_FMT_RGB565_2X8_LE, From patchwork Thu Dec 13 15:39:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 10729005 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 5A86614DE for ; Thu, 13 Dec 2018 15:39:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A7A52C40D for ; Thu, 13 Dec 2018 15:39:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E5A32C456; Thu, 13 Dec 2018 15:39:21 +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 E506B2C40D for ; Thu, 13 Dec 2018 15:39:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729224AbeLMPjU (ORCPT ); Thu, 13 Dec 2018 10:39:20 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:40257 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729197AbeLMPjU (ORCPT ); Thu, 13 Dec 2018 10:39:20 -0500 Received: by mail-lf1-f67.google.com with SMTP id v5so1895177lfe.7 for ; Thu, 13 Dec 2018 07:39:18 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=vNAtbq0HBKRMbj1l8aQgmHBF0xlSjnrrrDOeFy2T1SU=; b=bzrctfXGH4L8AD2VzKQUWq4iU8RjFJdVVXZBAgBeUWXBDsIPUMvjOm+K8z/9uOo0BY VanQStPjzMCwY3Vs317V+AN8l8nMVwBgBm3wvShcbz+xaaWB4hf8fUerEXoyOr2K9kYa c4BTdKGZBN5gP+eEIGMr/65wQVjRd/S+Go0ABR9gsQ12AU5d9dOz4OWiv84PedAo5cz7 mLq36xC+yLKbF51fGyBZvuuTEcvSBbs1gSVypBx3OCMiUrVBHHAYnoJzQVrlwDwAxUle jwkrrpKIl1uSeIjgwYX3TzX8yaBjZHOcWoSo86ig82Uj7nrTczhUEDq/6H2k0yv7N7qg /hfQ== 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:mime-version:content-transfer-encoding; bh=vNAtbq0HBKRMbj1l8aQgmHBF0xlSjnrrrDOeFy2T1SU=; b=oJQuBQsPbbuhsr5S21CK1dgDZKrzL4rcx/NlqMdB+JRUMpSrHwtCg3WuWeTzSLUuav ADc8LGM4B3GZVI/o5apxbjXKhS7L0NqopJFknxt0o+AlqiAsfvstJM3z/FEQK6lSr2VS riyo6P66KpHYUBcvwfCe0rgNCWIOAvGBNW9oqgpGA7wAbqU8Lh0+8tuzwKrOO4eBi718 84AMHz+YM61+q1guAXJZNkg7kYyflTpfd1VqXLm8qt5HTgpoMXOiEQneqSFVtZYy3ud7 AwrV+Pabg3eKIHSIibR7JzApAZXH6ByFuTCauHO6NTREMQrcAiHE0bNDyseliOYsQa0M +SmA== X-Gm-Message-State: AA+aEWbikVsuy0/PmAfl27puJsaKQUiYXPasQorc3kS8cwhmyqjAaSwE VsBawsQ+kZ8lohjS8n1Ln7U= X-Google-Smtp-Source: AFSGD/XhxVyfam/n/j7swVpTHENvTbgyWrjFmTzwYNBu/kWduYsSeOVCt+9Jpx9V3PS8H+Y9OPrwCA== X-Received: by 2002:a19:7111:: with SMTP id m17mr943408lfc.64.1544715557517; Thu, 13 Dec 2018 07:39:17 -0800 (PST) Received: from kontron.lan (2001-1ae9-0ff1-f191-41f2-812a-df1c-0485.ip6.tmcz.cz. [2001:1ae9:ff1:f191:41f2:812a:df1c:485]) by smtp.gmail.com with ESMTPSA id q67sm412869lfe.19.2018.12.13.07.39.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 07:39:17 -0800 (PST) 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, sakari.ailus@iki.fi Subject: [PATCH v3 8/8] media: i2c: ov9640: fix missing error handling in probe Date: Thu, 13 Dec 2018 16:39:19 +0100 Message-Id: <95729cb49c520310674050678a94773d665587c7.1544713575.git.petrcvekcz@gmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: References: MIME-Version: 1.0 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 Control handlers registration lacked error path with v4l2_ctrl_handler_free() call. Fix it by using goto to alread existing v4l2_ctrl_handler_free() call. Signed-off-by: Petr Cvek --- drivers/media/i2c/ov9640.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c index 9739fa8d433a..c183273fd332 100644 --- a/drivers/media/i2c/ov9640.c +++ b/drivers/media/i2c/ov9640.c @@ -710,14 +710,18 @@ static int ov9640_probe(struct i2c_client *client, V4L2_CID_VFLIP, 0, 1, 1, 0); v4l2_ctrl_new_std(&priv->hdl, &ov9640_ctrl_ops, V4L2_CID_HFLIP, 0, 1, 1, 0); + + if (priv->hdl.error) { + ret = priv->hdl.error; + goto ectrlinit; + } + priv->subdev.ctrl_handler = &priv->hdl; - if (priv->hdl.error) - return priv->hdl.error; priv->clk = v4l2_clk_get(&client->dev, "mclk"); if (IS_ERR(priv->clk)) { ret = PTR_ERR(priv->clk); - goto eclkget; + goto ectrlinit; } ret = ov9640_video_probe(client); @@ -733,7 +737,7 @@ static int ov9640_probe(struct i2c_client *client, eprobe: v4l2_clk_put(priv->clk); -eclkget: +ectrlinit: v4l2_ctrl_handler_free(&priv->hdl); return ret;