Skip to content

Commit 44dce4b

Browse files
zongboxpalmer-dabbelt
authored andcommitted
dt-bindings: sifive-ccache: change Sifive L2 cache to Composable cache
Since composable cache may be L3 cache if private L2 cache exists, we should use its original name Composable cache to prevent confusion. Signed-off-by: Zong Li <zong.li@sifive.com> Suggested-by: Conor Dooley <conor.dooley@microchip.com> Suggested-by: Ben Dooks <ben.dooks@sifive.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20220913061817.22564-2-zong.li@sifive.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 17e4732 commit 44dce4b

1 file changed

Lines changed: 23 additions & 5 deletions

File tree

Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml renamed to Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Copyright (C) 2020 SiFive, Inc.
33
%YAML 1.2
44
---
5-
$id: http://devicetree.org/schemas/riscv/sifive-l2-cache.yaml#
5+
$id: http://devicetree.org/schemas/riscv/sifive,ccache0.yaml#
66
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

8-
title: SiFive L2 Cache Controller
8+
title: SiFive Composable Cache Controller
99

1010
maintainers:
1111
- Sagar Kadam <sagar.kadam@sifive.com>
1212
- Paul Walmsley <paul.walmsley@sifive.com>
1313

1414
description:
15-
The SiFive Level 2 Cache Controller is used to provide access to fast copies
16-
of memory for masters in a Core Complex. The Level 2 Cache Controller also
15+
The SiFive Composable Cache Controller is used to provide access to fast copies
16+
of memory for masters in a Core Complex. The Composable Cache Controller also
1717
acts as directory-based coherency manager.
1818
All the properties in ePAPR/DeviceTree specification applies for this platform.
1919

@@ -22,6 +22,7 @@ select:
2222
compatible:
2323
contains:
2424
enum:
25+
- sifive,ccache0
2526
- sifive,fu540-c000-ccache
2627
- sifive,fu740-c000-ccache
2728

@@ -33,6 +34,7 @@ properties:
3334
oneOf:
3435
- items:
3536
- enum:
37+
- sifive,ccache0
3638
- sifive,fu540-c000-ccache
3739
- sifive,fu740-c000-ccache
3840
- const: cache
@@ -45,7 +47,7 @@ properties:
4547
const: 64
4648

4749
cache-level:
48-
const: 2
50+
enum: [2, 3]
4951

5052
cache-sets:
5153
enum: [1024, 2048]
@@ -115,6 +117,22 @@ allOf:
115117
cache-sets:
116118
const: 1024
117119

120+
- if:
121+
properties:
122+
compatible:
123+
contains:
124+
const: sifive,ccache0
125+
126+
then:
127+
properties:
128+
cache-level:
129+
enum: [2, 3]
130+
131+
else:
132+
properties:
133+
cache-level:
134+
const: 2
135+
118136
additionalProperties: false
119137

120138
required:

0 commit comments

Comments
 (0)