Commit e8b81b1e authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-renesas-for-v5.8-tag1' of... 

Merge tag 'clk-renesas-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-renesas

Pull Renesas clk driver updates from Geert Uytterhoeven:

 - Add support for the USB 2.0 clock selector on R-Car M3-W+
 - Add support for the new RZ/G1H (R8A7742) SoC
 - Minor fixes and cleanups

* tag 'clk-renesas-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
  clk: renesas: rcar-gen2: Remove superfluous CLK_RENESAS_DIV6 selects
  clk: renesas: cpg-mssr: Add R8A7742 support
  dt-bindings: clock: renesas: cpg-mssr: Document r8a7742 binding
  clk: renesas: Add r8a7742 CPG Core Clock Definitions
  dt-bindings: power: rcar-sysc: Add r8a7742 power domain index macros
  MAINTAINERS: Add DT Bindings for Renesas Clock Generators
  clk: renesas: r9a06g032: Fix some typo in comments
  dt-bindings: clock: renesas: rcar-usb2-clock-sel: Add r8a77961 support
parents 8f3d9f35 e2f022c1

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
  compatible:

    enum:

      - renesas,r7s9210-cpg-mssr  # RZ/A2

      - renesas,r8a7742-cpg-mssr  # RZ/G1H

      - renesas,r8a7743-cpg-mssr  # RZ/G1M

      - renesas,r8a7744-cpg-mssr  # RZ/G1N

      - renesas,r8a7745-cpg-mssr  # RZ/G1E

Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.txt

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ Required properties: 
- compatible: "renesas,r8a7795-rcar-usb2-clock-sel" if the device is a part of

	      an R8A7795 SoC.

	      "renesas,r8a7796-rcar-usb2-clock-sel" if the device if a part of

	      an R8A7796 SoC.

	      an R8A77960 SoC.

	      "renesas,r8a77961-rcar-usb2-clock-sel" if the device if a part of

	      an R8A77961 SoC.

	      "renesas,rcar-gen3-usb2-clock-sel" for a generic R-Car Gen3

	      compatible device.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14334,6 +14334,7 @@ M: Geert Uytterhoeven <geert+renesas@glider.be> 
L:	linux-renesas-soc@vger.kernel.org

S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas

F:	Documentation/devicetree/bindings/clock/renesas,*

F:	drivers/clk/renesas/









RENESAS EMEV2 I2C DRIVER
































drivers/clk/renesas/Kconfig



+5
−3






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@ config CLK_RENESAS







	select CLK_R7S9210 if ARCH_R7S9210









	select CLK_R8A73A4 if ARCH_R8A73A4









	select CLK_R8A7740 if ARCH_R8A7740









	select CLK_R8A7742 if ARCH_R8A7742









	select CLK_R8A7743 if ARCH_R8A7743 || ARCH_R8A7744









	select CLK_R8A7745 if ARCH_R8A7745









	select CLK_R8A77470 if ARCH_R8A77470








@@ -55,6 +56,10 @@ config CLK_R8A7740







	select CLK_RENESAS_CPG_MSTP









	select CLK_RENESAS_DIV6



















config CLK_R8A7742









	bool "RZ/G1H clock support" if COMPILE_TEST









	select CLK_RCAR_GEN2_CPG



















config CLK_R8A7743









	bool "RZ/G1M clock support" if COMPILE_TEST









	select CLK_RCAR_GEN2_CPG








@@ -90,12 +95,10 @@ config CLK_R8A7779







config CLK_R8A7790









	bool "R-Car H2 clock support" if COMPILE_TEST









	select CLK_RCAR_GEN2_CPG









	select CLK_RENESAS_DIV6



















config CLK_R8A7791









	bool "R-Car M2-W/N clock support" if COMPILE_TEST









	select CLK_RCAR_GEN2_CPG









	select CLK_RENESAS_DIV6



















config CLK_R8A7792









	bool "R-Car V2H clock support" if COMPILE_TEST








@@ -104,7 +107,6 @@ config CLK_R8A7792







config CLK_R8A7794









	bool "R-Car E2 clock support" if COMPILE_TEST









	select CLK_RCAR_GEN2_CPG









	select CLK_RENESAS_DIV6



















config CLK_R8A7795









	bool "R-Car H3 clock support" if COMPILE_TEST
































drivers/clk/renesas/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -5,6 +5,7 @@ obj-$(CONFIG_CLK_RZA1)			+= clk-rz.o







obj-$(CONFIG_CLK_R7S9210)		+= r7s9210-cpg-mssr.o









obj-$(CONFIG_CLK_R8A73A4)		+= clk-r8a73a4.o









obj-$(CONFIG_CLK_R8A7740)		+= clk-r8a7740.o









obj-$(CONFIG_CLK_R8A7742)		+= r8a7742-cpg-mssr.o









obj-$(CONFIG_CLK_R8A7743)		+= r8a7743-cpg-mssr.o









obj-$(CONFIG_CLK_R8A7745)		+= r8a7745-cpg-mssr.o









obj-$(CONFIG_CLK_R8A77470)		+= r8a77470-cpg-mssr.o