Skip to content

Commit 636bdb5

Browse files
committed
Merge series "regulator/mfd/clock: dt-bindings: Samsung S2M and S5M to dtschema" from Krzysztof Kozlowski <[email protected]>:
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
2 parents 19cd2b1 + fab58de commit 636bdb5

14 files changed

+413
-390
lines changed

Documentation/devicetree/bindings/clock/samsung,s2mps11.txt

Lines changed: 0 additions & 49 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/samsung,s2mps11.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung S2M and S5M family clock generator block
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
12+
description: |
13+
This is a part of device tree bindings for S2M and S5M family of Power
14+
Management IC (PMIC).
15+
16+
The S2MPS11/13/15 and S5M8767 provide three(AP/CP/BT) buffered 32.768 kHz
17+
outputs. The S2MPS14 provides two (AP/BT) buffered 32.768 KHz outputs.
18+
19+
All available clocks are defined as preprocessor macros in
20+
dt-bindings/clock/samsung,s2mps11.h header.
21+
22+
See also Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml for
23+
additional information and example.
24+
25+
properties:
26+
compatible:
27+
enum:
28+
- samsung,s2mps11-clk
29+
- samsung,s2mps13-clk # S2MPS13 and S2MPS15
30+
- samsung,s2mps14-clk
31+
- samsung,s5m8767-clk
32+
33+
"#clock-cells":
34+
const: 1
35+
36+
clock-output-names:
37+
minItems: 3
38+
maxItems: 3
39+
description: Names for AP, CP and BT clocks.
40+
41+
required:
42+
- compatible
43+
- "#clock-cells"
44+
45+
additionalProperties: false

Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt

Lines changed: 0 additions & 79 deletions
This file was deleted.
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/samsung,s2mpa01.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung S2MPA01 Power Management IC regulators
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
12+
description: |
13+
This is a part of device tree bindings for S2M and S5M family of Power
14+
Management IC (PMIC).
15+
16+
The S2MPA01 provides buck and LDO regulators.
17+
18+
See also Documentation/devicetree/bindings/mfd/samsung,s2mpa01.yaml for
19+
additional information and example.
20+
21+
patternProperties:
22+
# 26 LDOs
23+
"^LDO([1-9]|1[0-9]|2[0-6])$":
24+
type: object
25+
$ref: regulator.yaml#
26+
unevaluatedProperties: false
27+
description:
28+
Properties for single LDO regulator.
29+
30+
required:
31+
- regulator-name
32+
33+
# 10 bucks
34+
"^BUCK([1-9]|10)$":
35+
type: object
36+
$ref: regulator.yaml#
37+
unevaluatedProperties: false
38+
description:
39+
Properties for single BUCK regulator.
40+
41+
properties:
42+
regulator-ramp-delay:
43+
enum: [0, 6250, 12500, 25000, 50000]
44+
default: 12500
45+
description: |
46+
May be 0 for disabling the ramp delay on BUCK{1,2,3,4}.
47+
48+
In the absence of the regulator-ramp-delay property, the default ramp
49+
delay will be used.
50+
51+
Note: Some bucks share the ramp rate setting i.e. same ramp value
52+
will be set for a particular group of bucks so provide the same
53+
regulator-ramp-delay value for them.
54+
Groups sharing ramp rate:
55+
* buck{1,6},
56+
* buck{2,4},
57+
* buck{8,9,10}.
58+
59+
required:
60+
- regulator-name
61+
62+
additionalProperties: false

Documentation/devicetree/bindings/regulator/samsung,s2mps11.txt

Lines changed: 0 additions & 102 deletions
This file was deleted.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/samsung,s2mps11.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung S2MPS11 Power Management IC regulators
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
12+
description: |
13+
This is a part of device tree bindings for S2M and S5M family of Power
14+
Management IC (PMIC).
15+
16+
The S2MPS11 provides buck and LDO regulators.
17+
18+
See also Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml for
19+
additional information and example.
20+
21+
patternProperties:
22+
# 38 LDOs
23+
"^LDO([1-9]|[1-2][0-9]|3[0-8])$":
24+
type: object
25+
$ref: regulator.yaml#
26+
unevaluatedProperties: false
27+
description:
28+
Properties for single LDO regulator.
29+
30+
required:
31+
- regulator-name
32+
33+
# 10 bucks
34+
"^BUCK([1-9]|10)$":
35+
type: object
36+
$ref: regulator.yaml#
37+
unevaluatedProperties: false
38+
description:
39+
Properties for single BUCK regulator.
40+
41+
required:
42+
- regulator-name
43+
44+
additionalProperties: false

0 commit comments

Comments
 (0)