From patchwork Tue May 5 10:01:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 201101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E96BC47256 for ; Tue, 5 May 2020 10:02:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1792E206E6 for ; Tue, 5 May 2020 10:02:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XkUAmWOw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728664AbgEEKB7 (ORCPT ); Tue, 5 May 2020 06:01:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728481AbgEEKB6 (ORCPT ); Tue, 5 May 2020 06:01:58 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FEE9C061A10 for ; Tue, 5 May 2020 03:01:57 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id f13so1953103wrm.13 for ; Tue, 05 May 2020 03:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eVMq4biPw2C3OxaFJKI0NCtZj+TI0Go4ArcFXFoxJjI=; b=XkUAmWOwNRwPTRloJvF6TTHGAr/zGrmJ4/KQ6rs8i0Xd7ReDVquOd7B6Qx3Dtu4a5g /KFFdCzv5BuHX71+b3fOODkN1W1mBnS4VXI+qmm4odA/5Diy+MQwV+2mxRy1PvKpsV9e QBGNaWVLpJIlaE+6Ak0vfgzBTMfftVYXrFDLUY7rNOu6yCzgmS3FYkwwXNK1TmAU3PsF iKxpIju6/HP9yp5cD6QhS/ExJTZ4iqKr6Tj4lno+wuqh0B85v3cisIUeNmkdJjGWIjey YMoyNQuyZWqlffTyhD0EHzWPln2yffDYjfUjhYN5kocRyhgN+3JhJ5v0BRGFSVOoaVYF +YZA== 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=eVMq4biPw2C3OxaFJKI0NCtZj+TI0Go4ArcFXFoxJjI=; b=dtlaWALhFfQqdxV8PwxIjj8ppft8eell1w+CVdiXDQP+ij5l/yGPCcdQB8V/UulWmA j10Ds85YH6Dp++bL8/vx2ZPVTVmTATYDdpbE5zS2UyqevE3LRgsdcbCyd8GSXuRsjWMy kGIpxuzf6678YFuymp+YKT1xTp4XLu60h4X0QwMzwk2FRUBfUmAVnC+P8aV/taElfse5 BjynWHyE8WO37m6ZjiYVVoXYMZOjUlhB3wG7rwoRdnlQR0T4yr4H8cQFdQN2OEDVbxWg ML2ieQFJ4/LN96b103Qa7AZKsMfWrIfk2yG9qskKxFT+5aKe9id6lYOSxY7zkqFvM3sK Mhew== X-Gm-Message-State: AGi0PuZD6jsKjul4KRTEBd8dN9wU+uHWqawaz6JTORRJSOohhP7TQOLr XnvcQ5mF3VNg6A9iahT/diZcxw== X-Google-Smtp-Source: APiQypLQuT9S9pF1oeQzW0rI5/ILHlkfbTubBTKuNRRmcVZb+RqdRlaZFm9JcCoGB85S/qyQkr1zTQ== X-Received: by 2002:a5d:494a:: with SMTP id r10mr2632648wrs.136.1588672916269; Tue, 05 May 2020 03:01:56 -0700 (PDT) Received: from localhost.localdomain ([37.120.63.158]) by smtp.gmail.com with ESMTPSA id n6sm2884258wmc.28.2020.05.05.03.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2020 03:01:55 -0700 (PDT) From: Robert Foss To: Andy Shevchenko , Sakari Ailus , Marco Felsch , Maxime Ripard , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Dongchun Zhu , Fabio Estevam , Tomasz Figa , Ben Kao , Robert Foss , Maxime Ripard Subject: [PATCH v10 1/3] media: dt-bindings: ov8856: Document YAML bindings Date: Tue, 5 May 2020 12:01:29 +0200 Message-Id: <20200505100129.104673-2-robert.foss@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200505100129.104673-1-robert.foss@linaro.org> References: <20200505100129.104673-1-robert.foss@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Dongchun Zhu This patch adds documentation of device tree in YAML schema for the OV8856 CMOS image sensor. Signed-off-by: Dongchun Zhu Signed-off-by: Robert Foss Reviewed-by: Maxime Ripard --- - Changes since v9: * Remove remote-endpoint property * Marco: Make port property required again * Sakari: Remove Ben as a maintainer * Sakari: Replace data-lanes with const items * Sakari: Remove clock-lanes property * Sakari & Rob Herring: Change type of link-frequency work around dt-schema bug - Changes since v8: * Maxime: Added r-b - Changes since v7: * Marco: Make 'port' property optional * Maxime & Sakari: Add 'link-frequencies' property to dt binding * robher: Improve description for 'port' property - Changes since v6: * Marco: remove qcom specifics from DT example - Changes since v5: * Add assigned-clocks and assigned-clock-rates * robher: dt-schema errors - Changes since v4: * Fabio: Change reset-gpio to GPIO_ACTIVE_LOW, explain in description * Add clock-lanes property to example * robher: Fix syntax error in devicetree example - Changes since v3: * robher: Fix syntax error * robher: Removed maxItems * Fixes yaml 'make dt-binding-check' errors - Changes since v2: - Changes since v1: Fixes comments from Sakari, Tomasz * Add clock-frequency and link-frequencies in DT .../devicetree/bindings/media/i2c/ov8856.yaml | 142 ++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 143 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/ov8856.yaml diff --git a/Documentation/devicetree/bindings/media/i2c/ov8856.yaml b/Documentation/devicetree/bindings/media/i2c/ov8856.yaml new file mode 100644 index 000000000000..d6af685ad3ca --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/ov8856.yaml @@ -0,0 +1,142 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright (c) 2019 MediaTek Inc. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/i2c/ov8856.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Omnivision OV8856 CMOS Sensor Device Tree Bindings + +maintainers: + - Dongchun Zhu + +description: |- + The Omnivision OV8856 is a high performance, 1/4-inch, 8 megapixel, CMOS + image sensor that delivers 3264x2448 at 30fps. It provides full-frame, + sub-sampled, and windowed 10-bit MIPI images in various formats via the + Serial Camera Control Bus (SCCB) interface. This chip is programmable + through I2C and two-wire SCCB. The sensor output is available via CSI-2 + serial data output (up to 4-lane). + +properties: + compatible: + const: ovti,ov8856 + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + description: + Input clock for the sensor. + items: + - const: xvclk + + clock-frequency: + description: + Frequency of the xvclk clock in Hertz. + + dovdd-supply: + description: + Definition of the regulator used as interface power supply. + + avdd-supply: + description: + Definition of the regulator used as analog power supply. + + dvdd-supply: + description: + Definition of the regulator used as digital power supply. + + reset-gpios: + description: + The phandle and specifier for the GPIO that controls sensor reset. + This corresponds to the hardware pin XSHUTDOWN which is physically + active low. + + port: + type: object + additionalProperties: false + description: + A node containing an output port node with an endpoint definition + as documented in + Documentation/devicetree/bindings/media/video-interfaces.txt + + properties: + endpoint: + type: object + + properties: + data-lanes: + description: |- + The driver only supports four-lane operation. + items: + - const: 1 + - const: 2 + - const: 3 + - const: 4 + + link-frequencies: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint64-array + description: + Allowed data bus frequencies. 360000000, 180000000 Hz or both + are supported by the driver. + + + required: + - link-frequencies + + required: + - endpoint + +required: + - compatible + - reg + - clocks + - clock-names + - clock-frequency + - dovdd-supply + - avdd-supply + - dvdd-supply + - reset-gpios + - port + +additionalProperties: false + +examples: + - | + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + ov8856: camera@10 { + compatible = "ovti,ov8856"; + reg = <0x10>; + + reset-gpios = <&pio 111 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&clk_24m_cam>; + + clocks = <&cam_osc>; + clock-names = "xvclk"; + clock-frequency = <19200000>; + + avdd-supply = <&mt6358_vcama2_reg>; + dvdd-supply = <&mt6358_vcamd_reg>; + dovdd-supply = <&mt6358_vcamio_reg>; + + port { + wcam_out: endpoint { + remote-endpoint = <&mipi_in_wcam>; + data-lanes = <1 2 3 4>; + link-frequencies = /bits/ 64 <360000000>; + }; + }; + }; + }; +... \ No newline at end of file diff --git a/MAINTAINERS b/MAINTAINERS index 26f281d9f32a..84b262afd13d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12489,6 +12489,7 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: drivers/media/i2c/ov8856.c +F: Documentation/devicetree/bindings/media/i2c/ov8856.yaml OMNIVISION OV9640 SENSOR DRIVER M: Petr Cvek From patchwork Tue May 5 10:01:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 201100 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A09B8C4725B for ; Tue, 5 May 2020 10:02:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8235F206E6 for ; Tue, 5 May 2020 10:02:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tj9jstQl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728740AbgEEKCL (ORCPT ); Tue, 5 May 2020 06:02:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728736AbgEEKCK (ORCPT ); Tue, 5 May 2020 06:02:10 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E9D8C061A0F for ; Tue, 5 May 2020 03:02:10 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id k12so1594924wmj.3 for ; Tue, 05 May 2020 03:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6ARsMuKYhMVLxyg5O1RxGGO0HJh3za6PnGW69GdNBJ8=; b=tj9jstQlHQwxdLi82NpQl1+wOETOL0437W7bk+nJ218gBSz4wh0KU80LEHlbUVpAU9 1COLiEfLL4x4WRRkaTcMs6agaZvgFAJZSxSgvmdgq0KtNdiUJPY7r8k4m7ek7LItNvM5 Ywv9pLxXQBfL/aUSGI0wpKAk2S7AF22jntxLzG2bpIALl5ODWwNooBRMM8bPU0f0aBdw ees1DQwOg2hl1uezS8yD+k/NxC/F0Xv+OQIT3nGNXjSVzk2Wx3yDQCpbN6QSz+v/ZUc5 IrDLoiDhWMPtIl56p+OIQvYjHqXzzROgwPOyNuvkjEkZNzCfXO5itng/CzPTskBXGZy9 TjaA== 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=6ARsMuKYhMVLxyg5O1RxGGO0HJh3za6PnGW69GdNBJ8=; b=SqRCHu8rP3iJ7sU3wRm8tNUzeWBHPPR79clLnHUhP1xwc99iUcvanZu+GCwV61D+09 vIZddzW6qeyASnJGwlRr3TEy4AvzEzDoioIn4vQjmqcPJWuvb4oAdHBvjEXjhVjWXp5a B6QJUeVPzh3I49tP+JYPMEnj1ebkNCDq45H+HaSOsE/E0biaWAjTJ4epiqO8Z8H8AU9I n5TU5xuGCXBOuYLFBkD4UMzsYcpV+VwFVo3/n82Cs0/iNZMJXZ1HVN/BU5ev3HC+9KvU y1Kzw1JiDpC2z7rNbE4KlfstU8kfkZFDxqSrsDx8cwTfJOA9rYU8JlwutKl0lgJGPJkU za1w== X-Gm-Message-State: AGi0PuY/PyQtimNA8MJgU5a/xeP0rkqcla1b1GZ61ghTFxzQ1E1PNZzH KEHmY4q+ubZ4nCycXpYXQXNn1A== X-Google-Smtp-Source: APiQypKwu36pUjC85aEvxmSpfIP0n4+pkY0t2Ob4Bb98cCm8CtABo39acwOtrwCqI8byYKvbJV3XYA== X-Received: by 2002:a1c:a549:: with SMTP id o70mr2541234wme.179.1588672929334; Tue, 05 May 2020 03:02:09 -0700 (PDT) Received: from localhost.localdomain ([37.120.63.158]) by smtp.gmail.com with ESMTPSA id n6sm2884258wmc.28.2020.05.05.03.02.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2020 03:02:08 -0700 (PDT) From: Robert Foss To: Andy Shevchenko , Sakari Ailus , Marco Felsch , Maxime Ripard , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Dongchun Zhu , Fabio Estevam , Tomasz Figa , Ben Kao , Robert Foss Subject: [PATCH v7 3/3] media: ov8856: Implement sensor module revision identification Date: Tue, 5 May 2020 12:01:32 +0200 Message-Id: <20200505100129.104673-4-robert.foss@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200505100129.104673-1-robert.foss@linaro.org> References: <20200505100129.104673-1-robert.foss@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Query the sensor for its module revision, and compare it to known revisions. Currently 2A and 1B revision indentification is supported. Signed-off-by: Robert Foss --- - Changes since v3: * Actually add module revision 2A - Changes since v2: * Add module revision 2A * Sakari: Remove ov8856_check_revision() * Sakari: Stop EEPROM streaming mode drivers/media/i2c/ov8856.c | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c index e6418a79801e..3c82c3e588d7 100644 --- a/drivers/media/i2c/ov8856.c +++ b/drivers/media/i2c/ov8856.c @@ -32,6 +32,19 @@ #define OV8856_MODE_STANDBY 0x00 #define OV8856_MODE_STREAMING 0x01 +/* module revisions */ +#define OV8856_2A_MODULE 0x01 +#define OV8856_1B_MODULE 0x02 + +/* the OTP read-out buffer is at 0x7000 and 0xf is the offset + * of the byte in the OTP that means the module revision + */ +#define OV8856_MODULE_REVISION 0x700f +#define OV8856_OTP_MODE_CTRL 0x3d84 +#define OV8856_OTP_LOAD_CTRL 0x3d81 +#define OV8856_OTP_MODE_AUTO 0x00 +#define OV8856_OTP_LOAD_CTRL_ENABLE BIT(0) + /* vertical-timings from sensor */ #define OV8856_REG_VTS 0x380e #define OV8856_VTS_MAX 0x7fff @@ -1152,6 +1165,46 @@ static int ov8856_identify_module(struct ov8856 *ov8856) return -ENXIO; } + ret = ov8856_write_reg(ov8856, OV8856_REG_MODE_SELECT, + OV8856_REG_VALUE_08BIT, OV8856_MODE_STREAMING); + if (ret) + return ret; + + ret = ov8856_write_reg(ov8856, OV8856_OTP_MODE_CTRL, + OV8856_REG_VALUE_08BIT, OV8856_OTP_MODE_AUTO); + if (ret) { + dev_err(&client->dev, "failed to set otp mode"); + return ret; + } + + ret = ov8856_write_reg(ov8856, OV8856_OTP_LOAD_CTRL, + OV8856_REG_VALUE_08BIT, + OV8856_OTP_LOAD_CTRL_ENABLE); + if (ret) { + dev_err(&client->dev, "failed to enable load control"); + return ret; + } + + ret = ov8856_read_reg(ov8856, OV8856_MODULE_REVISION, + OV8856_REG_VALUE_08BIT, &val); + if (ret) { + dev_err(&client->dev, "failed to read module revision"); + return ret; + } + + dev_info(&client->dev, "OV8856 revision %x (%s) at address 0x%02x\n", + val, + val == OV8856_2A_MODULE ? "2A" : + val == OV8856_1B_MODULE ? "1B" : "unknown revision", + client->addr); + + ret = ov8856_write_reg(ov8856, OV8856_REG_MODE_SELECT, + OV8856_REG_VALUE_08BIT, OV8856_MODE_STANDBY); + if (ret) { + dev_err(&client->dev, "failed to exit streaming mode"); + return ret; + } + return 0; }