diff options
| author | Borislav Petkov <bp@suse.de> | 2020-12-01 18:01:27 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-12-01 18:01:27 +0100 |
| commit | 87314fb181f9042a226d721ab4a5579ddfca139c (patch) | |
| tree | b663e58cfe19ecf5003d4ea6e8048f6ae1925e9f /Documentation/devicetree/bindings/sram | |
| parent | 2002d2951398317d0f46e64ae6d8dd58ed541c6d (diff) | |
| parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
| download | linux-87314fb181f9042a226d721ab4a5579ddfca139c.tar.bz2 | |
Merge tag 'v5.10-rc6' into x86/cache
Merge -rc6 tag to pick up dependent changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'Documentation/devicetree/bindings/sram')
| -rw-r--r-- | Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml index 6ebcbc153691..b66a07e21d1e 100644 --- a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml +++ b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml @@ -34,6 +34,9 @@ properties: - const: allwinner,sun8i-a23-system-control - const: allwinner,sun8i-h3-system-control - items: + - const: allwinner,sun8i-v3s-system-control + - const: allwinner,sun8i-h3-system-control + - items: - const: allwinner,sun8i-r40-system-control - const: allwinner,sun4i-a10-system-control - const: allwinner,sun50i-a64-sram-controller |