| Message ID | 20200824102402.4047fa5f@xhacker.debian |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | regulator: mp886x: use "mps,switch-frequency-hz" | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 16 lines checked |
On Mon, 24 Aug 2020 10:32:14 +0800, Jisheng Zhang wrote: > As Rob suggested, use the "mps,switch-frequency-hz" instead of the > "mps,switch-frequency" for switch frequency. Fortunately, the switch > frequency support isn't released, so we can modify it now without > any concern. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next Thanks! [1/1] regulator: mp886x: use "mps,switch-frequency-hz" commit: a5f7949570dc7262d3239739b0cdaa001f935d4b All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/Documentation/devicetree/bindings/regulator/mp886x.txt b/Documentation/devicetree/bindings/regulator/mp886x.txt index e747000cebba..b05307bbb0d9 100644 --- a/Documentation/devicetree/bindings/regulator/mp886x.txt +++ b/Documentation/devicetree/bindings/regulator/mp886x.txt @@ -10,7 +10,7 @@ Required properties: values R1 and R2 of the feedback voltage divider in kilo ohms. Optional properties: -- mps,switch-frequency: The valid switch frequency in Hertz. Available values +- mps,switch-frequency-hz: The valid switch frequency in Hertz. Available values are: 500000, 750000, 1000000, 1250000, 1500000 Any property defined as part of the core regulator binding, defined in diff --git a/drivers/regulator/mp886x.c b/drivers/regulator/mp886x.c index 97dc44c0d663..a84fd74081de 100644 --- a/drivers/regulator/mp886x.c +++ b/drivers/regulator/mp886x.c @@ -349,7 +349,7 @@ static int mp886x_i2c_probe(struct i2c_client *client) config.driver_data = di; config.of_node = np; - if (!of_property_read_u32(np, "mps,switch-frequency", &freq)) + if (!of_property_read_u32(np, "mps,switch-frequency-hz", &freq)) mp886x_set_switch_freq(di, regmap, freq); ret = mp886x_regulator_register(di, &config);
As Rob suggested, use the "mps,switch-frequency-hz" instead of the "mps,switch-frequency" for switch frequency. Fortunately, the switch frequency support isn't released, so we can modify it now without any concern. Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> --- Documentation/devicetree/bindings/regulator/mp886x.txt | 2 +- drivers/regulator/mp886x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)