From patchwork Fri Mar 13 11:03:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 11436691 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 91CB26CA for ; Fri, 13 Mar 2020 11:04:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68A00206E2 for ; Fri, 13 Mar 2020 11:04:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cMGjOfX2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726676AbgCMLEN (ORCPT ); Fri, 13 Mar 2020 07:04:13 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:55525 "EHLO mail-wm1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726643AbgCMLEN (ORCPT ); Fri, 13 Mar 2020 07:04:13 -0400 Received: by mail-wm1-f45.google.com with SMTP id 6so9433324wmi.5 for ; Fri, 13 Mar 2020 04:04:11 -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=7yj7gQmza3O1dl8IfzXzptt6zWblAsleJR4kdEFCwBM=; b=cMGjOfX2oWshVuzTKHR7RoEvOlRcGzgyxtqRukdKNyktfEgSZsEuS6V3RDPa3v5U5C wi7M6qljaXECrvozHR+ig7l3GGo2GAGl0oHTsfDeVUmIxiDSU4Wm6XVVIseLrJuiX7s0 N9lHp47mejEjVfMBoAlThknnf7KhKEvf1uiv/XvFwAMgpzbiX7of5xs+qxGReF+718TZ NdGZSY6UAEfZxdrCBZfy1W+NSPBJyFSxznI6CtTO8sUvVYIud3BWd6qKhLA0xjPNINAR bNn8rnSHF4zg0ZsyVAssELGxy49/+ubb2dhpHCMu6qnXux91boaGSsEZNzXrkbXY40px PCGw== 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=7yj7gQmza3O1dl8IfzXzptt6zWblAsleJR4kdEFCwBM=; b=KCcaIeNkfnyko372lWAm1g8CtUE72BN3CNEghshzZHLDytk5gpSr3XdX+xROq5l+L9 j73xyE58zXwiVco9JgPKPIk3m+8YL3yn2kpIeqbQWRpU2+YmATDgS7qagnH3Bh3bCZ27 q/AoKDQoQ5bepbwLi9zW8RLgPFvsiIzOu8rn7vQ9e2Fbp2slwCjjX4OsxHARFe1d32Et Cwr9ITBS17EKUbjx3hMl9v8OcEgFOl8wiswoqI8rG9BER0MBSZ2MojW1eCSYqgS3BaHQ U05Ap94LsUj5tD6mGperGYdNTO7sbcXQE0GHSO/woEmQk57GvNKxGJNvBTiTz6vqno8t ZWxQ== X-Gm-Message-State: ANhLgQ3Ddx9PRwWkMmTecxgssD6UWBjy/DovjsdaYgpGP+85lWlTJKc0 JJKzvarhFeSMi9h0iVkpuZu4Vw== X-Google-Smtp-Source: ADFU+vuObq0lodVi4ARGspzGIPX4J5aHG9SJWTNgJ1qUzzHy0b5UCAPLdUrbX67/tl6sWOgy5s9lzg== X-Received: by 2002:a1c:f21a:: with SMTP id s26mr10327528wmc.39.1584097450815; Fri, 13 Mar 2020 04:04:10 -0700 (PDT) Received: from xps7590.local ([2a02:2450:102f:13b8:c814:5be4:577e:3bd5]) by smtp.gmail.com with ESMTPSA id r23sm23578052wrr.93.2020.03.13.04.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 04:04:10 -0700 (PDT) From: Robert Foss To: Dongchun Zhu , Fabio Estevam , Andy Shevchenko , Sakari Ailus , Tomasz Figa , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Robert Foss Subject: [v2 2/3] media: ov8856: Add devicetree support Date: Fri, 13 Mar 2020 12:03:49 +0100 Message-Id: <20200313110350.10864-3-robert.foss@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200313110350.10864-1-robert.foss@linaro.org> References: <20200313110350.10864-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 devicetree match table, and enable ov8856_probe() to initialize power, clocks and reset pins. Signed-off-by: Robert Foss --- - Changes since v1: * 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 * Andy & Sakari: Make XVCLK optional since to not break ACPI * Sakari: ARRAY_SIZE() directly instead of through OV8856_NUM_SUPPLIES * Sakari: Use XVCLK rate as provided by DT drivers/media/i2c/ov8856.c | 109 ++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c index 8655842af275..db61eed223e8 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 @@ -19,6 +22,8 @@ #define OV8856_LINK_FREQ_180MHZ 180000000ULL #define OV8856_SCLK 144000000ULL #define OV8856_MCLK 19200000 +#define OV8856_XVCLK_19_2 19200000 +#define OV8856_XVCLK_24 24000000 #define OV8856_DATA_LANES 4 #define OV8856_RGB_DEPTH 10 @@ -64,6 +69,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 +577,10 @@ struct ov8856 { struct media_pad pad; struct v4l2_ctrl_handler ctrl_handler; + 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 +923,46 @@ 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); + if (ret < 0) { + dev_err(&client->dev, "failed to enable xvclk\n"); + return ret; + } + + gpiod_set_value_cansleep(ov8856->reset_gpio, GPIOD_OUT_HIGH); + + 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, GPIOD_OUT_LOW); + + usleep_range(1500, 1800); + + return 0; + +disable_clk: + clk_disable_unprepare(ov8856->xvclk); + + return ret; +} + +static void __ov8856_power_off(struct ov8856 *ov8856) +{ + gpiod_set_value_cansleep(ov8856->reset_gpio, GPIOD_OUT_HIGH); + 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); @@ -1175,7 +1230,7 @@ static int ov8856_remove(struct i2c_client *client) static int ov8856_probe(struct i2c_client *client) { struct ov8856 *ov8856; - int ret; + int i, ret; ret = ov8856_check_hwcfg(&client->dev); if (ret) { @@ -1189,10 +1244,50 @@ static int ov8856_probe(struct i2c_client *client) return -ENOMEM; v4l2_i2c_subdev_init(&ov8856->sd, client, &ov8856_subdev_ops); + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); + if (PTR_ERR(ov8856->xvclk) == -ENOENT) { + dev_info(&client->dev, "xvclk clock not defined, continuing...\n"); + ov8856->xvclk = NULL; + } else if (IS_ERR(ov8856->xvclk)) { + dev_err(&client->dev, "could not get xvclk clock (%ld)\n", + PTR_ERR(ov8856->xvclk)); + return PTR_ERR(ov8856->xvclk); + } + + ret = clk_set_rate(ov8856->xvclk, OV8856_XVCLK_24); + if (ret < 0) { + dev_err(&client->dev, "failed to set xvclk rate (24MHz)\n"); + return ret; + } + + ov8856->reset_gpio = devm_gpiod_get(&client->dev, "reset", + GPIOD_OUT_HIGH); + if (IS_ERR(ov8856->reset_gpio)) { + dev_err(&client->dev, "failed to get reset-gpios\n"); + 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(&client->dev, + ARRAY_SIZE(ov8856_supply_names), + ov8856->supplies); + if (ret) { + dev_warn(&client->dev, "failed to get regulators\n"); + return ret; + } + + ret = __ov8856_power_on(ov8856); + if (ret) { + dev_warn(&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 +1333,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 +1352,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,