diff options
| author | Mark Brown <broonie@kernel.org> | 2024-03-28 15:51:21 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-03-28 15:51:21 +0300 |
| commit | 604efe5018b4a1e99e0321a768cb925932a65c7d (patch) | |
| tree | f23f764e58c475f6d681390853fab81d84546f7b /Documentation/devicetree | |
| parent | 54b8d0956a9bd46e6daf3bbe69a52d3d41def36c (diff) | |
| parent | d2ac3df75c3a995064cfac0171e082a30d8c4c66 (diff) | |
| download | linux-604efe5018b4a1e99e0321a768cb925932a65c7d.tar.xz | |
regulator: Merge axp20x changes
There will be at least one incremental change on top of some MFD
overlapping device additions for this driver so merge now.
Merge tag 'ib-mfd-regulator-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-6.10
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml b/Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml index 06f1779835a1..b8e8db0d58e9 100644 --- a/Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml +++ b/Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml @@ -83,6 +83,7 @@ allOf: enum: - x-powers,axp313a - x-powers,axp15060 + - x-powers,axp717 then: properties: @@ -99,6 +100,7 @@ properties: - x-powers,axp221 - x-powers,axp223 - x-powers,axp313a + - x-powers,axp717 - x-powers,axp803 - x-powers,axp806 - x-powers,axp809 |