Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator

* 'for-linus' of git://opensource.wolfsonmicro.com/regulator: (22 commits)
  regulator: Constify constraints name
  regulator: Fix possible nullpointer dereference in regulator_enable()
  regulator: gpio-regulator add dependency on GENERIC_GPIO
  regulator: Add module.h include to gpio-regulator
  regulator: Add driver for gpio-controlled regulators
  regulator: remove duplicate REG_CTRL2 defines in tps65023
  regulator: Clarify documentation for regulator-regulator supplies
  regulator: Fix some bitrot in the machine driver documentation
  regulator: tps65023: Added support for the similiar TPS65020 chip
  regulator: tps65023: Setting correct core regulator for tps65021
  regulator: tps65023: Set missing bit for update core-voltage
  regulator: tps65023: Fixes i2c configuration issues
  regulator: Add debugfs file showing the supply map table
  regulator: tps6586x: add SMx slew rate setting
  regulator: tps65023: Fixes i2c configuration issues
  regulator: tps6507x: Remove num_voltages array
  regulator: max8952: removed unused mutex.
  regulator: fix regulator/consumer.h kernel-doc warning
  regulator: Ensure enough enable time for max8649
  regulator: 88pm8607: Fix off-by-one value range checking in the case of no id is matched
  ...

2 files changed, 88 insertions, 1 deletions

diff --git a/include/linux/regulator/gpio-regulator.h b/include/linux/regulator/gpio-regulator.h
new file mode 100644
index 00000000000..19fbd267406
--- /dev/null
+++ b/include/linux/regulator/gpio-regulator.h
@@ -0,0 +1,87 @@
+/*
+ * gpio-regulator.h
+ *
+ * Copyright 2011 Heiko Stuebner <heiko@sntech.de>
+ *
+ * based on fixed.h
+ *
+ * Copyright 2008 Wolfson Microelectronics PLC.
+ *
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *
+ * Copyright (c) 2009 Nokia Corporation
+ * Roger Quadros <ext-roger.quadros@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ */
+
+#ifndef __REGULATOR_GPIO_H
+#define __REGULATOR_GPIO_H
+
+struct regulator_init_data;
+
+enum regulator_type;
+
+/**
+ * struct gpio_regulator_state - state description
+ * @value:              microvolts or microamps
+ * @gpios:              bitfield of gpio target-states for the value
+ *
+ * This structure describes a supported setting of the regulator
+ * and the necessary gpio-state to achieve it.
+ *
+ * The n-th bit in the bitfield describes the state of the n-th GPIO
+ * from the gpios-array defined in gpio_regulator_config below.
+ */
+struct gpio_regulator_state {
+        int value;
+        int gpios;
+};
+
+/**
+ * struct gpio_regulator_config - config structure
+ * @supply_name:        Name of the regulator supply
+ * @enable_gpio:        GPIO to use for enable control
+ *                      set to -EINVAL if not used
+ * @enable_high:        Polarity of enable GPIO
+ *                      1 = Active high, 0 = Active low
+ * @enabled_at_boot:    Whether regulator has been enabled at
+ *                      boot or not. 1 = Yes, 0 = No
+ *                      This is used to keep the regulator at
+ *                      the default state
+ * @startup_delay:      Start-up time in microseconds
+ * @gpios:              Array containing the gpios needed to control
+ *                      the setting of the regulator
+ * @nr_gpios:           Number of gpios
+ * @states:             Array of gpio_regulator_state entries describing
+ *                      the gpio state for specific voltages
+ * @nr_states:          Number of states available
+ * @regulator_type:     either REGULATOR_CURRENT or REGULATOR_VOLTAGE
+ * @init_data:          regulator_init_data
+ *
+ * This structure contains gpio-voltage regulator configuration
+ * information that must be passed by platform code to the
+ * gpio-voltage regulator driver.
+ */
+struct gpio_regulator_config {
+        const char *supply_name;
+
+        int enable_gpio;
+        unsigned enable_high:1;
+        unsigned enabled_at_boot:1;
+        unsigned startup_delay;
+
+        struct gpio *gpios;
+        int nr_gpios;
+
+        struct gpio_regulator_state *states;
+        int nr_states;
+
+        enum regulator_type type;
+        struct regulator_init_data *init_data;
+};
+
+#endif
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index ce3127a75c8..f3f13fd5868 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -95,7 +95,7 @@ struct regulator_state {
  */
 struct regulation_constraints {
 
-        char *name;
+        const char *name;
 
         /* voltage output range (inclusive) - for voltage control */
         int min_uV;