From patchwork Mon May 7 15:56:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 10384435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 35F4E60236 for ; Mon, 7 May 2018 15:57:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21175289BC for ; Mon, 7 May 2018 15:57:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15BEC289DD; Mon, 7 May 2018 15:57:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC2CF289BC for ; Mon, 7 May 2018 15:57:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752794AbeEGP5q (ORCPT ); Mon, 7 May 2018 11:57:46 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36223 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752789AbeEGP5p (ORCPT ); Mon, 7 May 2018 11:57:45 -0400 Received: by mail-wm0-f65.google.com with SMTP id n10-v6so16266744wmc.1 for ; Mon, 07 May 2018 08:57:44 -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; bh=F+Mo6MdzVhD2+FTd/F2XxiErD8j/HTKIL2mSUsIIyqw=; b=NGnG/DmjbMiT/PFIiDDIrOjIilzTqm99Ww0mN6LO7kE8b86CYTyQ5MWaTYdtjW2v2o 3m4gIlhkW+Ye0OsIU7m1wuZBmNJUVxc0+Go1Q3p3t2KZjFjzKuTQ8HGb4vQrSCVSVqFB 0frnomMb95zyjhVMpsYrSCscj1igDZ9yzmDHk= 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; bh=F+Mo6MdzVhD2+FTd/F2XxiErD8j/HTKIL2mSUsIIyqw=; b=Dm4ydXOSvPkI7BI3fZc5453jZQ/jjZIkCkKoDO69gHPrBRIrXv3dyjRUW8ViWYt1eg 4I8Y2nwWt8kq6//XrTERrCWchxi9NMBE2Cnz1fka2GYtJXkLqNipia3ZhtAN1zpsP23f iUFvgAIqO+WP5/CZb5M9X7gXSq7lc1GSOuMqTUgvSqewMUv8ss6LLwFdrTe41QqQVvxl 3eQB4S2PRZmo5qpbzO8l97oS/UYxIwfIB0GfzhtBV9n4TA0itsrjVawr5HKAZ14Vz0X4 IEtLjOEUZQzqbcgVVOwEAzGME+s5zgaL4h8zf1A5ExHY0dd0tOIJieKdNvaZC8+Itswz HWvA== X-Gm-Message-State: ALKqPwcOZE4XkUWoorif1aa4jLqDHLQIHp50WTAxDGIg8unGOGgX9BaJ JmstOJotllzPkhVn/YagUXK9UwITnmY= X-Google-Smtp-Source: AB8JxZom2QH/3zBO0zv1G92y2Z2gTeXmZxOnHj0ceJvayQatSG9bgZTTG4A0kcABrxkQnJmbu7MOGg== X-Received: by 2002:a1c:2084:: with SMTP id g126-v6mr1298917wmg.52.1525708663951; Mon, 07 May 2018 08:57:43 -0700 (PDT) Received: from arch-late.local (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id y42-v6sm32294807wry.21.2018.05.07.08.57.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 May 2018 08:57:43 -0700 (PDT) From: Rui Miguel Silva To: mchehab@kernel.org, sakari.ailus@linux.intel.com, hverkuil@xs4all.nl, Rob Herring Cc: linux-media@vger.kernel.org, Fabio Estevam , devicetree@vger.kernel.org, Ryan Harkin , Rui Miguel Silva Subject: [PATCH 4/4] media: ov2680: add regulators to supply control Date: Mon, 7 May 2018 16:56:55 +0100 Message-Id: <20180507155655.1555-5-rui.silva@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180507155655.1555-1-rui.silva@linaro.org> References: <20180507155655.1555-1-rui.silva@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the code to control the regulators for the analogue and digital power supplies. Signed-off-by: Rui Miguel Silva --- drivers/media/i2c/ov2680.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c index 8962b397211a..07bb475c970c 100644 --- a/drivers/media/i2c/ov2680.c +++ b/drivers/media/i2c/ov2680.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -65,6 +66,14 @@ struct reg_value { u8 val; }; +static const char * const ov2680_supply_name[] = { + "DOVDD", + "DVDD", + "AVDD", +}; + +#define OV2680_NUM_SUPPLIES ARRAY_SIZE(ov2680_supply_name) + struct ov2680_mode_info { const char *name; enum ov2680_mode_id id; @@ -97,6 +106,7 @@ struct ov2680_dev { struct media_pad pad; struct clk *xvclk; u32 xvclk_freq; + struct regulator_bulk_data supplies[OV2680_NUM_SUPPLIES]; struct gpio_desc *reset_gpio; struct mutex lock; /* protect members */ @@ -522,6 +532,7 @@ static int ov2680_power_off(struct ov2680_dev *sensor) clk_disable_unprepare(sensor->xvclk); ov2680_power_down(sensor); + regulator_bulk_disable(OV2680_NUM_SUPPLIES, sensor->supplies); sensor->is_enabled = false; return 0; @@ -535,6 +546,12 @@ static int ov2680_power_on(struct ov2680_dev *sensor) if (sensor->is_enabled) return 0; + ret = regulator_bulk_enable(OV2680_NUM_SUPPLIES, sensor->supplies); + if (ret < 0) { + dev_err(dev, "failed to enable regulators: %d\n", ret); + return ret; + } + if (!sensor->reset_gpio) { ret = ov2680_write_reg(sensor, OV2680_REG_SOFT_RESET, 0x01); if (ret != 0) { @@ -962,6 +979,18 @@ static int ov2680_v4l2_init(struct ov2680_dev *sensor) return ret; } +static int ov2680_get_regulators(struct ov2680_dev *sensor) +{ + int i; + + for (i = 0; i < OV2680_NUM_SUPPLIES; i++) + sensor->supplies[i].supply = ov2680_supply_name[i]; + + return devm_regulator_bulk_get(&sensor->i2c_client->dev, + OV2680_NUM_SUPPLIES, + sensor->supplies); +} + static int ov2680_check_id(struct ov2680_dev *sensor) { struct device *dev = ov2680_to_dev(sensor); @@ -1034,6 +1063,12 @@ static int ov2680_probe(struct i2c_client *client) if (ret < 0) return ret; + ret = ov2680_get_regulators(sensor); + if (ret < 0) { + dev_err(dev, "failed to get regulators\n"); + return ret; + } + mutex_init(&sensor->lock); ret = ov2680_v4l2_init(sensor);