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

Commit 3c862347 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm64-dt2-for-v4.8' of... 

Merge tag 'renesas-arm64-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64

Merge "Second Round of Renesas ARM64 Based SoC DT Updates for v4.8" from Simon Horman:

* Add support for  r8a7796/salvator-x (R-Car Gen 3 M3-W)
* Add CAN support to r8a7795 (R-Car Gen 3 H3)

* tag 'renesas-arm64-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: r8a7796/salvator-x: Enable watchdog timer
  arm64: dts: r8a7796: Add RWDT node
  arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
  arm64: dts: r8a7796: Add SYSC PM Domains
  arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC
  arm64: dts: r8a7796: Add Renesas R8A7796 SoC support
  arm64: dts: r8a7795: Add CAN FD support
  arm64: dts: r8a7795: Add missing blank lines between cpu nodes
  clk: renesas: r8a7795: Add THS/TSC clock
  clk: renesas: r8a7795: Add DRIF clock
  clk: renesas: r8a7795: Correct lvds clock parent
  clk: renesas: r8a7795: Provide FDP1 clocks
  clk: renesas: Add R8A7792 support
  clk: renesas: mstp: Document R8A7792 support
  clk: renesas: rcar-gen2: Document R8A7792 support
  clk: renesas: cpg-mssr: Add support for R-Car M3-W
  clk: renesas: cpg-mssr: Extract common R-Car Gen3 support code
  clk: renesas: Add r8a7796 CPG Core Clock Definitions
  clk: renesas: cpg-mssr: Document r8a7796 support
parents 8d09251a c805f1a7

Documentation/devicetree/bindings/arm/shmobile.txt

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ SoCs: 
    compatible = "renesas,r8a7794"

  - R-Car H3 (R8A77950)

    compatible = "renesas,r8a7795"

  - R-Car M3-W (R8A77960)

    compatible = "renesas,r8a7796"





Boards:
@@ -61,5 +63,7 @@ Boards: 
    compatible = "renesas,porter", "renesas,r8a7791"

  - Salvator-X (RTP0RC7795SIPB0010S)

    compatible = "renesas,salvator-x", "renesas,r8a7795";

  - Salvator-X

    compatible = "renesas,salvator-x", "renesas,r8a7796";

  - SILK (RTP0RC7794LCB00011S)

    compatible = "renesas,silk", "renesas,r8a7794"

Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt

+4 −3
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ They provide the following functionalities: 


Required Properties:

  - compatible: Must be one of:

      - "renesas,r8a7795-cpg-mssr" for the r8a7795 SoC

      - "renesas,r8a7795-cpg-mssr" for the r8a7795 SoC (R-Car H3)

      - "renesas,r8a7796-cpg-mssr" for the r8a7796 SoC (R-Car M3-W)



  - reg: Base address and length of the memory resource used by the CPG/MSSR

    block
@@ -21,8 +22,8 @@ Required Properties: 
  - clocks: References to external parent clocks, one entry for each entry in

    clock-names

  - clock-names: List of external parent clock names. Valid names are:

      - "extal" (r8a7795)

      - "extalr" (r8a7795)

      - "extal" (r8a7795, r8a7796)

      - "extalr" (r8a7795, r8a7796)



  - #clock-cells: Must be 2

      - For CPG core clocks, the two clock specifier cells must be "CPG_CORE"

Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required Properties: 
    - "renesas,r8a7779-mstp-clocks" for R8A7779 (R-Car H1) MSTP gate clocks

    - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks

    - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2-W) MSTP gate clocks

    - "renesas,r8a7792-mstp-clocks" for R8A7792 (R-Car V2H) MSTP gate clocks

    - "renesas,r8a7793-mstp-clocks" for R8A7793 (R-Car M2-N) MSTP gate clocks

    - "renesas,r8a7794-mstp-clocks" for R8A7794 (R-Car E2) MSTP gate clocks

    - "renesas,sh73a0-mstp-clocks" for SH73A0 (SH-MobileAG5) MSTP gate clocks

Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required Properties: 
  - compatible: Must be one of

    - "renesas,r8a7790-cpg-clocks" for the r8a7790 CPG

    - "renesas,r8a7791-cpg-clocks" for the r8a7791 CPG

    - "renesas,r8a7792-cpg-clocks" for the r8a7792 CPG

    - "renesas,r8a7793-cpg-clocks" for the r8a7793 CPG

    - "renesas,r8a7794-cpg-clocks" for the r8a7794 CPG

    and "renesas,rcar-gen2-cpg-clocks" as a fallback.

arch/arm64/Kconfig.platforms

+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,12 @@ config ARCH_R8A7795 
	help

	  This enables support for the Renesas R-Car H3 SoC.



config ARCH_R8A7796

	bool "Renesas R-Car M3-W SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car M3-W SoC.



config ARCH_STRATIX10

	bool "Altera's Stratix 10 SoCFPGA Family"

	help