From patchwork Sat Apr 7 15:48:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10327897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6764C60541 for ; Sat, 7 Apr 2018 15:49:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 568E929529 for ; Sat, 7 Apr 2018 15:49:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49B0B2952F; Sat, 7 Apr 2018 15:49:01 +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 9C2FE2952A for ; Sat, 7 Apr 2018 15:49:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751924AbeDGPs6 (ORCPT ); Sat, 7 Apr 2018 11:48:58 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:41757 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751741AbeDGPs5 (ORCPT ); Sat, 7 Apr 2018 11:48:57 -0400 Received: by mail-pl0-f68.google.com with SMTP id bj1-v6so2461989plb.8; Sat, 07 Apr 2018 08:48:56 -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=tY4qkqh19tMdB17aPFdKjvB4eQPlHB0OPpw46jv6p7Y=; b=M0ZljiorGvk0JsXNk2xicCKiFK1JuLAbiJrEKXgCCsfJJlADzHP8gF7rBFGVaLgszp fTg0FSP6xvvZbqvST96vsaADGSp5w05UaAdB4f01ZOiYuDRLk+mctDxERnvTo5yoV3Yd Pfgb5aERzBVk6IcGzuCv7sZJKirEhQiB8phaCscIw1+n2He16+I5XSVWXhIaq9DbFaqw amvxeH3J4jNNE11btFd9FFwOIiWFUEkwEOnhWQJvvANMC41WdeSOJfFxTrb5GRTmxafI sz0hQ7YOYrbzmG1AJmqTAdeLa1Jyotu1ODtUAqMUm4/Rwtm3j/HEDfA779oQdpoJUMM/ +dkw== 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=tY4qkqh19tMdB17aPFdKjvB4eQPlHB0OPpw46jv6p7Y=; b=VwDYUQ9ZPo5/vFDfXdz3TGqgO2z9aptnfngwDTedscYLwwHls4/biEbNQwrTmdK/no zB1cz69J9M4SEHC7AscGO0BuNDWyv9mPZssKIPmQipAJ03jqgdjXGVCWJMkaKaLPGyOv /wkeUX9lGBm7476IN4nN7GdlsCEWtATLwNRG9a07cWMMbGmnOI7BpttM967dgQyf++N3 uD3apv7VspRR68VHnH3vwG+kOw5qQ4eZPZ2VKNVMKcxNfNAU2lKN4XqHZ2rlzH0IzBrW mTDV+DSNg6FTqnkDxIR06Rxp1/LyvulK2BdeWRIXi/2tWk8hkgRJrJdJDb5v7sjbq8N2 SbUg== X-Gm-Message-State: AElRT7GfDasaOD70vNWHI0i4JHXIjblr8+CAO3WHEG7mrD8IsFo6uaEY S4ieAQF1Q9XC3FCqIvIO5QgPjQ== X-Google-Smtp-Source: AIpwx4/F0k4C4oPdm3WcNqhLwRlQFeu7XOFX7KLxGWzA+MCcYsYtOmtGDU0wmF6mvsJexgxmC0yFQg== X-Received: by 2002:a17:902:6b07:: with SMTP id o7-v6mr31854874plk.136.1523116136614; Sat, 07 Apr 2018 08:48:56 -0700 (PDT) Received: from localhost.localdomain ([240f:4:c2bc:1:3c69:7d24:eba0:888]) by smtp.gmail.com with ESMTPSA id x14sm23536871pgo.82.2018.04.07.08.48.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 07 Apr 2018 08:48:55 -0700 (PDT) From: Akinobu Mita To: linux-media@vger.kernel.org, devicetree@vger.kernel.org Cc: Akinobu Mita , Jacopo Mondi , Laurent Pinchart , Hans Verkuil , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 6/6] media: ov772x: support device tree probing Date: Sun, 8 Apr 2018 00:48:10 +0900 Message-Id: <1523116090-13101-7-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523116090-13101-1-git-send-email-akinobu.mita@gmail.com> References: <1523116090-13101-1-git-send-email-akinobu.mita@gmail.com> 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 The ov772x driver currently only supports legacy platform data probe. This change enables device tree probing. Note that the platform data probe can select auto or manual edge control mode, but the device tree probling can only select auto edge control mode for now. Cc: Jacopo Mondi Cc: Laurent Pinchart Cc: Hans Verkuil Cc: Sakari Ailus Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita --- drivers/media/i2c/ov772x.c | 60 ++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c index 5e91fa1..e67ec37 100644 --- a/drivers/media/i2c/ov772x.c +++ b/drivers/media/i2c/ov772x.c @@ -763,13 +763,13 @@ static int ov772x_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_VFLIP: val = ctrl->val ? VFLIP_IMG : 0x00; priv->flag_vflip = ctrl->val; - if (priv->info->flags & OV772X_FLAG_VFLIP) + if (priv->info && (priv->info->flags & OV772X_FLAG_VFLIP)) val ^= VFLIP_IMG; return ov772x_mask_set(client, COM3, VFLIP_IMG, val); case V4L2_CID_HFLIP: val = ctrl->val ? HFLIP_IMG : 0x00; priv->flag_hflip = ctrl->val; - if (priv->info->flags & OV772X_FLAG_HFLIP) + if (priv->info && (priv->info->flags & OV772X_FLAG_HFLIP)) val ^= HFLIP_IMG; return ov772x_mask_set(client, COM3, HFLIP_IMG, val); case V4L2_CID_BAND_STOP_FILTER: @@ -928,19 +928,14 @@ static void ov772x_select_params(const struct v4l2_mbus_framefmt *mf, *win = ov772x_select_win(mf->width, mf->height); } -static int ov772x_set_params(struct ov772x_priv *priv, - const struct ov772x_color_format *cfmt, - const struct ov772x_win_size *win) +static int ov772x_edgectrl(struct ov772x_priv *priv) { struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev); - struct v4l2_fract tpf; int ret; - u8 val; - /* Reset hardware. */ - ov772x_reset(client); + if (!priv->info) + return 0; - /* Edge Ctrl. */ if (priv->info->edgectrl.strength & OV772X_MANUAL_EDGE_CTRL) { /* * Manual Edge Control Mode. @@ -951,19 +946,19 @@ static int ov772x_set_params(struct ov772x_priv *priv, ret = ov772x_mask_set(client, DSPAUTO, EDGE_ACTRL, 0x00); if (ret < 0) - goto ov772x_set_fmt_error; + return ret; ret = ov772x_mask_set(client, EDGE_TRSHLD, OV772X_EDGE_THRESHOLD_MASK, priv->info->edgectrl.threshold); if (ret < 0) - goto ov772x_set_fmt_error; + return ret; ret = ov772x_mask_set(client, EDGE_STRNGT, OV772X_EDGE_STRENGTH_MASK, priv->info->edgectrl.strength); if (ret < 0) - goto ov772x_set_fmt_error; + return ret; } else if (priv->info->edgectrl.upper > priv->info->edgectrl.lower) { /* @@ -975,15 +970,35 @@ static int ov772x_set_params(struct ov772x_priv *priv, EDGE_UPPER, OV772X_EDGE_UPPER_MASK, priv->info->edgectrl.upper); if (ret < 0) - goto ov772x_set_fmt_error; + return ret; ret = ov772x_mask_set(client, EDGE_LOWER, OV772X_EDGE_LOWER_MASK, priv->info->edgectrl.lower); if (ret < 0) - goto ov772x_set_fmt_error; + return ret; } + return 0; +} + +static int ov772x_set_params(struct ov772x_priv *priv, + const struct ov772x_color_format *cfmt, + const struct ov772x_win_size *win) +{ + struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev); + struct v4l2_fract tpf; + int ret; + u8 val; + + /* Reset hardware. */ + ov772x_reset(client); + + /* Edge Ctrl. */ + ret = ov772x_edgectrl(priv); + if (ret < 0) + goto ov772x_set_fmt_error; + /* Format and window size. */ ret = ov772x_write(client, HSTART, win->rect.left >> 2); if (ret < 0) @@ -1284,11 +1299,6 @@ static int ov772x_probe(struct i2c_client *client, struct i2c_adapter *adapter = client->adapter; int ret; - if (!client->dev.platform_data) { - dev_err(&client->dev, "Missing ov772x platform data\n"); - return -EINVAL; - } - priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -1390,9 +1400,19 @@ static const struct i2c_device_id ov772x_id[] = { }; MODULE_DEVICE_TABLE(i2c, ov772x_id); +#if IS_ENABLED(CONFIG_OF) +static const struct of_device_id ov772x_of_match[] = { + { .compatible = "ovti,ov7725", }, + { .compatible = "ovti,ov7720", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, ov772x_of_match); +#endif + static struct i2c_driver ov772x_i2c_driver = { .driver = { .name = "ov772x", + .of_match_table = of_match_ptr(ov772x_of_match), }, .probe = ov772x_probe, .remove = ov772x_remove,