Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2711174pxb; Mon, 19 Apr 2021 11:54:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVE4899Cle/MJwLB84YmG6uZJeJO+glO66iNS4wBtmysgHKQiUivONOJKQ5Lv/mfaUwzDy X-Received: by 2002:a05:6402:4242:: with SMTP id g2mr27113106edb.329.1618858462721; Mon, 19 Apr 2021 11:54:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618858462; cv=none; d=google.com; s=arc-20160816; b=WSh2csGNgjt6bpcFEjunYvJFOH0BEPcgMPi1DBUSYb+/3XjvqDl+mSSW1/klajz/ym 4xOTMZGxVsyA9izhWcFLDl5KY1ljfNrvUvf3XbOJOMhyml1KX0yvy68qpRuFFP5BraHn vhLmSStnS+21IAeLkMrAh7gX7axzYUohNtEu61PdKXILBk3p0MSkEDak+JCbxR/034HQ FTfHxZ1d/cx0LF4ViJZqPUX2ZHlJcvhJRWP42tQskw82erIY18abLnavR9zLhX1sgOAS OmrBo2l1SZppTfCprpjASjd1ouit77k+JUaUnTXNDSJFUzRtEKyzZeAlZZJIHPEeBDrB IBGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0gq+xg9P0b7D2FTk/2RTfGGZaNO4klfEYPThJpndrnQ=; b=o2nYGqF/faBkGf1PvZM4wX3ZrH94vguoluSm+iCLtxGy354y4s08aGoXLDRCGghCQ1 c/0cG0epSOC4v4fVfwVd9mb1yvnAlqGg5YjAfSd8FqfYgLpT6z4OHnHfWc9B66AQHhUO 16heA+IsFxgG6VPiIgwu1gZAsrO4MO4rNWHR6Y52y4nKnXAEq7atPBiGRQUzGW9ckNVo 96CtADj4+/dgqRwnp7kdIRIg0mPKTyEJnVrEfcVBc+HsyRP+gYrNyL0HxGjhOBncD6RG wBCAahCKoo3RsS78OGD2grUa1keJ4S3cpJQnmqzdzvaIhdJMGrCqv8u1TtUbekgKMuIe 3qCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q28si13297992edb.551.2021.04.19.11.53.59; Mon, 19 Apr 2021 11:54:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233419AbhDSOXu (ORCPT + 99 others); Mon, 19 Apr 2021 10:23:50 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:54717 "EHLO relay2-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239458AbhDSOXt (ORCPT ); Mon, 19 Apr 2021 10:23:49 -0400 X-Originating-IP: 93.34.118.233 Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 1E2C940004; Mon, 19 Apr 2021 14:23:16 +0000 (UTC) From: Jacopo Mondi To: Geert Uytterhoeven , Magnus Damm , Laurent Pinchart , Kieran Bingham , Rob Herring Cc: Jacopo Mondi , linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 3/7] media: i2c: max9286: Use "maxim,gpio-poc" property Date: Mon, 19 Apr 2021 16:23:41 +0200 Message-Id: <20210419142345.53152-4-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419142345.53152-1-jacopo+renesas@jmondi.org> References: <20210419142345.53152-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The 'maxim,gpio-poc' property is used when the remote camera power-over-coax is controlled by one of the MAX9286 gpio lines, to instruct the driver about which line to use and what the line polarity is. Add to the max9286 driver support for parsing the newly introduced property and use it if available in place of the usual supply, as it is not possible to establish one as consumer of the max9286 gpio controller. If the new property is present, no gpio controller is registered and 'poc-supply' is ignored. In order to maximize code re-use, break out the max9286 gpio handling function so that they can be used by the gpio controller through the gpio-consumer API, or directly by the driver code. Wrap the power up and power down routines to their own function to be able to use either the gpio line directly or the supply. This will make it easier to control the remote camera power at run time. Signed-off-by: Jacopo Mondi --- drivers/media/i2c/max9286.c | 125 +++++++++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 31 deletions(-) diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c index 6fd4d59fcc72..99160aa68a5f 100644 --- a/drivers/media/i2c/max9286.c +++ b/drivers/media/i2c/max9286.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -165,6 +166,9 @@ struct max9286_priv { u32 reverse_channel_mv; + u32 gpio_poc; + u32 gpio_poc_flags; + struct v4l2_ctrl_handler ctrls; struct v4l2_ctrl *pixelrate; @@ -1022,20 +1026,27 @@ static int max9286_setup(struct max9286_priv *priv) return 0; } -static void max9286_gpio_set(struct gpio_chip *chip, - unsigned int offset, int value) +static int max9286_gpio_set(struct max9286_priv *priv, unsigned int offset, + int value) { - struct max9286_priv *priv = gpiochip_get_data(chip); - if (value) priv->gpio_state |= BIT(offset); else priv->gpio_state &= ~BIT(offset); - max9286_write(priv, 0x0f, MAX9286_0X0F_RESERVED | priv->gpio_state); + return max9286_write(priv, 0x0f, + MAX9286_0X0F_RESERVED | priv->gpio_state); +} + +static void max9286_gpiochip_set(struct gpio_chip *chip, + unsigned int offset, int value) +{ + struct max9286_priv *priv = gpiochip_get_data(chip); + + max9286_gpio_set(priv, offset, value); } -static int max9286_gpio_get(struct gpio_chip *chip, unsigned int offset) +static int max9286_gpiochip_get(struct gpio_chip *chip, unsigned int offset) { struct max9286_priv *priv = gpiochip_get_data(chip); @@ -1055,16 +1066,81 @@ static int max9286_register_gpio(struct max9286_priv *priv) gpio->of_node = dev->of_node; gpio->ngpio = 2; gpio->base = -1; - gpio->set = max9286_gpio_set; - gpio->get = max9286_gpio_get; + gpio->set = max9286_gpiochip_set; + gpio->get = max9286_gpiochip_get; gpio->can_sleep = true; + ret = devm_gpiochip_add_data(dev, gpio, priv); + if (ret) + dev_err(dev, "Unable to create gpio_chip\n"); + + return ret; +} + +static int max9286_parse_gpios(struct max9286_priv *priv) +{ + struct device *dev = &priv->client->dev; + u32 gpio_poc[2]; + int ret; + /* GPIO values default to high */ priv->gpio_state = BIT(0) | BIT(1); - ret = devm_gpiochip_add_data(dev, gpio, priv); + /* + * Parse the "gpio-poc" vendor property. If the camera power is + * controlled by one of the MAX9286 gpio lines, do not register + * the gpio controller and ignore 'poc-supply'. + */ + ret = of_property_read_u32_array(dev->of_node, + "maxim,gpio-poc", gpio_poc, 2); + if (!ret) { + priv->gpio_poc = gpio_poc[0]; + priv->gpio_poc_flags = gpio_poc[1]; + if (priv->gpio_poc > 1 || + (priv->gpio_poc_flags != GPIO_ACTIVE_HIGH && + priv->gpio_poc_flags != GPIO_ACTIVE_LOW)) { + dev_err(dev, "Invalid 'gpio-poc': (%u %u)\n", + priv->gpio_poc, priv->gpio_poc_flags); + return -EINVAL; + } + + return 0; + } + + ret = max9286_register_gpio(priv); if (ret) - dev_err(dev, "Unable to create gpio_chip\n"); + return ret; + + priv->regulator = devm_regulator_get(dev, "poc"); + if (IS_ERR(priv->regulator)) { + if (PTR_ERR(priv->regulator) != -EPROBE_DEFER) + dev_err(dev, "Unable to get PoC regulator (%ld)\n", + PTR_ERR(priv->regulator)); + return PTR_ERR(priv->regulator); + } + + return 0; +} + +static int max9286_poc_enable(struct max9286_priv *priv, bool enable) +{ + int ret; + + /* If "poc-gpio" is used, toggle the line and do not use regulator. */ + if (enable) + ret = priv->regulator + ? regulator_enable(priv->regulator) + : max9286_gpio_set(priv, priv->gpio_poc, + enable ^ priv->gpio_poc_flags); + else + ret = priv->regulator + ? regulator_disable(priv->regulator) + : max9286_gpio_set(priv, priv->gpio_poc, + enable ^ priv->gpio_poc_flags); + + if (ret < 0) + dev_err(&priv->client->dev, "Unable to turn PoC %s\n", + enable ? "on" : "off"); return ret; } @@ -1078,17 +1154,14 @@ static int max9286_init(struct device *dev) client = to_i2c_client(dev); priv = i2c_get_clientdata(client); - /* Enable the bus power. */ - ret = regulator_enable(priv->regulator); - if (ret < 0) { - dev_err(&client->dev, "Unable to turn PoC on\n"); + ret = max9286_poc_enable(priv, true); + if (ret) return ret; - } ret = max9286_setup(priv); if (ret) { dev_err(dev, "Unable to setup max9286\n"); - goto err_regulator; + goto err_poc_disable; } /* @@ -1098,7 +1171,7 @@ static int max9286_init(struct device *dev) ret = max9286_v4l2_register(priv); if (ret) { dev_err(dev, "Failed to register with V4L2\n"); - goto err_regulator; + goto err_poc_disable; } ret = max9286_i2c_mux_init(priv); @@ -1114,8 +1187,8 @@ static int max9286_init(struct device *dev) err_v4l2_register: max9286_v4l2_unregister(priv); -err_regulator: - regulator_disable(priv->regulator); +err_poc_disable: + max9286_poc_enable(priv, false); return ret; } @@ -1286,20 +1359,10 @@ static int max9286_probe(struct i2c_client *client) */ max9286_configure_i2c(priv, false); - ret = max9286_register_gpio(priv); + ret = max9286_parse_gpios(priv); if (ret) goto err_powerdown; - priv->regulator = devm_regulator_get(&client->dev, "poc"); - if (IS_ERR(priv->regulator)) { - if (PTR_ERR(priv->regulator) != -EPROBE_DEFER) - dev_err(&client->dev, - "Unable to get PoC regulator (%ld)\n", - PTR_ERR(priv->regulator)); - ret = PTR_ERR(priv->regulator); - goto err_powerdown; - } - ret = max9286_parse_dt(priv); if (ret) goto err_powerdown; @@ -1326,7 +1389,7 @@ static int max9286_remove(struct i2c_client *client) max9286_v4l2_unregister(priv); - regulator_disable(priv->regulator); + max9286_poc_enable(priv, false); gpiod_set_value_cansleep(priv->gpiod_pwdn, 0); -- 2.31.1