| Message ID | 20220805162844.1554247-2-mail@conchuod.ie |
|---|---|
| State | New |
| Headers | show |
| Series | Fix dt-validate issues on qemu dtbdumps due to dt-bindings | expand |
On 09/08/2022 15:16, Rob Herring wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > On Fri, Aug 05, 2022 at 05:28:43PM +0100, Conor Dooley wrote: >> From: Conor Dooley <conor.dooley@microchip.com> >> >> While "real" hardware might not use the compatible string "riscv,clint0" >> it is present in the driver & QEMU uses it for automatically generated >> virt machine dtbs. To avoid dt-validate problems with QEMU produced >> dtbs, such as the following, add it to the binding. >> >> riscv-virt.dtb: clint@2000000: compatible:0: 'sifive,clint0' is not one of ['sifive,fu540-c000-clint', 'starfive,jh7100-clint', 'canaan,k210-clint'] >> >> Reported-by: Rob Herring <robh@kernel.org> >> Link: https://lore.kernel.org/linux-riscv/20220803170552.GA2250266-robh@kernel.org/ >> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> >> --- >> .../bindings/timer/sifive,clint.yaml | 18 ++++++++++++------ >> 1 file changed, 12 insertions(+), 6 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/timer/sifive,clint.yaml b/Documentation/devicetree/bindings/timer/sifive,clint.yaml >> index e64f46339079..9fcf20942582 100644 >> --- a/Documentation/devicetree/bindings/timer/sifive,clint.yaml >> +++ b/Documentation/devicetree/bindings/timer/sifive,clint.yaml >> @@ -22,12 +22,18 @@ description: >> >> properties: >> compatible: >> - items: >> - - enum: >> - - sifive,fu540-c000-clint >> - - starfive,jh7100-clint >> - - canaan,k210-clint >> - - const: sifive,clint0 >> + oneOf: >> + - items: >> + - enum: >> + - sifive,fu540-c000-clint >> + - starfive,jh7100-clint >> + - canaan,k210-clint >> + - const: sifive,clint0 >> + - items: >> + - const: sifive,clint0 >> + - const: riscv,clint0 >> + deprecated: true >> + description: For legacy systems & the qemu virt machine only > > I would drop 'legacy systems'. I took this from a comment in the driver against "riscv,plic0". Thought it applied to both plic and clint bindings so put it in here. Happy to drop them for v2 :) Thanks, Conor.
diff --git a/Documentation/devicetree/bindings/timer/sifive,clint.yaml b/Documentation/devicetree/bindings/timer/sifive,clint.yaml index e64f46339079..9fcf20942582 100644 --- a/Documentation/devicetree/bindings/timer/sifive,clint.yaml +++ b/Documentation/devicetree/bindings/timer/sifive,clint.yaml @@ -22,12 +22,18 @@ description: properties: compatible: - items: - - enum: - - sifive,fu540-c000-clint - - starfive,jh7100-clint - - canaan,k210-clint - - const: sifive,clint0 + oneOf: + - items: + - enum: + - sifive,fu540-c000-clint + - starfive,jh7100-clint + - canaan,k210-clint + - const: sifive,clint0 + - items: + - const: sifive,clint0 + - const: riscv,clint0 + deprecated: true + description: For legacy systems & the qemu virt machine only description: Should be "<vendor>,<chip>-clint" and "sifive,clint<version>".