Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938317AbcLOQa4 (ORCPT ); Thu, 15 Dec 2016 11:30:56 -0500 Received: from mail-wj0-f176.google.com ([209.85.210.176]:33371 "EHLO mail-wj0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758012AbcLOQay (ORCPT ); Thu, 15 Dec 2016 11:30:54 -0500 From: Axel Haslam To: broonie@kernel.org, lgirdwood@gmail.com, khilman@baylibre.com, nsekhar@ti.com, david@lechnology.com, robh+dt@kernel.org Cc: linux-kernel@vger.kernel.org, Axel Haslam Subject: [PATCHv4 2/2] regulator: fixed: Handle optional overcurrent pin Date: Thu, 15 Dec 2016 17:29:55 +0100 Message-Id: <20161215162955.3940-3-ahaslam@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161215162955.3940-1-ahaslam@baylibre.com> References: <20161215162955.3940-1-ahaslam@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3002 Lines: 107 Fixed regulators (ex. TPS2087D) may have a over current pin that is activated on over current. Consumers may be interested to know about over current events to take appropriate actions. Allow the fix regulator to take in an optional gpio pin for over current and send the respective event to the consumer. Signed-off-by: Axel Haslam --- drivers/regulator/fixed.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index a43b0e8..eccccca 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -33,10 +33,12 @@ #include #include #include +#include struct fixed_voltage_data { struct regulator_desc desc; struct regulator_dev *dev; + struct gpio_desc *oc_gpio; }; @@ -135,7 +137,36 @@ acpi_get_fixed_voltage_config(struct device *dev, return config; } +static irqreturn_t reg_fixed_overcurrent_irq(int irq, void *data) +{ + struct fixed_voltage_data *drvdata = data; + + regulator_notifier_call_chain(drvdata->dev, + REGULATOR_EVENT_OVER_CURRENT, NULL); + + return IRQ_HANDLED; +} + +static int reg_fixed_get_error_flags(struct regulator_dev *dev, + unsigned int *flags) +{ + struct fixed_voltage_data *drvdata = rdev_get_drvdata(dev); + int oc_value; + + *flags = 0; + + if (!drvdata->oc_gpio) + return 0; + + oc_value = gpiod_get_value_cansleep(drvdata->oc_gpio); + if (oc_value) + *flags = REGULATOR_ERROR_OVER_CURRENT; + + return 0; +} + static struct regulator_ops fixed_voltage_ops = { + .get_error_flags = reg_fixed_get_error_flags, }; static int reg_fixed_voltage_probe(struct platform_device *pdev) @@ -143,6 +174,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) struct fixed_voltage_config *config; struct fixed_voltage_data *drvdata; struct regulator_config cfg = { }; + unsigned long irqflags = IRQF_ONESHOT; int ret; drvdata = devm_kzalloc(&pdev->dev, sizeof(struct fixed_voltage_data), @@ -229,6 +261,30 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) return ret; } + drvdata->oc_gpio = devm_gpiod_get_optional(&pdev->dev, "over-current", + GPIOF_DIR_IN); + if (IS_ERR(drvdata->oc_gpio)) { + ret = PTR_ERR(drvdata->oc_gpio); + dev_err(&pdev->dev, + "Failed to get over current gpio: %d\n", ret); + return ret; + } else if (drvdata->oc_gpio) { + if (gpiod_is_active_low(drvdata->oc_gpio)) + irqflags |= IRQF_TRIGGER_FALLING; + else + irqflags |= IRQF_TRIGGER_RISING; + + ret = devm_request_threaded_irq(&pdev->dev, + gpiod_to_irq(drvdata->oc_gpio), NULL, + reg_fixed_overcurrent_irq, irqflags, + "over_current", drvdata); + if (ret) { + dev_err(&pdev->dev, + "Failed to request irq: %d\n", ret); + return ret; + } + } + platform_set_drvdata(pdev, drvdata); dev_dbg(&pdev->dev, "%s supplying %duV\n", drvdata->desc.name, -- 2.9.3