From patchwork Fri Apr 29 12:37:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ma=C3=ADra_Canal?= X-Patchwork-Id: 567635 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F7D4C433EF for ; Fri, 29 Apr 2022 12:38:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359374AbiD2MmH (ORCPT ); Fri, 29 Apr 2022 08:42:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359361AbiD2MmF (ORCPT ); Fri, 29 Apr 2022 08:42:05 -0400 Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D4F9C9B67 for ; Fri, 29 Apr 2022 05:38:46 -0700 (PDT) Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-e5ca5c580fso7995339fac.3 for ; Fri, 29 Apr 2022 05:38:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uAcN2Jau5uY/pToJWSrqvm2t7QVf6G7bhywOw1/QJeM=; b=DVv+VK0f7UTJDgepW/qW0a0E0p4SOunM126nr37ZeZpS1zUVxdfudJqeU/ShOi+luK sJMLkkBjtJCrfuThKSp2yC/1yBmPrQJgHxZQZKj4vqAS1thYlJMBksftfAn0KdwsN3MP 0PUG+QDijPhdKRvJPxgDVDAMOmmJQQ5j9IhX+tr78z+/Fsjkbqbe7RLbYIEJJ3VbEAL/ EbSGRkSqOatrG2ml6uQVp6aHpfgRWvrcSZOec+VzWGZ4oCZ1gflM6uYjJnsmZeWU9EkF btLk0+dRTKtC2oosaOTVGz4QAQUZy9Zuwjx1yEtldWb+C/hDotBS/AoqWiWluIH8m1WS Qviw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uAcN2Jau5uY/pToJWSrqvm2t7QVf6G7bhywOw1/QJeM=; b=jRQNyhSArhBlkmNE3zuvLlQM8kvUpZ3S6rDIke/WNXyajkDGrAN9SoMCP+cqBK9AoF HzHNqiyDsJ5PmJICrtIzGd2tcGUXJRyz42Js20WcbFn0jgpEI8GjLYhwP+ifFoILHL0o 4CLOnVyGokYyS7hR2jaM++L8hTS8ZOKbkafFBBzQZ9GkY33vGauU702zUcCJKJqlWUbw 2nPksN8T/LlnrWTMf392pMLGsSF2snGfJtIkqaoSLgET2IBdMXdX1QHF79A6fUbzp6pH pw6keHq84sRa4PcK3It0scDOp3wu/cKJC0iQhLfWzjXyEP5imXtTyGzkCggAGTGrVpqi cbWA== X-Gm-Message-State: AOAM531ksy5nmOyzY6mLxHzzHDvKTXc/Lsyb64XziPFZZHBrru7S+wvR +ytN40ymvL7PVJnT2dJADvmtnw== X-Google-Smtp-Source: ABdhPJzHY64EG++nd35N4o4leJdZPgr4ww+GAtCkyM121JrTHzu2ZpD3eBZZIPQdYWLN/AIvWB/BkA== X-Received: by 2002:a05:6870:b408:b0:dd:ed4f:b1c7 with SMTP id x8-20020a056870b40800b000dded4fb1c7mr1258439oap.41.1651235925603; Fri, 29 Apr 2022 05:38:45 -0700 (PDT) Received: from fedora.sc.usp.br (gwsc.sc.usp.br. [143.107.225.16]) by smtp.gmail.com with ESMTPSA id e12-20020a4ae0cc000000b0035eb4e5a6d9sm705158oot.47.2022.04.29.05.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 05:38:45 -0700 (PDT) From: =?utf-8?q?Ma=C3=ADra_Canal?= To: Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Sylwester Nawrocki , Andrzej Hajda Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ma=C3=ADra_Canal?= Subject: [PATCH 1/2] media: s5c73m3: Replace legacy gpio interface for gpiod Date: Fri, 29 Apr 2022 09:37:39 -0300 Message-Id: <20220429123740.147703-2-maira.canal@usp.br> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429123740.147703-1-maira.canal@usp.br> References: <20220429123740.147703-1-maira.canal@usp.br> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Considering the current transition of the GPIO subsystem, remove all dependencies of the legacy GPIO interface (linux/gpio.h and linux /of_gpio.h) and replace it with the descriptor-based GPIO approach. Signed-off-by: Maíra Canal --- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 95 ++++++++++-------------- drivers/media/i2c/s5c73m3/s5c73m3.h | 9 +-- include/media/i2c/s5c73m3.h | 15 +--- 3 files changed, 44 insertions(+), 75 deletions(-) diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index e2b88c5e4f98..8af785fbf25b 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c @@ -10,12 +10,11 @@ #include #include #include -#include +#include #include #include #include #include -#include #include #include #include @@ -1347,22 +1346,26 @@ static int s5c73m3_oif_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) return 0; } -static int s5c73m3_gpio_set_value(struct s5c73m3 *priv, int id, u32 val) +static int s5c73m3_gpio_set_value(struct gpio_desc *gpio, int val) { - if (!gpio_is_valid(priv->gpio[id].gpio)) + if (!gpio) return 0; - gpio_set_value(priv->gpio[id].gpio, !!val); + gpiod_set_value(gpio, !!val); return 1; } -static int s5c73m3_gpio_assert(struct s5c73m3 *priv, int id) +static int s5c73m3_gpio_assert(struct gpio_desc *gpio) { - return s5c73m3_gpio_set_value(priv, id, priv->gpio[id].level); + int val = gpiod_get_value(gpio); + + return s5c73m3_gpio_set_value(gpio, val); } -static int s5c73m3_gpio_deassert(struct s5c73m3 *priv, int id) +static int s5c73m3_gpio_deassert(struct gpio_desc *gpio) { - return s5c73m3_gpio_set_value(priv, id, !priv->gpio[id].level); + int val = gpiod_get_value(gpio); + + return s5c73m3_gpio_set_value(gpio, !val); } static int __s5c73m3_power_on(struct s5c73m3 *state) @@ -1386,10 +1389,10 @@ static int __s5c73m3_power_on(struct s5c73m3 *state) v4l2_dbg(1, s5c73m3_dbg, &state->oif_sd, "clock frequency: %ld\n", clk_get_rate(state->clock)); - s5c73m3_gpio_deassert(state, STBY); + s5c73m3_gpio_deassert(state->gpio_stby); usleep_range(100, 200); - s5c73m3_gpio_deassert(state, RSET); + s5c73m3_gpio_deassert(state->gpio_reset); usleep_range(50, 100); return 0; @@ -1404,10 +1407,10 @@ static int __s5c73m3_power_off(struct s5c73m3 *state) { int i, ret; - if (s5c73m3_gpio_assert(state, RSET)) + if (s5c73m3_gpio_assert(state->gpio_reset)) usleep_range(10, 50); - if (s5c73m3_gpio_assert(state, STBY)) + if (s5c73m3_gpio_assert(state->gpio_stby)) usleep_range(100, 200); clk_disable_unprepare(state->clock); @@ -1545,50 +1548,34 @@ static const struct v4l2_subdev_ops oif_subdev_ops = { static int s5c73m3_configure_gpios(struct s5c73m3 *state) { - static const char * const gpio_names[] = { - "S5C73M3_STBY", "S5C73M3_RST" - }; struct i2c_client *c = state->i2c_client; - struct s5c73m3_gpio *g = state->gpio; - int ret, i; + struct device *dev = &c->dev; + struct device_node *np = dev->of_node; - for (i = 0; i < GPIO_NUM; ++i) { - unsigned int flags = GPIOF_DIR_OUT; - if (g[i].level) - flags |= GPIOF_INIT_HIGH; - ret = devm_gpio_request_one(&c->dev, g[i].gpio, flags, - gpio_names[i]); - if (ret) { - v4l2_err(c, "failed to request gpio %s\n", - gpio_names[i]); - return ret; - } + state->gpio_stby = gpiod_get_from_of_node(np, "standby-gpios", 0, GPIOD_ASIS, + "S5C73M3_STBY"); + + if (IS_ERR(state->gpio_stby)) { + v4l2_err(c, "failed to request gpio S5C73M3_STBY"); + return PTR_ERR(state->gpio_stby); } - return 0; -} -static int s5c73m3_parse_gpios(struct s5c73m3 *state) -{ - static const char * const prop_names[] = { - "standby-gpios", "xshutdown-gpios", - }; - struct device *dev = &state->i2c_client->dev; - struct device_node *node = dev->of_node; - int ret, i; + if (state->gpio_stby) + gpiod_direction_output(state->gpio_stby, + !gpiod_is_active_low(state->gpio_stby)); - for (i = 0; i < GPIO_NUM; ++i) { - enum of_gpio_flags of_flags; + state->gpio_reset = gpiod_get_from_of_node(np, "xshutdown-gpios", 0, GPIOD_ASIS, + "S5C73M3_RST"); - ret = of_get_named_gpio_flags(node, prop_names[i], - 0, &of_flags); - if (ret < 0) { - dev_err(dev, "failed to parse %s DT property\n", - prop_names[i]); - return -EINVAL; - } - state->gpio[i].gpio = ret; - state->gpio[i].level = !(of_flags & OF_GPIO_ACTIVE_LOW); + if (IS_ERR(state->gpio_reset)) { + v4l2_err(c, "failed to request gpio S5C73M3_RST"); + return PTR_ERR(state->gpio_reset); } + + if (state->gpio_reset) + gpiod_direction_output(state->gpio_reset, + !gpiod_is_active_low(state->gpio_reset)); + return 0; } @@ -1608,8 +1595,8 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state) } state->mclk_frequency = pdata->mclk_frequency; - state->gpio[STBY] = pdata->gpio_stby; - state->gpio[RSET] = pdata->gpio_reset; + state->gpio_stby = pdata->gpio_stby; + state->gpio_reset = pdata->gpio_reset; return 0; } @@ -1624,10 +1611,6 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state) state->mclk_frequency); } - ret = s5c73m3_parse_gpios(state); - if (ret < 0) - return -EINVAL; - node_ep = of_graph_get_next_endpoint(node, NULL); if (!node_ep) { dev_warn(dev, "no endpoint defined for node: %pOF\n", node); diff --git a/drivers/media/i2c/s5c73m3/s5c73m3.h b/drivers/media/i2c/s5c73m3/s5c73m3.h index c3fcfdd3ea66..f0056ae6e51a 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3.h +++ b/drivers/media/i2c/s5c73m3/s5c73m3.h @@ -351,12 +351,6 @@ struct s5c73m3_ctrls { struct v4l2_ctrl *scene_mode; }; -enum s5c73m3_gpio_id { - STBY, - RSET, - GPIO_NUM, -}; - enum s5c73m3_resolution_types { RES_ISP, RES_JPEG, @@ -383,7 +377,8 @@ struct s5c73m3 { u32 i2c_read_address; struct regulator_bulk_data supplies[S5C73M3_MAX_SUPPLIES]; - struct s5c73m3_gpio gpio[GPIO_NUM]; + struct gpio_desc *gpio_stby; + struct gpio_desc *gpio_reset; struct clk *clock; diff --git a/include/media/i2c/s5c73m3.h b/include/media/i2c/s5c73m3.h index a51f1025ba1c..caad855a8394 100644 --- a/include/media/i2c/s5c73m3.h +++ b/include/media/i2c/s5c73m3.h @@ -17,19 +17,10 @@ #ifndef MEDIA_S5C73M3__ #define MEDIA_S5C73M3__ +#include #include #include -/** - * struct s5c73m3_gpio - data structure describing a GPIO - * @gpio: GPIO number - * @level: indicates active state of the @gpio - */ -struct s5c73m3_gpio { - int gpio; - int level; -}; - /** * struct s5c73m3_platform_data - s5c73m3 driver platform data * @mclk_frequency: sensor's master clock frequency in Hz @@ -44,8 +35,8 @@ struct s5c73m3_gpio { struct s5c73m3_platform_data { unsigned long mclk_frequency; - struct s5c73m3_gpio gpio_reset; - struct s5c73m3_gpio gpio_stby; + struct gpio_desc *gpio_reset; + struct gpio_desc *gpio_stby; enum v4l2_mbus_type bus_type; u8 nlanes;