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: 11528631 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2CC9E912 for ; Tue, 5 May 2020 10:02:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10BDB206E6 for ; Tue, 5 May 2020 10:02:03 +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 S1728665AbgEEKCB (ORCPT ); Tue, 5 May 2020 06:02:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728663AbgEEKB7 (ORCPT ); Tue, 5 May 2020 06:01:59 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A68C1C061A41 for ; Tue, 5 May 2020 03:01:57 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id e16so1987332wra.7 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=kLiJcDfLC+Uc21QVha9FhAlJY/oqP1yETTwOTW5rZ5jTvnRV8kzPPd/ez9km5rwgBF DqSrnA1LzytjHrDuF1pJfU7N/fSu98ezDVXjY49Vos+plUVxK4fsDL/Uh33ynmFHCqsj fKLHT6oixGL67YnOxnuTVndtdHveD/hIYn+NyhXoOp4pHSojk1oOV+4Uy9byLJa/yS5e gThTgUEdVo7sY1+EnZon1wC8IJ+nLCQZnesiVjrkL/rgNIuzn8jc3A0NUozP1+pNeIPF USwZVdd9h4/2EBWm0onqEeBte3jnlo7HC/0HzeW3BTx84qZ4L2ghq2GgrXxf/KFTZ0S1 obNQ== X-Gm-Message-State: AGi0PuaGBIJ87JtdJglWs70a2AnudjY6bXtXf8hjeueZYljOCVU06kUb TU6bqzuvupEBP1ZGA+n/4mGENA== 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: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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 Reviewed-by: Rob Herring Reviewed-by: Rob Herring --- - 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:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 11528633 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE83F912 for ; Tue, 5 May 2020 10:02:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AFBC206E6 for ; Tue, 5 May 2020 10:02:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="vEU/0TFD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728726AbgEEKCI (ORCPT ); Tue, 5 May 2020 06:02:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728663AbgEEKCH (ORCPT ); Tue, 5 May 2020 06:02:07 -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 C070AC061A10 for ; Tue, 5 May 2020 03:02:06 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id x17so1998945wrt.5 for ; Tue, 05 May 2020 03:02:06 -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=2Fw2uBJr+G9RBpw3f6MA5QDNKxdY0R/zAtoGtCSMwKQ=; b=vEU/0TFDXw73YnQ/v2k6vt/2awVhFNYBnJOgNHPhJL0xjrwdgmTBooDh46ALU5IBxm LfnflyTd8IDSx46t3Zx70rUIrzs4oNrXfEMLKglJWw9ncgtFZ0hyc/Eq8gJC+WUENJYw hejgKNVEkkt1cuCs4tQCvkgHOTle47yvqVpsTI59tiUMAoHnzUlZDlazO9uWaQSGKyeS uEEqWm4SONJz3WxoDchx1yAhWH1gi0yjZdup62IzSWVmwQVJZUv2ud8BFIU4MLejb7hR t7DiMJ0VYWL0xeYYCM8KzPSi39d9tVDSF2LJG+EQ04FKUz5TrUbnIAPJvmZq2xG3dpq4 wcCA== 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=2Fw2uBJr+G9RBpw3f6MA5QDNKxdY0R/zAtoGtCSMwKQ=; b=GUIoJ+t6XspTSSo6L7hetpyVkVRV+g/n7fkMxGjR/0ancM2Tmu+5O4yCm70R2pF457 PzGOZaFKvuQYxSnlD+7l0NYrt8ehM6jUERPKvCS1mOzUx4HE18FKRPKwVyFTuURYA+h/ I8p+HnO2CLeD/cLrVRvFWDYkakCvO9ZRcMRcBz0oJyomo4nx31GpUlzK8dEKGCwSCo51 uNG9E9kKkCeqYoZc2EYmZWX1vcFO4cd+Jemnd8viRTkZJruip2GH1Vgotztm4WQigPP1 20IYF3I7qGX4cVC8KdPUbQtKlY4H5yAYlsc2z/FWAfO8P9iHPX2Cw6DDXngbAxWJPjBJ A5EQ== X-Gm-Message-State: AGi0PuYjgps6OKBSWJE8VSJ07dyUdT34MIvt08n+RKTu2H0wdK2fnJ/8 /aaHjRKW+LA+fGtxYvTTcDKP3A== X-Google-Smtp-Source: APiQypI/27sXGxZEF/g3rF8pkqZIdpf9GxRzu9jed9BCZz1Ja1mZ3M95p8FEJOoayRHy9S8nWwFULA== X-Received: by 2002:a5d:6504:: with SMTP id x4mr3126754wru.340.1588672925400; Tue, 05 May 2020 03:02:05 -0700 (PDT) Received: from localhost.localdomain ([37.120.63.158]) by smtp.gmail.com with ESMTPSA id n6sm2884258wmc.28.2020.05.05.03.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2020 03:02:04 -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 2/3] media: ov8856: Add devicetree support Date: Tue, 5 May 2020 12:01:31 +0200 Message-Id: <20200505100129.104673-3-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: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add match table, enable ov8856_probe() to support both ACPI and DT modes. ACPI and DT modes are primarily distinguished from by checking for ACPI mode and by having resource like be NULL. Signed-off-by: Robert Foss --- - Changes since v6: * Marco: Bail out of __ov8856_power_on earlier if ACPI mode - Changes since v5: * Maxime & Sakari: Replaced clock tolerance check with warning - Changes since v4: * Maxime & Sakari: Switch to clock-frequency - Changes since v3: * Remove redundant {}-brackets * Compare xvclk_rate to 5% tolerance * Andy: Use dev_fwnode() * Andy: Use %pe instead of %ld + PTR_ERR() * Andy: Invert reset_gpio logic * Andy: Remove dev_dbg() from failing reset_gpio setup * Andy: Use dev_err for logging for failures * Andy: Remove dev_warn from EDEFER/regulator error path * Andy & Sakari: Replaced GPIOD_OUT_XXX with 0/1 * Maxime & Sakari: Verify clock frequency from DT * Sakari: Verify the 'xvclk_rate' is set correctly for ACPI/DT devices * Sakari: Remove duplicate ov8856->dev assignment - Changes since v2: * Added "struct device *dev" member to struct ov8856 * Andy: Switch to optional version of devm_gpiod_get * Andy: Switch to optional version of devm_clk_get * Fabio: Add reset sleep period * Sakari: Unify defines for 19.2Mhz * Sakari: Remove 24Mhz clock, since it isn't needed for supported modes * Sakari: Replace dev_info() with dev_dbg() * Sakari: Switch induction variable type to unsigned * Sakari: Don't wait for reset_gpio when in ACPI mode * Sakari: Pull reset GPIO high on power on failure * Sakari: Add power on/off to resume/suspend * Sakari: Fix indentation * Sakari: Power off during ov8856_remove() * Sakari: Don't sleep during power-on in ACPI mode * Sakari: Switch to getting xvclk from clk_get_rate - Changes since v1: * Andy & Sakari: Make XVCLK optional since to not break ACPI * Fabio: Change n_shutdown_gpio name to reset_gpio * Fabio: Invert reset_gpio due to GPIO_ACTIVE_HIGH -> GPIO_ACTIVE_LOW change * Fabio: Remove empty line * Fabio: Remove real error from devm_gpiod_get() failures * Sakari: ARRAY_SIZE() directly instead of through OV8856_NUM_SUPPLIES * Sakari: Use XVCLK rate as provided by DT drivers/media/i2c/ov8856.c | 137 +++++++++++++++++++++++++++++++++---- 1 file changed, 123 insertions(+), 14 deletions(-) diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c index 8655842af275..e6418a79801e 100644 --- a/drivers/media/i2c/ov8856.c +++ b/drivers/media/i2c/ov8856.c @@ -3,10 +3,13 @@ #include #include +#include #include +#include #include #include #include +#include #include #include #include @@ -18,7 +21,7 @@ #define OV8856_LINK_FREQ_360MHZ 360000000ULL #define OV8856_LINK_FREQ_180MHZ 180000000ULL #define OV8856_SCLK 144000000ULL -#define OV8856_MCLK 19200000 +#define OV8856_XVCLK_19_2 19200000 #define OV8856_DATA_LANES 4 #define OV8856_RGB_DEPTH 10 @@ -64,6 +67,12 @@ #define to_ov8856(_sd) container_of(_sd, struct ov8856, sd) +static const char * const ov8856_supply_names[] = { + "dovdd", /* Digital I/O power */ + "avdd", /* Analog power */ + "dvdd", /* Digital core power */ +}; + enum { OV8856_LINK_FREQ_720MBPS, OV8856_LINK_FREQ_360MBPS, @@ -566,6 +575,11 @@ struct ov8856 { struct media_pad pad; struct v4l2_ctrl_handler ctrl_handler; + struct device *dev; + struct clk *xvclk; + struct gpio_desc *reset_gpio; + struct regulator_bulk_data supplies[ARRAY_SIZE(ov8856_supply_names)]; + /* V4L2 Controls */ struct v4l2_ctrl *link_freq; struct v4l2_ctrl *pixel_rate; @@ -908,6 +922,52 @@ static int ov8856_set_stream(struct v4l2_subdev *sd, int enable) return ret; } +static int __ov8856_power_on(struct ov8856 *ov8856) +{ + struct i2c_client *client = v4l2_get_subdevdata(&ov8856->sd); + int ret; + + if (is_acpi_node(dev_fwnode(ov8856->dev))) + return 0; + + ret = clk_prepare_enable(ov8856->xvclk); + if (ret < 0) { + dev_err(&client->dev, "failed to enable xvclk\n"); + return ret; + } + + if (ov8856->reset_gpio) { + gpiod_set_value_cansleep(ov8856->reset_gpio, 1); + usleep_range(1000, 2000); + } + + ret = regulator_bulk_enable(ARRAY_SIZE(ov8856_supply_names), + ov8856->supplies); + if (ret < 0) { + dev_err(&client->dev, "failed to enable regulators\n"); + goto disable_clk; + } + + gpiod_set_value_cansleep(ov8856->reset_gpio, 0); + usleep_range(1500, 1800); + + return 0; + +disable_clk: + gpiod_set_value_cansleep(ov8856->reset_gpio, 1); + clk_disable_unprepare(ov8856->xvclk); + + return ret; +} + +static void __ov8856_power_off(struct ov8856 *ov8856) +{ + gpiod_set_value_cansleep(ov8856->reset_gpio, 1); + regulator_bulk_disable(ARRAY_SIZE(ov8856_supply_names), + ov8856->supplies); + clk_disable_unprepare(ov8856->xvclk); +} + static int __maybe_unused ov8856_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -918,6 +978,7 @@ static int __maybe_unused ov8856_suspend(struct device *dev) if (ov8856->streaming) ov8856_stop_streaming(ov8856); + __ov8856_power_off(ov8856); mutex_unlock(&ov8856->mutex); return 0; @@ -931,6 +992,8 @@ static int __maybe_unused ov8856_resume(struct device *dev) int ret; mutex_lock(&ov8856->mutex); + + __ov8856_power_on(ov8856); if (ov8856->streaming) { ret = ov8856_start_streaming(ov8856); if (ret) { @@ -1092,29 +1155,54 @@ static int ov8856_identify_module(struct ov8856 *ov8856) return 0; } -static int ov8856_check_hwcfg(struct device *dev) +static int ov8856_get_hwcfg(struct ov8856 *ov8856) { + struct device *dev = ov8856->dev; struct fwnode_handle *ep; struct fwnode_handle *fwnode = dev_fwnode(dev); struct v4l2_fwnode_endpoint bus_cfg = { .bus_type = V4L2_MBUS_CSI2_DPHY }; - u32 mclk; + u32 xvclk_rate; int ret; unsigned int i, j; if (!fwnode) return -ENXIO; - ret = fwnode_property_read_u32(fwnode, "clock-frequency", &mclk); + ret = fwnode_property_read_u32(fwnode, "clock-frequency", + &xvclk_rate); if (ret) return ret; - if (mclk != OV8856_MCLK) { - dev_err(dev, "external clock %d is not supported", mclk); - return -EINVAL; + if (!is_acpi_node(fwnode)) { + ov8856->xvclk = devm_clk_get(dev, "xvclk"); + if (IS_ERR(ov8856->xvclk)) { + dev_err(dev, "could not get xvclk clock (%pe)\n", + ov8856->xvclk); + return PTR_ERR(ov8856->xvclk); + } + + clk_set_rate(ov8856->xvclk, xvclk_rate); + xvclk_rate = clk_get_rate(ov8856->xvclk); } + if (xvclk_rate != OV8856_XVCLK_19_2) + dev_warn(dev, "external clock rate %d is unsupported", xvclk_rate); + + ov8856->reset_gpio = devm_gpiod_get_optional(dev, "reset", + GPIOD_OUT_LOW); + if (IS_ERR(ov8856->reset_gpio)) + return PTR_ERR(ov8856->reset_gpio); + + for (i = 0; i < ARRAY_SIZE(ov8856_supply_names); i++) + ov8856->supplies[i].supply = ov8856_supply_names[i]; + + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ov8856_supply_names), + ov8856->supplies); + if (ret) + return ret; + ep = fwnode_graph_get_next_endpoint(fwnode, NULL); if (!ep) return -ENXIO; @@ -1169,6 +1257,8 @@ static int ov8856_remove(struct i2c_client *client) pm_runtime_disable(&client->dev); mutex_destroy(&ov8856->mutex); + __ov8856_power_off(ov8856); + return 0; } @@ -1177,22 +1267,31 @@ static int ov8856_probe(struct i2c_client *client) struct ov8856 *ov8856; int ret; - ret = ov8856_check_hwcfg(&client->dev); + ov8856 = devm_kzalloc(&client->dev, sizeof(*ov8856), GFP_KERNEL); + if (!ov8856) + return -ENOMEM; + + ov8856->dev = &client->dev; + + ret = ov8856_get_hwcfg(ov8856); if (ret) { - dev_err(&client->dev, "failed to check HW configuration: %d", + dev_err(&client->dev, "failed to get HW configuration: %d", ret); return ret; } - ov8856 = devm_kzalloc(&client->dev, sizeof(*ov8856), GFP_KERNEL); - if (!ov8856) - return -ENOMEM; - v4l2_i2c_subdev_init(&ov8856->sd, client, &ov8856_subdev_ops); + + ret = __ov8856_power_on(ov8856); + if (ret) { + dev_err(&client->dev, "failed to power on\n"); + return ret; + } + ret = ov8856_identify_module(ov8856); if (ret) { dev_err(&client->dev, "failed to find sensor: %d", ret); - return ret; + goto probe_power_off; } mutex_init(&ov8856->mutex); @@ -1238,6 +1337,9 @@ static int ov8856_probe(struct i2c_client *client) v4l2_ctrl_handler_free(ov8856->sd.ctrl_handler); mutex_destroy(&ov8856->mutex); +probe_power_off: + __ov8856_power_off(ov8856); + return ret; } @@ -1254,11 +1356,18 @@ static const struct acpi_device_id ov8856_acpi_ids[] = { MODULE_DEVICE_TABLE(acpi, ov8856_acpi_ids); #endif +static const struct of_device_id ov8856_of_match[] = { + { .compatible = "ovti,ov8856" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ov8856_of_match); + static struct i2c_driver ov8856_i2c_driver = { .driver = { .name = "ov8856", .pm = &ov8856_pm_ops, .acpi_match_table = ACPI_PTR(ov8856_acpi_ids), + .of_match_table = ov8856_of_match, }, .probe_new = ov8856_probe, .remove = ov8856_remove, 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: 11528637 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BCDE6912 for ; Tue, 5 May 2020 10:02:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5DE82075A for ; Tue, 5 May 2020 10:02:14 +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 S1728742AbgEEKCM (ORCPT ); Tue, 5 May 2020 06:02:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728180AbgEEKCL (ORCPT ); Tue, 5 May 2020 06:02:11 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F0C2C061A10 for ; Tue, 5 May 2020 03:02:10 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id z6so1645105wml.2 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=W7THnyY+KJKCS6BZNQd2xl9sEVJf1jI9P9Z/BzY1DQHbhGs5786OFG6pXFBKxPwKtl QTv9DvNVc+NTSvckBhmo2yzX6SK8UbhIMKfNiYWh+eSC1MJA4dhzeKG++eFxhlPdUV0O rBOIZqZbsuA0FaK013WMCWz6sKZRBHPAwRCsfC2Ix0EfoSKo0jJJkreFxG7IpoIEpU/1 EyaHXNQgESyxoepcPoxIXGi5HlFmePfPArdiRH7FX1yZeZCVnPck27PE6pS0DtvAqcg4 ujCnrqBLQhFqCW5jt8M+/Crio1seJKZu1PXnXuW78ukho/OxVMofsZPjBUjoKJ/BjmbL AoQw== X-Gm-Message-State: AGi0PuZnuBH80uCHbylSqcnVYY241XNRPWbbFuhxlC5HsSrzIplkNR4h zqdrAbQQgukED0ZOU0u6N2hXLg== 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: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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; }