From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 AD2FDC8300C for ; Thu, 30 Apr 2020 09:59:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8ACE321D79 for ; Thu, 30 Apr 2020 09:59:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726820AbgD3J7R (ORCPT ); Thu, 30 Apr 2020 05:59:17 -0400 Received: from retiisi.org.uk ([95.216.213.190]:56968 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726378AbgD3J7Q (ORCPT ); Thu, 30 Apr 2020 05:59:16 -0400 Received: from valkosipuli.localdomain (valkosipuli.retiisi.org.uk [IPv6:2a01:4f9:c010:4572::80:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hillosipuli.retiisi.org.uk (Postfix) with ESMTPS id EBA90634C8F; Thu, 30 Apr 2020 12:59:07 +0300 (EEST) Received: from sailus by valkosipuli.localdomain with local (Exim 4.92) (envelope-from ) id 1jU5yF-0000QG-Pc; Thu, 30 Apr 2020 12:59:07 +0300 Date: Thu, 30 Apr 2020 12:59:07 +0300 From: Sakari Ailus To: Marco Felsch Cc: Robert Foss , Andy Shevchenko , Maxime Ripard , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Dongchun Zhu , Fabio Estevam , Tomasz Figa Subject: Re: [PATCH v6 2/3] media: ov8856: Add devicetree support Message-ID: <20200430095907.GG867@valkosipuli.retiisi.org.uk> References: <20200429162437.2025699-1-robert.foss@linaro.org> <20200429162437.2025699-3-robert.foss@linaro.org> <20200430093524.GB2188@pengutronix.de> <20200430094549.GF867@valkosipuli.retiisi.org.uk> <20200430095332.GC2188@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200430095332.GC2188@pengutronix.de> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Marco, On Thu, Apr 30, 2020 at 11:53:32AM +0200, Marco Felsch wrote: > Hi Sakari, > > On 20-04-30 12:45, Sakari Ailus wrote: > > Hi Marco, > > > > On Thu, Apr 30, 2020 at 11:35:24AM +0200, Marco Felsch wrote: > > > Hi Robert, > > > > > > thnakf for the patch but pls keep in mind to do one thing per patch. > > > IMHO this patch do a lot more. Anyway below are my comment :) > > > > > > On 20-04-29 18:24, Robert Foss wrote: > > > > Add match table, enable ov8856_probe() to support > > > > both ACPI and DT modes. > > > > > > You are also adding the support for reset-gpios and regualtors. IMHO the > > > commit message don't belong to the changes you made anymore. > > > > > > > ACPI and DT modes are primarily distinguished from > > > > each other by relying on devm_XXX_get_optional() > > > > will return NULL instead of a reference for the > > > > desired managed resource. > > > > > > > > Signed-off-by: Robert Foss > > > > --- > > > > > > > > - 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..4749dc74d5ad 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; > > > > + > > > > + ret = clk_prepare_enable(ov8856->xvclk); > > > > > > You're request the clk only in DT case or do I miss something? If so you > > > have to check if the clk is available. > > > > > > > + if (ret < 0) { > > > > + dev_err(&client->dev, "failed to enable xvclk\n"); > > > > + return ret; > > > > + } > > > > + > > > > + if (is_acpi_node(dev_fwnode(ov8856->dev))) > > > > + return 0; > > > > + > > > > + 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); > > > > > > You need to check the existance of the gpio here too. > > > > No need to; the GPIO framework can handle this internally. > > Ahh, I said nothing :) so all my comments about that can be dropped. > > > > > + usleep_range(1500, 1800); > > > > + > > > > + return 0; > > > > + > > > > +disable_clk: > > > > + gpiod_set_value_cansleep(ov8856->reset_gpio, 1); > > > > > > And here.. pls check the whole patch. > > > > > > > + 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); > > > > > > Clk is only availabel in DT use-case. > > > > > > > +} > > > > + > > > > 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); > > > > } > > > > > > Why do we handle the clock only in DT case? Is there a problem with the > > > clock handling and ACPI? > > > > Not really, it's just that ACPI does not provide an interface to the clocks > > as such. > > But you will get a clk by devm_clk_get()? No, because ACPI does not expose one to drivers. Effectively the entire power sequences are implemented in ACPI, not in the driver. -- Regards, Sakari Ailus From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 83237C8300A for ; Thu, 30 Apr 2020 10:00:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 546C920838 for ; Thu, 30 Apr 2020 10:00:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bC20CHWl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 546C920838 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wRBt3FSPr54w+7k7LPLe4dcwYEnX4E6tPSrB95HJ4Sk=; b=bC20CHWloATgR8 n4g9YZqxGU2ANzVVKmAkdXdj7nnIFqIhylhaRYzLBHl2rXA4miXeQQ8F3NHTjrlCMNMFQGtiw5GtR /voJbEovL5MAZUSTg/jUu52PoBsW2ez6p2cfsPwH4T4fy32pf+SM7z4iKFxIAiLSosMG3j+l+QYbD 8UiEz++0zZ+XqvN2PieP6NQ3GaZz4bjxQToIroI6V/LmsBxW2xQvIO2NkcLHSgjxKemzsxGv4L7p2 vmrOm6QNA8JKZIhneGU5Tmbx0j3S83JObo6bHMqH47doyh9jGUMOGQMWh/xH7PlV58VBrQfqY/o6I KFZxwWTPxlPF6sAo3cPw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jU5zN-0003gG-Gm; Thu, 30 Apr 2020 10:00:17 +0000 Received: from hillosipuli.retiisi.org.uk ([2a01:4f9:c010:4572::81:2]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jU5yS-0001JJ-9u for linux-arm-kernel@lists.infradead.org; Thu, 30 Apr 2020 09:59:22 +0000 Received: from valkosipuli.localdomain (valkosipuli.retiisi.org.uk [IPv6:2a01:4f9:c010:4572::80:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hillosipuli.retiisi.org.uk (Postfix) with ESMTPS id EBA90634C8F; Thu, 30 Apr 2020 12:59:07 +0300 (EEST) Received: from sailus by valkosipuli.localdomain with local (Exim 4.92) (envelope-from ) id 1jU5yF-0000QG-Pc; Thu, 30 Apr 2020 12:59:07 +0300 Date: Thu, 30 Apr 2020 12:59:07 +0300 From: Sakari Ailus To: Marco Felsch Subject: Re: [PATCH v6 2/3] media: ov8856: Add devicetree support Message-ID: <20200430095907.GG867@valkosipuli.retiisi.org.uk> References: <20200429162437.2025699-1-robert.foss@linaro.org> <20200429162437.2025699-3-robert.foss@linaro.org> <20200430093524.GB2188@pengutronix.de> <20200430094549.GF867@valkosipuli.retiisi.org.uk> <20200430095332.GC2188@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200430095332.GC2188@pengutronix.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200430_025920_706539_1185B52C X-CRM114-Status: GOOD ( 31.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Dongchun Zhu , linux-kernel@vger.kernel.org, Robert Foss , Tomasz Figa , Maxime Ripard , Andy Shevchenko , Fabio Estevam , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Marco, On Thu, Apr 30, 2020 at 11:53:32AM +0200, Marco Felsch wrote: > Hi Sakari, > > On 20-04-30 12:45, Sakari Ailus wrote: > > Hi Marco, > > > > On Thu, Apr 30, 2020 at 11:35:24AM +0200, Marco Felsch wrote: > > > Hi Robert, > > > > > > thnakf for the patch but pls keep in mind to do one thing per patch. > > > IMHO this patch do a lot more. Anyway below are my comment :) > > > > > > On 20-04-29 18:24, Robert Foss wrote: > > > > Add match table, enable ov8856_probe() to support > > > > both ACPI and DT modes. > > > > > > You are also adding the support for reset-gpios and regualtors. IMHO the > > > commit message don't belong to the changes you made anymore. > > > > > > > ACPI and DT modes are primarily distinguished from > > > > each other by relying on devm_XXX_get_optional() > > > > will return NULL instead of a reference for the > > > > desired managed resource. > > > > > > > > Signed-off-by: Robert Foss > > > > --- > > > > > > > > - 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..4749dc74d5ad 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; > > > > + > > > > + ret = clk_prepare_enable(ov8856->xvclk); > > > > > > You're request the clk only in DT case or do I miss something? If so you > > > have to check if the clk is available. > > > > > > > + if (ret < 0) { > > > > + dev_err(&client->dev, "failed to enable xvclk\n"); > > > > + return ret; > > > > + } > > > > + > > > > + if (is_acpi_node(dev_fwnode(ov8856->dev))) > > > > + return 0; > > > > + > > > > + 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); > > > > > > You need to check the existance of the gpio here too. > > > > No need to; the GPIO framework can handle this internally. > > Ahh, I said nothing :) so all my comments about that can be dropped. > > > > > + usleep_range(1500, 1800); > > > > + > > > > + return 0; > > > > + > > > > +disable_clk: > > > > + gpiod_set_value_cansleep(ov8856->reset_gpio, 1); > > > > > > And here.. pls check the whole patch. > > > > > > > + 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); > > > > > > Clk is only availabel in DT use-case. > > > > > > > +} > > > > + > > > > 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); > > > > } > > > > > > Why do we handle the clock only in DT case? Is there a problem with the > > > clock handling and ACPI? > > > > Not really, it's just that ACPI does not provide an interface to the clocks > > as such. > > But you will get a clk by devm_clk_get()? No, because ACPI does not expose one to drivers. Effectively the entire power sequences are implemented in ACPI, not in the driver. -- Regards, Sakari Ailus _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel