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, 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 19373C38A24 for ; Thu, 7 May 2020 08:22:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F32492083B for ; Thu, 7 May 2020 08:22:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726470AbgEGIWD (ORCPT ); Thu, 7 May 2020 04:22:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725802AbgEGIWC (ORCPT ); Thu, 7 May 2020 04:22:02 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 398F4C061A10 for ; Thu, 7 May 2020 01:22:02 -0700 (PDT) Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jWbmy-0001oj-5y; Thu, 07 May 2020 10:21:52 +0200 Received: from mfe by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1jWbmv-0004eQ-Fp; Thu, 07 May 2020 10:21:49 +0200 Date: Thu, 7 May 2020 10:21:49 +0200 From: Marco Felsch To: "Kao, Ben" Cc: Robert Foss , Andy Shevchenko , Sakari Ailus , 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 v7 2/3] media: ov8856: Add devicetree support Message-ID: <20200507082149.y7yzzgzkmw5nu7b4@pengutronix.de> References: <20200505100129.104673-1-robert.foss@linaro.org> <20200505100129.104673-3-robert.foss@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 10:20:45 up 173 days, 23:39, 183 users, load average: 0.22, 0.16, 0.11 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c5 X-SA-Exim-Mail-From: mfe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Ben, On 20-05-07 08:06, Kao, Ben wrote: > Hi Robert, > > On 20-05-05 12:01, Robert Foss wrote: > > 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; > > + > > In case of ACPI this cannot get ov8856->reset_gpio and ov8856->supplies, please add the check for ACPI case: > if (!is_acpi_node(fwnode)) { } I tought that dummy-regulators will be created in case of ACPI? Regards, Marco > Thanks. > Ben > > > 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, > > -- > > 2.25.1 > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | 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 30221C47257 for ; Thu, 7 May 2020 08:22:12 +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 E4C6420CC7 for ; Thu, 7 May 2020 08:22:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dqcW8//g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4C6420CC7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de 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=oNvxP4JIp4EMl4RDYQrRFpfDx20XMRhrwVsj02yGQEQ=; b=dqcW8//gzcowT1 fkwuWfXUKJOV4mLMS/gixIK+wFXLe5qfX5iwQykp0pGKPwnWe5+WzCUhtyZf/hStlTA5YUaUUZx4p A+w+7Pe3HkkBVIeqcRAtIyzQOEaBRtKPzOJWPRdJ3tOs0mByqH7gYU63lAK+D25XM5hGytrPzsQWS LFLTwOitM35I7IHvGw+YbyX+XMj3YJh9/ywPB9tIUOlG9iDzq5WupOVMisDjYqwcTl9zJrwO22WER rxp8QfH9ehVhKgh3mZCIXZ1NDXgINcfM3E4rskD6MNgBhJgItqPu5faQuDpxMr76IXnNkiFzGFPZr 0RRCEzGF6rjpGta0DCuQ==; 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 1jWbnE-0002e9-40; Thu, 07 May 2020 08:22:08 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWbn9-0002Z6-Vw for linux-arm-kernel@lists.infradead.org; Thu, 07 May 2020 08:22:06 +0000 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jWbmy-0001oj-5y; Thu, 07 May 2020 10:21:52 +0200 Received: from mfe by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1jWbmv-0004eQ-Fp; Thu, 07 May 2020 10:21:49 +0200 Date: Thu, 7 May 2020 10:21:49 +0200 From: Marco Felsch To: "Kao, Ben" Subject: Re: [PATCH v7 2/3] media: ov8856: Add devicetree support Message-ID: <20200507082149.y7yzzgzkmw5nu7b4@pengutronix.de> References: <20200505100129.104673-1-robert.foss@linaro.org> <20200505100129.104673-3-robert.foss@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 10:20:45 up 173 days, 23:39, 183 users, load average: 0.22, 0.16, 0.11 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c5 X-SA-Exim-Mail-From: mfe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200507_012204_187947_E7417A50 X-CRM114-Status: GOOD ( 28.07 ) 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 , Sakari Ailus , 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 Ben, On 20-05-07 08:06, Kao, Ben wrote: > Hi Robert, > > On 20-05-05 12:01, Robert Foss wrote: > > 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; > > + > > In case of ACPI this cannot get ov8856->reset_gpio and ov8856->supplies, please add the check for ACPI case: > if (!is_acpi_node(fwnode)) { } I tought that dummy-regulators will be created in case of ACPI? Regards, Marco > Thanks. > Ben > > > 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, > > -- > > 2.25.1 > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel