diff options
author | Arnd Bergmann <arnd@arndb.de> | 2022-03-08 17:06:44 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2022-03-08 17:06:45 +0100 |
commit | c76edea0e52d5522835534de90c893ca50b04402 (patch) | |
tree | 86e4545e1c5f9422aa2b84de6313429bef5eca6f /Documentation | |
parent | 608f7cf3f54415963ef49b70596153d806ebb0de (diff) | |
parent | f2b03c1056ef5c0829678f51273eace3e6327884 (diff) | |
download | linux-c76edea0e52d5522835534de90c893ca50b04402.tar.bz2 |
Merge tag 'amlogic-drivers-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/drivers
Amlogic Drivers updates for v5.18:
- Add support for Amlogic S4 in meson-secure-pwrc power domain driver
* tag 'amlogic-drivers-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
soc: s4: Add support for power domains controller
dt-bindings: power: add Amlogic s4 power domains bindings
Link: https://lore.kernel.org/r/c7471989-d929-c744-c0c3-c8e86eaaa225@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml b/Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml index 5dae04d2936c..7657721a4e96 100644 --- a/Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml +++ b/Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml @@ -12,13 +12,14 @@ maintainers: - Jianxin Pan <jianxin.pan@amlogic.com> description: |+ - Secure Power Domains used in Meson A1/C1 SoCs, and should be the child node + Secure Power Domains used in Meson A1/C1/S4 SoCs, and should be the child node of secure-monitor. properties: compatible: enum: - amlogic,meson-a1-pwrc + - amlogic,meson-s4-pwrc "#power-domain-cells": const: 1 |