From patchwork Mon Oct 19 17:02:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11844785 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 BEDD7157C for ; Mon, 19 Oct 2020 17:03:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FBCC2064C for ; Mon, 19 Oct 2020 17:03:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603126983; bh=5m3PXqqc5gUg7E17UxkNthGmAsWQFVOiTy+EyGvAX4Q=; h=From:To:Cc:Subject:Date:List-ID:From; b=q48lwI0qjwEfRatLHfHqJh9poX2euEaUJS8mi5g+ZMdJXAZTzHyX8mHYWR111G7i+ cgoRmq1/ul/knStj5msGSOlTx6HyLwM3MLyCB9PKL7avDc8Qfew9JmTYgwa8eROTbT LlPoRTKchUnk1byAeAXPCekXxa0TTV0qWEnvw6BE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731041AbgJSRDB (ORCPT ); Mon, 19 Oct 2020 13:03:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:35946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731033AbgJSRDA (ORCPT ); Mon, 19 Oct 2020 13:03:00 -0400 Received: from localhost.localdomain (unknown [194.230.155.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C98AC205ED; Mon, 19 Oct 2020 17:02:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603126979; bh=5m3PXqqc5gUg7E17UxkNthGmAsWQFVOiTy+EyGvAX4Q=; h=From:To:Cc:Subject:Date:From; b=aQaCuB1baKgVuEgGfaK+keOXYRuF+p6Tu69qWkmnh9KfdEYe3Fl9Can/ka6Kh+cBW 9Ormi2H9eLAiCk5FEJTn+ym8zGQu+bFxpQD6ijs/mH+dCGDj7GiIPqlxv8PT2odLN4 5gTE0TQ/oVDM7CzcA5R9vUJ6aTRac8LbGJOyD44M= From: Krzysztof Kozlowski To: Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Krzysztof Kozlowski , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Rob Herring Subject: [PATCH v5 1/4] dt-bindings: media: imx258: add bindings for IMX258 sensor Date: Mon, 19 Oct 2020 19:02:44 +0200 Message-Id: <20201019170247.92002-1-krzk@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add bindings for the IMX258 camera sensor. The bindings, just like the driver, are quite limited, e.g. do not support regulator supplies. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Changes since v4: 1. Add clock-lanes, 2. Add Rob's review, 3. Add one more example and extend existing one, 4. Add common clock properties (assigned-*). Changes since v3: 1. Document also two lane setup. Changes since v2: 1. Remove clock-frequency, add reset GPIOs, add supplies. 2. Use additionalProperties. Changes since v1: 1. None --- .../devicetree/bindings/media/i2c/imx258.yaml | 140 ++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 141 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/imx258.yaml diff --git a/Documentation/devicetree/bindings/media/i2c/imx258.yaml b/Documentation/devicetree/bindings/media/i2c/imx258.yaml new file mode 100644 index 000000000000..4a3471fb88a1 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx258.yaml @@ -0,0 +1,140 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/i2c/imx258.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Sony IMX258 13 Mpixel CMOS Digital Image Sensor + +maintainers: + - Krzysztof Kozlowski + +description: |- + IMX258 is a diagonal 5.867mm (Type 1/3.06) 13 Mega-pixel CMOS active pixel + type stacked image sensor with a square pixel array of size 4208 x 3120. It + is programmable through I2C interface. Image data is sent through MIPI + CSI-2. + +properties: + compatible: + const: sony,imx258 + + assigned-clocks: true + assigned-clock-parents: true + assigned-clock-rates: true + + clocks: + description: + Clock frequency from 6 to 27 MHz. + maxItems: 1 + + reg: + maxItems: 1 + + reset-gpios: + description: |- + Reference to the GPIO connected to the XCLR pin, if any. + + vana-supply: + description: + Analog voltage (VANA) supply, 2.7 V + + vdig-supply: + description: + Digital I/O voltage (VDIG) supply, 1.2 V + + vif-supply: + description: + Interface voltage (VIF) supply, 1.8 V + + # See ../video-interfaces.txt for more details + port: + type: object + properties: + endpoint: + type: object + properties: + clock-lanes: + const: 0 + + data-lanes: + oneOf: + - items: + - const: 1 + - const: 2 + - const: 3 + - const: 4 + - items: + - const: 1 + - const: 2 + + link-frequencies: + allOf: + - $ref: /schemas/types.yaml#/definitions/uint64-array + description: + Allowed data bus frequencies. + + required: + - clock-lanes + - data-lanes + - link-frequencies + +required: + - compatible + - reg + - port + +additionalProperties: false + +examples: + - | + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + + sensor@6c { + compatible = "sony,imx258"; + reg = <0x6c>; + clocks = <&imx258_clk>; + + port { + endpoint { + remote-endpoint = <&csi1_ep>; + clock-lanes = <0>; + data-lanes = <1 2 3 4>; + link-frequencies = /bits/ 64 <320000000>; + }; + }; + }; + }; + + /* Oscillator on the camera board */ + imx258_clk: clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <19200000>; + }; + + - | + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + + sensor@6c { + compatible = "sony,imx258"; + reg = <0x6c>; + clocks = <&imx258_clk>; + + assigned-clocks = <&imx258_clk>; + assigned-clock-rates = <19200000>; + + port { + endpoint { + remote-endpoint = <&csi1_ep>; + clock-lanes = <0>; + data-lanes = <1 2 3 4>; + link-frequencies = /bits/ 64 <633600000>; + }; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 5b9621ca2b31..68f30a283a2c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16262,6 +16262,7 @@ M: Sakari Ailus L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git +F: Documentation/devicetree/bindings/media/i2c/imx258.yaml F: drivers/media/i2c/imx258.c SONY IMX274 SENSOR DRIVER From patchwork Mon Oct 19 17:26:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11844821 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 8F65515E6 for ; Mon, 19 Oct 2020 17:26:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D05E222B8 for ; Mon, 19 Oct 2020 17:26:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603128397; bh=LtTPIaLF+T/Egigfy7DlYYdG0ge5HEoysq5xjHOwEqc=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=PkOBDjcrOYi5o1JJTCmrM3Xsx3PmuTT24kXpND3Xyt/zvsR/O8IJfakAWDo1U4a2Z BQV3xSPsS13ITDZWynKRSPOYaoOOFDxwUGKJKNMmSYGcwZ7ds91jDw11sUF1TQ2s4P 4TB6Y8fX0OK9nDfjFXIlm2tB1pc84nMQI8mB7QEY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731107AbgJSR0f (ORCPT ); Mon, 19 Oct 2020 13:26:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:41696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730959AbgJSR0a (ORCPT ); Mon, 19 Oct 2020 13:26:30 -0400 Received: from localhost.localdomain (unknown [194.230.155.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3CAEF2224D; Mon, 19 Oct 2020 17:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603128390; bh=LtTPIaLF+T/Egigfy7DlYYdG0ge5HEoysq5xjHOwEqc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=klwvKpNBkSxcw7dMdvmeDPhn+uBB8ddY67JWfaOCgohr6LwJoV8z+pzLqCiT/e7bC hoKNL4J8IZUVi212uChMPAfE+/UFuRqIdO6+u1BOU5jEtoXCVArz/CPFkpFmP0gPI7 M0V9j/NargeRy5Qf4+oxX8HspQ8roeX3EgDdoUW0= From: Krzysztof Kozlowski To: Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Krzysztof Kozlowski , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 2/4] media: i2c: imx258: add support for binding via device tree Date: Mon, 19 Oct 2020 19:26:15 +0200 Message-Id: <20201019172617.92815-1-krzk@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201019170247.92002-1-krzk@kernel.org> References: <20201019170247.92002-1-krzk@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The IMX258 can be used also on embedded designs using device tree so allow the sensor to bind to a device tree node. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. None --- drivers/media/i2c/imx258.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index ccb55fd1d506..ed79bfb4c991 100644 --- a/drivers/media/i2c/imx258.c +++ b/drivers/media/i2c/imx258.c @@ -1291,11 +1291,18 @@ static const struct acpi_device_id imx258_acpi_ids[] = { MODULE_DEVICE_TABLE(acpi, imx258_acpi_ids); #endif +static const struct of_device_id imx258_dt_ids[] = { + { .compatible = "sony,imx258" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, imx258_dt_ids); + static struct i2c_driver imx258_i2c_driver = { .driver = { .name = "imx258", .pm = &imx258_pm_ops, .acpi_match_table = ACPI_PTR(imx258_acpi_ids), + .of_match_table = imx258_dt_ids, }, .probe_new = imx258_probe, .remove = imx258_remove, From patchwork Mon Oct 19 17:26:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11844829 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 728CE14B4 for ; Mon, 19 Oct 2020 17:26:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4CA8A2224D for ; Mon, 19 Oct 2020 17:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603128419; bh=J40kgzyzsj/0YMfP/Jq1oo6X7s7MkmBqimZTxeq7XMM=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=zQKV33Un/yZRgD34hV3d0zblMOySs4vThIQHtRwLJDmSlbkWLgNMy/MiuanuGrif/ kVSZNG4AZ9mG4otONIjaTfuI58WkBYl24FqtjpbFBR9UuBo+BJXepSwINxNA+ovdYm B3oe5kGDa0Gv6eFvnqFyCisPOVNiW+SyoSqK5ao4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731120AbgJSR0h (ORCPT ); Mon, 19 Oct 2020 13:26:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:41848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730999AbgJSR0g (ORCPT ); Mon, 19 Oct 2020 13:26:36 -0400 Received: from localhost.localdomain (unknown [194.230.155.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A526922282; Mon, 19 Oct 2020 17:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603128395; bh=J40kgzyzsj/0YMfP/Jq1oo6X7s7MkmBqimZTxeq7XMM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=XPOW6OG++5rjrcug+BL22mtDakDKnAcQlsNRF0W7/aC3/3PgoggkF181O/umRQpWe eVyCklD+Ugzf5go0ioYe3mMDpYtoaC+j+Rc2pt84mwlTJWmff6nnQSOmVwDZ2k+GOM 7UPTwejEvCpM1VanbZ23fiYsR9iS4I7+RS+N/fBw= From: Krzysztof Kozlowski To: Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Krzysztof Kozlowski , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 3/4] media: i2c: imx258: simplify getting state container Date: Mon, 19 Oct 2020 19:26:16 +0200 Message-Id: <20201019172617.92815-2-krzk@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201019172617.92815-1-krzk@kernel.org> References: <20201019170247.92002-1-krzk@kernel.org> <20201019172617.92815-1-krzk@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The pointer to 'struct v4l2_subdev' is stored in drvdata via v4l2_i2c_subdev_init() so there is no point of a dance like: struct i2c_client *client = to_i2c_client(struct device *dev) struct v4l2_subdev *sd = i2c_get_clientdata(client); This allows to remove local variable 'client' and few pointer dereferences. Signed-off-by: Krzysztof Kozlowski --- Changes since v3: 1. None Changes since v2: 1. New patch --- drivers/media/i2c/imx258.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index ed79bfb4c991..ae183b0dbba9 100644 --- a/drivers/media/i2c/imx258.c +++ b/drivers/media/i2c/imx258.c @@ -1018,8 +1018,7 @@ static int imx258_set_stream(struct v4l2_subdev *sd, int enable) static int __maybe_unused imx258_suspend(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); - struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct v4l2_subdev *sd = dev_get_drvdata(dev); struct imx258 *imx258 = to_imx258(sd); if (imx258->streaming) @@ -1030,8 +1029,7 @@ static int __maybe_unused imx258_suspend(struct device *dev) static int __maybe_unused imx258_resume(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); - struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct v4l2_subdev *sd = dev_get_drvdata(dev); struct imx258 *imx258 = to_imx258(sd); int ret; From patchwork Mon Oct 19 17:26:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11844823 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 A18E114B4 for ; Mon, 19 Oct 2020 17:26:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7952222314 for ; Mon, 19 Oct 2020 17:26:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603128409; bh=9VekKCyuc32rUGeAXkmomZLwHOrivk4pY7Iug35yAUU=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=2O3Y5to6cryg574R/mXovsirt1OuFjSxeXm6Nhr44BVIXL1LqVic4mk/So4If37a1 rpka3Is1xQND9jnUCQ3/H85Uc5eoRupjOjnfKe+4MzRAp4fC5hUNJbjjA1afiDCxsP vtyv6goq3EMhhEwmySWjBcD6KFGltUm/HTte964c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731203AbgJSR0m (ORCPT ); Mon, 19 Oct 2020 13:26:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:41950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731187AbgJSR0l (ORCPT ); Mon, 19 Oct 2020 13:26:41 -0400 Received: from localhost.localdomain (unknown [194.230.155.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C599522314; Mon, 19 Oct 2020 17:26:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603128400; bh=9VekKCyuc32rUGeAXkmomZLwHOrivk4pY7Iug35yAUU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=l0MdbRXi3Sk9vqBToW3jKl5mPLRUQjgfGtDe/X0LBiqInwgEFwjvarUJX0xCLCXT5 kU9Hp/mj4HfIdg9KWd4HRLhVxBjLxSYgNGdNi2dBUOc8p0gRAlayUaP1hdFVD1bE7G MjH+otrr9k5ybae8xMVpcLX2xd26qy4VLvpBMD7c= From: Krzysztof Kozlowski To: Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Krzysztof Kozlowski , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 4/4] media: i2c: imx258: get clock from device properties and enable it via runtime PM Date: Mon, 19 Oct 2020 19:26:17 +0200 Message-Id: <20201019172617.92815-3-krzk@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201019172617.92815-1-krzk@kernel.org> References: <20201019170247.92002-1-krzk@kernel.org> <20201019172617.92815-1-krzk@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The IMX258 sensor driver checked in device properties for a clock-frequency property which actually does not mean that the clock is really running such frequency or is it even enabled. Get the provided clock and check it frequency. If none is provided, fall back to old property. Enable the clock when accessing the IMX258 registers and when streaming starts with runtime PM. Signed-off-by: Krzysztof Kozlowski --- Changes since v4: 1. Add missing imx258_power_off. Changes since v3: 1. None Changes since v2: 1. Do not try to set drvdata, wrap lines. 2. Use dev_dbg. Changes since v1: 1. Use runtime PM for clock toggling --- drivers/media/i2c/imx258.c | 73 +++++++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 9 deletions(-) diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index ae183b0dbba9..038115471f17 100644 --- a/drivers/media/i2c/imx258.c +++ b/drivers/media/i2c/imx258.c @@ -2,6 +2,7 @@ // Copyright (C) 2018 Intel Corporation #include +#include #include #include #include @@ -68,6 +69,9 @@ #define REG_CONFIG_MIRROR_FLIP 0x03 #define REG_CONFIG_FLIP_TEST_PATTERN 0x02 +/* Input clock frequency in Hz */ +#define IMX258_INPUT_CLOCK_FREQ 19200000 + struct imx258_reg { u16 address; u8 val; @@ -610,6 +614,8 @@ struct imx258 { /* Streaming on/off */ bool streaming; + + struct clk *clk; }; static inline struct imx258 *to_imx258(struct v4l2_subdev *_sd) @@ -972,6 +978,29 @@ static int imx258_stop_streaming(struct imx258 *imx258) return 0; } +static int imx258_power_on(struct device *dev) +{ + struct v4l2_subdev *sd = dev_get_drvdata(dev); + struct imx258 *imx258 = to_imx258(sd); + int ret; + + ret = clk_prepare_enable(imx258->clk); + if (ret) + dev_err(dev, "failed to enable clock\n"); + + return ret; +} + +static int imx258_power_off(struct device *dev) +{ + struct v4l2_subdev *sd = dev_get_drvdata(dev); + struct imx258 *imx258 = to_imx258(sd); + + clk_disable_unprepare(imx258->clk); + + return 0; +} + static int imx258_set_stream(struct v4l2_subdev *sd, int enable) { struct imx258 *imx258 = to_imx258(sd); @@ -1199,9 +1228,28 @@ static int imx258_probe(struct i2c_client *client) int ret; u32 val = 0; - device_property_read_u32(&client->dev, "clock-frequency", &val); - if (val != 19200000) - return -EINVAL; + imx258 = devm_kzalloc(&client->dev, sizeof(*imx258), GFP_KERNEL); + if (!imx258) + return -ENOMEM; + + imx258->clk = devm_clk_get_optional(&client->dev, NULL); + if (!imx258->clk) { + dev_dbg(&client->dev, + "no clock provided, using clock-frequency property\n"); + + device_property_read_u32(&client->dev, "clock-frequency", &val); + if (val != IMX258_INPUT_CLOCK_FREQ) + return -EINVAL; + } else if (IS_ERR(imx258->clk)) { + return dev_err_probe(&client->dev, PTR_ERR(imx258->clk), + "error getting clock\n"); + } else { + if (clk_get_rate(imx258->clk) != IMX258_INPUT_CLOCK_FREQ) { + dev_err(&client->dev, + "input clock frequency not supported\n"); + return -EINVAL; + } + } /* * Check that the device is mounted upside down. The driver only @@ -1211,24 +1259,25 @@ static int imx258_probe(struct i2c_client *client) if (ret || val != 180) return -EINVAL; - imx258 = devm_kzalloc(&client->dev, sizeof(*imx258), GFP_KERNEL); - if (!imx258) - return -ENOMEM; - /* Initialize subdev */ v4l2_i2c_subdev_init(&imx258->sd, client, &imx258_subdev_ops); + /* Will be powered off via pm_runtime_idle */ + ret = imx258_power_on(&client->dev); + if (ret) + return ret; + /* Check module identity */ ret = imx258_identify_module(imx258); if (ret) - return ret; + goto error_identify; /* Set default mode to max resolution */ imx258->cur_mode = &supported_modes[0]; ret = imx258_init_controls(imx258); if (ret) - return ret; + goto error_identify; /* Initialize subdev */ imx258->sd.internal_ops = &imx258_internal_ops; @@ -1258,6 +1307,9 @@ static int imx258_probe(struct i2c_client *client) error_handler_free: imx258_free_controls(imx258); +error_identify: + imx258_power_off(&client->dev); + return ret; } @@ -1271,6 +1323,8 @@ static int imx258_remove(struct i2c_client *client) imx258_free_controls(imx258); pm_runtime_disable(&client->dev); + if (!pm_runtime_status_suspended(&client->dev)) + imx258_power_off(&client->dev); pm_runtime_set_suspended(&client->dev); return 0; @@ -1278,6 +1332,7 @@ static int imx258_remove(struct i2c_client *client) static const struct dev_pm_ops imx258_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(imx258_suspend, imx258_resume) + SET_RUNTIME_PM_OPS(imx258_power_off, imx258_power_on, NULL) }; #ifdef CONFIG_ACPI