瀏覽代碼

regulator: pwm-regulator: Remove obsoleted property

In "[3d7ef30] regulator: pwm-regulator: Simplify voltage to duty-cycle
call" we stopped using max_duty_cycle, so we can retire it from device
data and DT.

There is no need to deprecate this property, as it hasn't hit Mainline
yet.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Lee Jones 10 年之前
父節點
當前提交
f747a1fe78
共有 2 個文件被更改,包括 4 次插入16 次删除
  1. 4 7
      Documentation/devicetree/bindings/regulator/pwm-regulator.txt
  2. 0 9
      drivers/regulator/pwm-regulator.c

+ 4 - 7
Documentation/devicetree/bindings/regulator/pwm-regulator.txt

@@ -29,15 +29,14 @@ Required properties:
 
 
 - pwms:			PWM specification (See: ../pwm/pwm.txt)
 - pwms:			PWM specification (See: ../pwm/pwm.txt)
 
 
-One of these must be provided:
+Only required for Voltage Table Mode:
 - voltage-table: 	Voltage and Duty-Cycle table consisting of 2 cells
 - voltage-table: 	Voltage and Duty-Cycle table consisting of 2 cells
 			    First cell is voltage in microvolts (uV)
 			    First cell is voltage in microvolts (uV)
 			    Second cell is duty-cycle in percent (%)
 			    Second cell is duty-cycle in percent (%)
 
 
-- max-duty-cycle:	Maximum Duty-Cycle value -- this will normally be
-  			255 (0xff) for an 8 bit PWM device
-
-If both are provided, the current default is voltage-table mode.
+NB: To be clear, if voltage-table is provided, then the device will be used
+in Voltage Table Mode.  If no voltage-table is provided, then the device will
+be used in Continuous Voltage Mode.
 
 
 Any property defined as part of the core regulator binding can also be used.
 Any property defined as part of the core regulator binding can also be used.
 (See: ../regulator/regulator.txt)
 (See: ../regulator/regulator.txt)
@@ -49,8 +48,6 @@ Continuous Voltage Example:
 		regulator-min-microvolt = <1016000>;
 		regulator-min-microvolt = <1016000>;
 		regulator-max-microvolt = <1114000>;
 		regulator-max-microvolt = <1114000>;
 		regulator-name = "vdd_logic";
 		regulator-name = "vdd_logic";
-
-		max-duty-cycle = <255>; /* 8bit PWM */
 	};
 	};
 
 
 Voltage Table Example:
 Voltage Table Example:

+ 0 - 9
drivers/regulator/pwm-regulator.c

@@ -30,7 +30,6 @@ struct pwm_regulator_data {
 	int state;
 	int state;
 
 
 	/* Continuous voltage */
 	/* Continuous voltage */
-	u32 max_duty_cycle;
 	int volt_uV;
 	int volt_uV;
 };
 };
 
 
@@ -201,14 +200,6 @@ static int pwm_regulator_init_continuous(struct platform_device *pdev,
 					 struct pwm_regulator_data *drvdata)
 					 struct pwm_regulator_data *drvdata)
 {
 {
 	struct device_node *np = pdev->dev.of_node;
 	struct device_node *np = pdev->dev.of_node;
-	int ret;
-
-	ret = of_property_read_u32(np, "max-duty-cycle",
-				   &drvdata->max_duty_cycle);
-	if (ret) {
-		dev_err(&pdev->dev, "Failed to read \"pwm-max-value\"\n");
-		return ret;
-	}
 
 
 	pwm_regulator_desc.ops = &pwm_regulator_voltage_continuous_ops;
 	pwm_regulator_desc.ops = &pwm_regulator_voltage_continuous_ops;
 	pwm_regulator_desc.continuous_voltage_range = true;
 	pwm_regulator_desc.continuous_voltage_range = true;