Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 14d5cd0

Browse files
committed
Merge 13e574b ("Merge tag 'spi-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi") into android-mainline
Steps on the way to 6.3-rc1 Change-Id: I468cdb13059002a2f3f52f4c617a9cccbecefdbe Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2 parents 3fbf22d + 13e574b commit 14d5cd0

File tree

479 files changed

+36906
-5050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

479 files changed

+36906
-5050
lines changed

Documentation/devicetree/bindings/dsp/mediatek,mt8186-dsp.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ description: |
1515
1616
properties:
1717
compatible:
18-
const: mediatek,mt8186-dsp
18+
enum:
19+
- mediatek,mt8186-dsp
20+
- mediatek,mt8188-dsp
1921

2022
reg:
2123
items:

Documentation/devicetree/bindings/regulator/act8865-regulator.txt

Lines changed: 0 additions & 117 deletions
This file was deleted.

Documentation/devicetree/bindings/regulator/act8945a-regulator.txt

Lines changed: 0 additions & 113 deletions
This file was deleted.
Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/regulator/active-semi,act8600.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Active-semi ACT8600 regulator
8+
9+
maintainers:
10+
- Paul Cercueil <paul@crapouillou.net>
11+
12+
properties:
13+
compatible:
14+
const: active-semi,act8600
15+
16+
reg:
17+
maxItems: 1
18+
19+
system-power-controller:
20+
description:
21+
Indicates that the ACT8600 is responsible for powering OFF
22+
the system.
23+
type: boolean
24+
25+
active-semi,vsel-high:
26+
description:
27+
Indicates the VSEL pin is high. If this property is missing,
28+
the VSEL pin is assumed to be low.
29+
type: boolean
30+
31+
regulators:
32+
type: object
33+
additionalProperties: false
34+
35+
properties:
36+
DCDC1:
37+
type: object
38+
$ref: /schemas/regulator/regulator.yaml#
39+
unevaluatedProperties: false
40+
41+
properties:
42+
vp1-supply:
43+
description: Handle to the VP1 input supply
44+
45+
DCDC2:
46+
type: object
47+
$ref: /schemas/regulator/regulator.yaml#
48+
unevaluatedProperties: false
49+
50+
properties:
51+
vp2-supply:
52+
description: Handle to the VP2 input supply
53+
54+
DCDC3:
55+
type: object
56+
$ref: /schemas/regulator/regulator.yaml#
57+
unevaluatedProperties: false
58+
59+
properties:
60+
vp3-supply:
61+
description: Handle to the VP3 input supply
62+
63+
patternProperties:
64+
"^(SUDCDC_REG4|LDO_REG9|LDO_REG10)$":
65+
type: object
66+
$ref: /schemas/regulator/regulator.yaml#
67+
unevaluatedProperties: false
68+
69+
"^LDO[5-8]$":
70+
type: object
71+
$ref: /schemas/regulator/regulator.yaml#
72+
unevaluatedProperties: false
73+
74+
properties:
75+
inl-supply:
76+
description: Handle to the INL input supply
77+
78+
additionalProperties: false
79+
80+
required:
81+
- reg
82+
- compatible
83+
- regulators
84+
85+
examples:
86+
- |
87+
i2c {
88+
#address-cells = <1>;
89+
#size-cells = <0>;
90+
91+
pmic@5a {
92+
compatible = "active-semi,act8600";
93+
reg = <0x5a>;
94+
95+
regulators {
96+
SUDCDC_REG4 {
97+
regulator-min-microvolt = <5300000>;
98+
regulator-max-microvolt = <5300000>;
99+
inl-supply = <&vcc>;
100+
};
101+
102+
LDO5 {
103+
regulator-min-microvolt = <2500000>;
104+
regulator-max-microvolt = <2500000>;
105+
inl-supply = <&vcc>;
106+
};
107+
108+
LDO6 {
109+
regulator-min-microvolt = <3300000>;
110+
regulator-max-microvolt = <3300000>;
111+
inl-supply = <&vcc>;
112+
};
113+
114+
LDO7 {
115+
regulator-min-microvolt = <3300000>;
116+
regulator-max-microvolt = <3300000>;
117+
inl-supply = <&vcc>;
118+
};
119+
120+
LDO8 {
121+
regulator-min-microvolt = <1800000>;
122+
regulator-max-microvolt = <1800000>;
123+
regulator-always-on;
124+
inl-supply = <&vcc>;
125+
};
126+
127+
LDO_REG9 {
128+
regulator-min-microvolt = <3300000>;
129+
regulator-max-microvolt = <3300000>;
130+
regulator-always-on;
131+
inl-supply = <&vcc>;
132+
};
133+
134+
LDO_REG10 {
135+
inl-supply = <&vcc>;
136+
};
137+
};
138+
};
139+
};

0 commit comments

Comments
 (0)