regulator: fixed: Support for open drain gpio pin
authorLaxman Dewangan <ldewangan@nvidia.com>
Wed, 7 Mar 2012 10:28:33 +0000 (15:58 +0530)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Apr 2012 22:17:53 +0000 (23:17 +0100)
Adding flag on fixed regulator board configuration structure
to specify whether gpio is open drain type or not.
Passing this information to gpio library when requesting
gpio so that gpio driver can set the pin state accordingly,
for open drain type:
- Pin can be set HIGH as setting as input, PULL UP on
  pin make this as HIGH.
- Pin can be set LOW as setting it as output and drive to LOW.

The non-open drain pin can be  set HIGH/LOW by setting it to
output and driving it to HIGH/LOW.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/fixed.c
include/linux/regulator/fixed.h

index 8a1e22acc2020fbdd5ef8697d11af568c1c059ea..9a7d70a9c8d7c3ad7d45975777fc7735e5674e78 100644 (file)
@@ -202,6 +202,7 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
        drvdata->startup_delay = config->startup_delay;
 
        if (gpio_is_valid(config->gpio)) {
+               int gpio_flag;
                drvdata->enable_high = config->enable_high;
 
                /* FIXME: Remove below print warning
@@ -219,27 +220,25 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
                        dev_warn(&pdev->dev,
                                "using GPIO 0 for regulator enable control\n");
 
-               ret = gpio_request(config->gpio, config->supply_name);
-               if (ret) {
-                       dev_err(&pdev->dev,
-                          "Could not obtain regulator enable GPIO %d: %d\n",
-                                                       config->gpio, ret);
-                       goto err_name;
-               }
-
-               /* set output direction without changing state
+               /*
+                * set output direction without changing state
                 * to prevent glitch
                 */
                drvdata->is_enabled = config->enabled_at_boot;
                ret = drvdata->is_enabled ?
                                config->enable_high : !config->enable_high;
+               gpio_flag = ret ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
+
+               if (config->gpio_is_open_drain)
+                       gpio_flag |= GPIOF_OPEN_DRAIN;
 
-               ret = gpio_direction_output(config->gpio, ret);
+               ret = gpio_request_one(config->gpio, gpio_flag,
+                                               config->supply_name);
                if (ret) {
                        dev_err(&pdev->dev,
-                          "Could not configure regulator enable GPIO %d direction: %d\n",
+                          "Could not obtain regulator enable GPIO %d: %d\n",
                                                        config->gpio, ret);
-                       goto err_gpio;
+                       goto err_name;
                }
 
                drvdata->desc.ops = &fixed_voltage_gpio_ops;
index 936a7d8c11a927791aaa77e8694a4e9460d65f5b..f83f7440b4885656f171f904e8a1a150141cef36 100644 (file)
@@ -26,6 +26,12 @@ struct regulator_init_data;
  * @gpio:              GPIO to use for enable control
  *                     set to -EINVAL if not used
  * @startup_delay:     Start-up time in microseconds
+ * @gpio_is_open_drain: Gpio pin is open drain or normal type.
+ *                     If it is open drain type then HIGH will be set
+ *                     through PULL-UP with setting gpio as input
+ *                     and low will be set as gpio-output with driven
+ *                     to low. For non-open-drain case, the gpio will
+ *                     will be in output and drive to low/high accordingly.
  * @enable_high:       Polarity of enable GPIO
  *                     1 = Active high, 0 = Active low
  * @enabled_at_boot:   Whether regulator has been enabled at
@@ -43,6 +49,7 @@ struct fixed_voltage_config {
        int microvolts;
        int gpio;
        unsigned startup_delay;
+       unsigned gpio_is_open_drain:1;
        unsigned enable_high:1;
        unsigned enabled_at_boot:1;
        struct regulator_init_data *init_data;