Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34a6e228 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt-bindings-for-v5.4-tag2' of... 

Merge tag 'renesas-dt-bindings-for-v5.4-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas DT binding updates for v5.4 (take two)

  - Renesas DT binding doc filename cleanups,
  - R-Car Gen3 and RZ/G1 updates for the R-Car CAN and CANFD DT
    bindings.

* tag 'renesas-dt-bindings-for-v5.4-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  dt-bindings: can: rcar_can: document r8a77470 support
  dt-bindings: can: rcar_canfd: document r8a77995 support
  dt-bindings: can: rcar_can: document r8a77995 support
  dt-bindings: can: rcar_can: document r8a77990 support
  dt-bindings: rcar-{csi2,vin}: Rename bindings documentation files
  dt-bindings: rcar-imr: Rename bindings documentation file
  dt-bindings: Rename file of DT bindings for Renesas memory controllers

Link: https://lore.kernel.org/r/20190823123643.18799-6-geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f2a3d36c 7ac2d56f

Documentation/devicetree/bindings/net/can/rcar_can.txt

+5 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
- compatible: "renesas,can-r8a7743" if CAN controller is a part of R8A7743 SoC.

	      "renesas,can-r8a7744" if CAN controller is a part of R8A7744 SoC.

	      "renesas,can-r8a7745" if CAN controller is a part of R8A7745 SoC.

	      "renesas,can-r8a77470" if CAN controller is a part of R8A77470 SoC.

	      "renesas,can-r8a774a1" if CAN controller is a part of R8A774A1 SoC.

	      "renesas,can-r8a774c0" if CAN controller is a part of R8A774C0 SoC.

	      "renesas,can-r8a7778" if CAN controller is a part of R8A7778 SoC.
@@ -17,6 +18,8 @@ Required properties: 
	      "renesas,can-r8a7795" if CAN controller is a part of R8A7795 SoC.

	      "renesas,can-r8a7796" if CAN controller is a part of R8A7796 SoC.

	      "renesas,can-r8a77965" if CAN controller is a part of R8A77965 SoC.

	      "renesas,can-r8a77990" if CAN controller is a part of R8A77990 SoC.

	      "renesas,can-r8a77995" if CAN controller is a part of R8A77995 SoC.

	      "renesas,rcar-gen1-can" for a generic R-Car Gen1 compatible device.

	      "renesas,rcar-gen2-can" for a generic R-Car Gen2 or RZ/G1

	      compatible device.
@@ -33,7 +36,8 @@ Required properties: 
- pinctrl-0: pin control group to be used for this controller.

- pinctrl-names: must be "default".



Required properties for R8A774A1, R8A774C0, R8A7795, R8A7796 and R8A77965:

Required properties for R8A774A1, R8A774C0, R8A7795, R8A7796, R8A77965,

R8A77990, and R8A77995:

For the denoted SoCs, "clkp2" can be CANFD clock. This is a div6 clock and can

be used by both CAN and CAN FD controller at the same time. It needs to be

scaled to maximum frequency if any of these controllers use it. This is done