Commit 3abcc01c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Marc Kleine-Budde

dt-bindings: can: renesas,rcar-canfd: Fix number of channels for R-Car V3U

According to the bindings, only two channels are supported.
However, R-Car V3U supports eight, leading to "make dtbs" failures:

        arch/arm64/boot/dts/renesas/r8a779a0-falcon.dtb: can@e6660000: Unevaluated properties are not allowed ('channel2', 'channel3', 'channel4', 'channel5', 'channel6', 'channel7' were unexpected)

Update the number of channels to 8 on R-Car V3U.
While at it, prevent adding more properties to the channel nodes, as
they must contain no other properties than a status property.

Fixes: d6254d52 ("dt-bindings: can: renesas,rcar-canfd: Document r8a779a0 support")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/all/7d41d72cd7db2e90bae069ce57dbb672f17500ae.1670431681.git.geert+renesas@glider.beSigned-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 0826e82b
...@@ -9,9 +9,6 @@ title: Renesas R-Car CAN FD Controller ...@@ -9,9 +9,6 @@ title: Renesas R-Car CAN FD Controller
maintainers: maintainers:
- Fabrizio Castro <fabrizio.castro.jz@renesas.com> - Fabrizio Castro <fabrizio.castro.jz@renesas.com>
allOf:
- $ref: can-controller.yaml#
properties: properties:
compatible: compatible:
oneOf: oneOf:
...@@ -77,12 +74,13 @@ properties: ...@@ -77,12 +74,13 @@ properties:
description: Maximum frequency of the CANFD clock. description: Maximum frequency of the CANFD clock.
patternProperties: patternProperties:
"^channel[01]$": "^channel[0-7]$":
type: object type: object
description: description:
The controller supports two channels and each is represented as a child The controller supports multiple channels and each is represented as a
node. Each child node supports the "status" property only, which child node. Each channel can be enabled/disabled individually.
is used to enable/disable the respective channel.
additionalProperties: false
required: required:
- compatible - compatible
...@@ -98,60 +96,73 @@ required: ...@@ -98,60 +96,73 @@ required:
- channel0 - channel0
- channel1 - channel1
if: allOf:
properties: - $ref: can-controller.yaml#
compatible:
contains: - if:
enum: properties:
- renesas,rzg2l-canfd compatible:
then: contains:
properties: enum:
interrupts: - renesas,rzg2l-canfd
items: then:
- description: CAN global error interrupt properties:
- description: CAN receive FIFO interrupt interrupts:
- description: CAN0 error interrupt items:
- description: CAN0 transmit interrupt - description: CAN global error interrupt
- description: CAN0 transmit/receive FIFO receive completion interrupt - description: CAN receive FIFO interrupt
- description: CAN1 error interrupt - description: CAN0 error interrupt
- description: CAN1 transmit interrupt - description: CAN0 transmit interrupt
- description: CAN1 transmit/receive FIFO receive completion interrupt - description: CAN0 transmit/receive FIFO receive completion interrupt
- description: CAN1 error interrupt
interrupt-names: - description: CAN1 transmit interrupt
items: - description: CAN1 transmit/receive FIFO receive completion interrupt
- const: g_err
- const: g_recc interrupt-names:
- const: ch0_err items:
- const: ch0_rec - const: g_err
- const: ch0_trx - const: g_recc
- const: ch1_err - const: ch0_err
- const: ch1_rec - const: ch0_rec
- const: ch1_trx - const: ch0_trx
- const: ch1_err
resets: - const: ch1_rec
maxItems: 2 - const: ch1_trx
reset-names: resets:
items: maxItems: 2
- const: rstp_n
- const: rstc_n reset-names:
items:
required: - const: rstp_n
- reset-names - const: rstc_n
else:
properties: required:
interrupts: - reset-names
items: else:
- description: Channel interrupt properties:
- description: Global interrupt interrupts:
items:
interrupt-names: - description: Channel interrupt
items: - description: Global interrupt
- const: ch_int
- const: g_int interrupt-names:
items:
resets: - const: ch_int
maxItems: 1 - const: g_int
resets:
maxItems: 1
- if:
not:
properties:
compatible:
contains:
const: renesas,r8a779a0-canfd
then:
patternProperties:
"^channel[2-7]$": false
unevaluatedProperties: false unevaluatedProperties: false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment