summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-10-08 21:47:33 +0300
committerMark Brown <broonie@kernel.org>2021-10-08 21:47:33 +0300
commit636bdb5f84ca0a8a79e5ad6c368277a73fb04a42 (patch)
tree5dea27dbf083820d379e3558a3795c6bd092ebb3 /drivers/regulator
parent19cd2b1471878ec30375f88a467f63db08407c47 (diff)
parentfab58debc137f66cf97f60c8471ff2f1e3e1b44b (diff)
downloadlinux-636bdb5f84ca0a8a79e5ad6c368277a73fb04a42.tar.xz
Merge series "regulator/mfd/clock: dt-bindings: Samsung S2M and S5M to dtschema" from Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>:
Hi All, Changes since v2 ================ 1. Add Stephen's and Rob's tags. 2. Correct inb-supply description in patch 10/10. Changes since v2 ================ 1. Add Rob's tags. 2. Remove "regulator-name" from properties (all regulator dtschema). 3. Move "unevaluatedProperties" higher to make code easier to read (all regulator dtschema). 4. Add ref-type to op-mode property (patch 6: s5m8767 regulators). Changes since v1 ================ 1. Drop DTS patches - applied. 2. Fully remove bindings/regulator/samsung,s5m8767.txt . 3. Minor subject reformatting and few typos in text. Intro ===== This patchset converts all devicetree bindings of Samsung S2M and S5M PMIC devices from txt to dtschema. It includes also two fixes because later conversion depends on it (contextually). Merging/dependencies ==================== 1. Regulator related binding changes depend on first two commits (the fixes), because of context. 2. The mfd bindings depend on clock and regulator bindings. The fixes and bindings changes (patches 1-10) should go via the same tree. For example regulator or mfd tree. Another alternative is that regulator patches (1-2, 4-6) go via Mark who later gives MFD a stable branch/tag to pull. Then the clock and MFD bindings would go on top via MFD tree. Or any other setup you would like to have. Overview of devices =================== Essentially all Samsung S2M and S5M PMICs are very similar devices. They provide the same functionality: regulators, RTC, 2 or 3 clocks and main power management (e.g. power cut to SoC). The differences are mostly in registers layout and number of regulators. The drivers are built around one common part, mfd/sec-core.c, and share some drivers between devices: 1. MFD sec-core for all devices, 1. one clock driver for most of devices, 2. one RTC driver for all devices, 3. three regulator drivers. The regulator drivers were implementing slightly different features, therefore one regulator binding for all devices does not make much sense. However the clock device binding can be shared. The final dtschema bindings try to implement this - share only the clock bindings. Best regards, Krzysztof Krzysztof Kozlowski (10): regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx property dt-bindings: clock: samsung,s2mps11: convert to dtschema regulator: dt-bindings: samsung,s2m: convert to dtschema regulator: dt-bindings: samsung,s2mpa01: convert to dtschema regulator: dt-bindings: samsung,s5m8767: convert to dtschema dt-bindings: mfd: samsung,s2mps11: convert to dtschema dt-bindings: mfd: samsung,s2mpa01: convert to dtschema dt-bindings: mfd: samsung,s5m8767: convert to dtschema dt-bindings: mfd: samsung,s5m8767: document buck and LDO supplies .../bindings/clock/samsung,s2mps11.txt | 49 --- .../bindings/clock/samsung,s2mps11.yaml | 45 +++ .../bindings/mfd/samsung,s2mpa01.yaml | 91 ++++++ .../bindings/mfd/samsung,s2mps11.yaml | 267 +++++++++++++++ .../bindings/mfd/samsung,s5m8767.yaml | 307 ++++++++++++++++++ .../bindings/mfd/samsung,sec-core.txt | 86 ----- .../bindings/regulator/samsung,s2mpa01.txt | 79 ----- .../bindings/regulator/samsung,s2mpa01.yaml | 62 ++++ .../bindings/regulator/samsung,s2mps11.txt | 102 ------ .../bindings/regulator/samsung,s2mps11.yaml | 44 +++ .../bindings/regulator/samsung,s2mps13.yaml | 44 +++ .../bindings/regulator/samsung,s2mps14.yaml | 44 +++ .../bindings/regulator/samsung,s2mps15.yaml | 44 +++ .../bindings/regulator/samsung,s2mpu02.yaml | 44 +++ .../bindings/regulator/samsung,s5m8767.txt | 145 --------- .../bindings/regulator/samsung,s5m8767.yaml | 74 +++++ MAINTAINERS | 9 +- drivers/regulator/s5m8767.c | 21 +- 18 files changed, 1080 insertions(+), 477 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s2mps11.txt create mode 100644 Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml create mode 100644 Documentation/devicetree/bindings/mfd/samsung,s2mpa01.yaml create mode 100644 Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml create mode 100644 Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml delete mode 100644 Documentation/devicetree/bindings/mfd/samsung,sec-core.txt delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpa01.yaml delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps11.txt create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps11.yaml create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps13.yaml create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps15.yaml create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpu02.yaml delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml -- 2.30.2
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/s5m8767.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 7c111bbdc2af..35269f998210 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -850,18 +850,15 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
/* DS4 GPIO */
gpio_direction_output(pdata->buck_ds[2], 0x0);
- if (pdata->buck2_gpiodvs || pdata->buck3_gpiodvs ||
- pdata->buck4_gpiodvs) {
- regmap_update_bits(s5m8767->iodev->regmap_pmic,
- S5M8767_REG_BUCK2CTRL, 1 << 1,
- (pdata->buck2_gpiodvs) ? (1 << 1) : (0 << 1));
- regmap_update_bits(s5m8767->iodev->regmap_pmic,
- S5M8767_REG_BUCK3CTRL, 1 << 1,
- (pdata->buck3_gpiodvs) ? (1 << 1) : (0 << 1));
- regmap_update_bits(s5m8767->iodev->regmap_pmic,
- S5M8767_REG_BUCK4CTRL, 1 << 1,
- (pdata->buck4_gpiodvs) ? (1 << 1) : (0 << 1));
- }
+ regmap_update_bits(s5m8767->iodev->regmap_pmic,
+ S5M8767_REG_BUCK2CTRL, 1 << 1,
+ (pdata->buck2_gpiodvs) ? (1 << 1) : (0 << 1));
+ regmap_update_bits(s5m8767->iodev->regmap_pmic,
+ S5M8767_REG_BUCK3CTRL, 1 << 1,
+ (pdata->buck3_gpiodvs) ? (1 << 1) : (0 << 1));
+ regmap_update_bits(s5m8767->iodev->regmap_pmic,
+ S5M8767_REG_BUCK4CTRL, 1 << 1,
+ (pdata->buck4_gpiodvs) ? (1 << 1) : (0 << 1));
/* Initialize GPIO DVS registers */
for (i = 0; i < 8; i++) {