regulator: add REGULATOR_MODE_OFF (v2)

@@ -37,6 +37,7 @@ static LIST_HEAD(regulator_map_list);
 struct regulator_dev {
 	struct regulator_desc *desc;
 	int use_count;
+	int requested_mode;
 
 	/* lists we belong to */
 	struct list_head list; /* list of all regulators */

@@ -270,6 +271,8 @@ static ssize_t regulator_print_opmode(ch
 		return sprintf(buf, "idle\n");
 	case REGULATOR_MODE_STANDBY:
 		return sprintf(buf, "standby\n");
+	case REGULATOR_MODE_OFF:
+		return sprintf(buf, "off\n");
 	}
 	return sprintf(buf, "unknown\n");
 }

@@ -283,6 +286,15 @@ static ssize_t regulator_opmode_show(str
 }
 static DEVICE_ATTR(opmode, 0444, regulator_opmode_show, NULL);
 
+static ssize_t regulator_requested_mode_show(struct device *dev,
+				    struct device_attribute *attr, char *buf)
+{
+	struct regulator_dev *rdev = dev_get_drvdata(dev);
+
+	return regulator_print_opmode(buf, rdev->requested_mode);
+}
+static DEVICE_ATTR(requested_opmode, 0444, regulator_requested_mode_show, NULL);
+
 static ssize_t regulator_print_state(char *buf, int state)
 {
 	if (state > 0)

@@ -542,8 +554,10 @@ static void drms_uA_update(struct regula
 
 	/* check the new mode is allowed */
 	err = regulator_check_mode(rdev, mode);
-	if (err == 0)
-		rdev->desc->ops->set_mode(rdev, mode);
+	if (err == 0) {
+		if (rdev->desc->ops->set_mode(rdev, mode) > 0)
+			rdev->requested_mode = mode;
+	}
 }
 
 static int suspend_set_state(struct regulator_dev *rdev,

@@ -559,7 +573,7 @@ static int suspend_set_state(struct regu
 		return -EINVAL;
 	}
 
-	if (rstate->enabled)
+	if (rstate->enabled && rstate->mode != REGULATOR_MODE_OFF)
 		ret = rdev->desc->ops->set_suspend_enable(rdev);
 	else
 		ret = rdev->desc->ops->set_suspend_disable(rdev);

@@ -638,7 +652,9 @@ static void print_constraints(struct reg
 	if (constraints->valid_modes_mask & REGULATOR_MODE_IDLE)
 		count += sprintf(buf + count, "idle ");
 	if (constraints->valid_modes_mask & REGULATOR_MODE_STANDBY)
-		count += sprintf(buf + count, "standby");
+		count += sprintf(buf + count, "standby ");
+	if (constraints->valid_modes_mask & REGULATOR_MODE_OFF)
+		count += sprintf(buf + count, "off ");
 
 	printk(KERN_INFO "regulator: %s: %s\n", rdev->desc->name, buf);
 }

@@ -1332,7 +1348,8 @@ EXPORT_SYMBOL_GPL(regulator_get_current_
  * @mode: operating mode - one of the REGULATOR_MODE constants
  *
  * Set regulator operating mode to increase regulator efficiency or improve
- * regulation performance.
+ * regulation performance.  You may not pass REGULATOR_MODE_OFF; to achieve
+ * that effect, call regulator_disable().
  *
  * NOTE: Regulator system constraints must be set for this regulator before
  * calling this function otherwise this call will fail.

@@ -1342,6 +1359,9 @@ int regulator_set_mode(struct regulator 
 	struct regulator_dev *rdev = regulator->rdev;
 	int ret;
 
+	if (mode == REGULATOR_MODE_OFF)
+		return -EINVAL;
+
 	mutex_lock(&rdev->mutex);
 
 	/* sanity check */

@@ -1356,6 +1376,8 @@ int regulator_set_mode(struct regulator 
 		goto out;
 
 	ret = rdev->desc->ops->set_mode(rdev, mode);
+	if (ret > 0)
+		rdev->requested_mode = mode;
 out:
 	mutex_unlock(&rdev->mutex);
 	return ret;

@@ -1475,7 +1497,8 @@ int regulator_set_optimum_mode(struct re
 		printk(KERN_ERR "%s: failed to set optimum mode %x for %s\n",
 			__func__, mode, rdev->desc->name);
 		goto out;
-	}
+	} else
+		rdev->requested_mode = mode;
 	ret = mode;
 out:
 	mutex_unlock(&rdev->mutex);

@@ -1709,6 +1732,11 @@ static int add_regulator_attributes(stru
 		if (status < 0)
 			return status;
 	}
+	if (ops->set_mode) {
+		status = device_create_file(dev, &dev_attr_requested_opmode);
+		if (status < 0)
+			return status;
+	}
 	if (ops->is_enabled) {
 		status = device_create_file(dev, &dev_attr_state);
 		if (status < 0)

@@ -68,16 +68,21 @@
  *             the most noisy and may not be able to handle fast load
  *             switching.
  *
+ *  OFF        Regulator is disabled.  This mode may be observed from
+ *             some hardware after invoking disable() primitives, or
+ *             after events not controlled by Linux.
+ *
  * NOTE: Most regulators will only support a subset of these modes. Some
  * will only just support NORMAL.
  *
- * These modes can be OR'ed together to make up a mask of valid register modes.
+ * These modes can be OR'ed together to make up a mask of valid modes.
  */
 
 #define REGULATOR_MODE_FAST			0x1
 #define REGULATOR_MODE_NORMAL			0x2
 #define REGULATOR_MODE_IDLE			0x4
 #define REGULATOR_MODE_STANDBY			0x8
+#define REGULATOR_MODE_OFF			0x10
 
 /*
  * Regulator notifier events.