Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp733811pxb; Thu, 15 Apr 2021 05:26:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2hPbVEstZ2/U4kd4+NYvw3rdAl20QcBEeeZcO89yWKU/aZQDLTJ/9Ytlobpbsh94JYAnw X-Received: by 2002:a63:ee42:: with SMTP id n2mr3219090pgk.37.1618489598698; Thu, 15 Apr 2021 05:26:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618489598; cv=none; d=google.com; s=arc-20160816; b=NylhYbn3A/Uujig1Ppvkp54HfQDy9ZQaMyswKv2chjucWjcHvPqS00d88cT0wR5EVz V7ClUrYCaoyIFXtZKc6m0qHGV5epydQgHHSugu2YAas4xFkFug4WSjAxosDnT7bl+DUC UgOVY0rTc1A+9BlXAXA5omMbcBznKgRruUmsv/YDJrfPGNlBCSD92/E2kytp9F+1zydM 8yWgroL0uxmFAFMlZBpbAOFNaSDYCzOFLWdJhNP08qdsgMbrbK1Psm/zQMLrmPoQiKNm nBHKcYuQEKCTlH3WwAP7JNNmXwIg622R14RtRBVqkhiDNu43+KMncEfX/GHwmJHIVH4E bLyQ== 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=r1Ga5X7zNtcWFjFyjSX3C8tGxOmXN5B2RBMpmm376hY=; b=rLfOQY/xvzWfeax4v/+5gbs+mNWtSbMcecsc9K8DtZdGBI4tVCq+26fpSv+Qhd2gsX DRUVt7ZGLyMWpwcLqH7gsBnuP8boXpo4cpXhoRwVrszWFr5Ami6fEW+0mgss1fCnBAjS xj6b4Fq6w0D5Xcq2zMY0V18lXUQsC6LaE1wBai05dduhMFy51LpM1F107jbnpRdNhpo9 MLUDU0+fzjQDZ7Q2TUbkfM/2MaBOaIxt93H1Y3jw64Tjj588MXY1lsOduivGzy3Ya2Jx HYiHIUNk9IXhHvQjinxOT1s+U+BBPhLTZLdHGV2bz6FfG3rM3zw8ztifLE4uMBx4rUzi bXZA== 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 pc12si187750pjb.31.2021.04.15.05.26.26; Thu, 15 Apr 2021 05:26:38 -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 S232941AbhDOM0K (ORCPT + 99 others); Thu, 15 Apr 2021 08:26:10 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:41929 "EHLO relay5-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232771AbhDOM0A (ORCPT ); Thu, 15 Apr 2021 08:26:00 -0400 X-Originating-IP: 93.61.96.190 Received: from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it [93.61.96.190]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id F06111C0011; Thu, 15 Apr 2021 12:25:34 +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 v4 3/7] media: i2c: max9286: Use "maxim,gpio-poc" property Date: Thu, 15 Apr 2021 14:25:58 +0200 Message-Id: <20210415122602.87697-4-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210415122602.87697-1-jacopo+renesas@jmondi.org> References: <20210415122602.87697-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 | 119 ++++++++++++++++++++++++++++-------- 1 file changed, 93 insertions(+), 26 deletions(-) diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c index 6fd4d59fcc72..a8b37783d2ef 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,8 +1026,19 @@ 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) +{ + int ret = max9286_read(priv, 0x0f); + if (ret < 0) + return ret; + + ret = value ? (ret & 0x3) | BIT(offset) : (ret & 0x3) & ~BIT(offset); + return max9286_write(priv, 0x0f, MAX9286_0X0F_RESERVED | ret); +} + +static void max9286_gpiochip_set(struct gpio_chip *chip, + unsigned int offset, int value) { struct max9286_priv *priv = gpiochip_get_data(chip); @@ -1035,7 +1050,7 @@ static void max9286_gpio_set(struct gpio_chip *chip, max9286_write(priv, 0x0f, MAX9286_0X0F_RESERVED | priv->gpio_state); } -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,8 +1070,8 @@ 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; /* GPIO values default to high */ @@ -1069,6 +1084,71 @@ static int max9286_register_gpio(struct max9286_priv *priv) return ret; } +static int max9286_parse_gpios(struct max9286_priv *priv) +{ + struct device *dev = &priv->client->dev; + u32 gpio_poc[2]; + int ret; + + /* + * 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) + 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; +} + static int max9286_init(struct device *dev) { struct max9286_priv *priv; @@ -1078,17 +1158,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 +1175,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 +1191,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 +1363,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 +1393,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