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

Commit 54fd1b3b authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-renesas-for-v4.10-tag2' of... 

Merge tag 'clk-renesas-for-v4.10-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-next

Pull Renesas clk driver updates from Geerty Uytterhoeven:

  - Add R-Car RST driver for obtaining mode pin state, and move the
    related functionality from platform code to DT,
  - Add r8a7743 and r8a7745 CPG Core Clock Definitions.

The commits here are intermingled with arm-soc material because
of the hard dependency we're breaking between mach code and
driver code. We're replacing that with a driver dependency
between the soc driver and the clk driver.

* tag 'clk-renesas-for-v4.10-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: (25 commits)
  clk: renesas: Add r8a7745 CPG Core Clock Definitions
  clk: renesas: Add r8a7743 CPG Core Clock Definitions
  clk: renesas: rcar-gen2: Remove obsolete rcar_gen2_clocks_init()
  clk: renesas: r8a7779: Remove obsolete r8a7779_clocks_init()
  clk: renesas: r8a7778: Remove obsolete r8a7778_clocks_init()
  ARM: shmobile: rcar-gen2: Stop passing mode pins state to clock driver
  ARM: shmobile: r8a7779: Stop passing mode pins state to clock driver
  ARM: shmobile: r8a7778: Stop passing mode pins state to clock driver
  clk: renesas: rcar-gen3-cpg: Remove obsolete rcar_gen3_read_mode_pins()
  clk: renesas: r8a7796: Obtain mode pin values from R-Car RST driver
  clk: renesas: r8a7795: Obtain mode pin values from R-Car RST driver
  clk: renesas: rcar-gen2: Obtain mode pin values using RST driver
  clk: renesas: r8a7779: Obtain mode pin values from R-Car RST driver
  clk: renesas: r8a7778: Obtain mode pin values using R-Car RST driver
  arm64: renesas: r8a7796 dtsi: Add device node for RST module
  arm64: renesas: r8a7795 dtsi: Add device node for RST module
  ARM: dts: r8a7794: Add device node for RST module
  ARM: dts: r8a7793: Add device node for RST module
  ARM: dts: r8a7792: Add device node for RST module
  ARM: dts: r8a7791: Add device node for RST module
  ...
parents 30e1db86 1936be95

Documentation/devicetree/bindings/reset/renesas,rst.txt

0 → 100644
+37 −0
Original line number Diff line number Diff line 
DT bindings for the Renesas R-Car and RZ/G Reset Controllers



The R-Car and RZ/G Reset Controllers provide reset control, and implement the

following functions:

  - Latching of the levels on mode pins when PRESET# is negated,

  - Mode monitoring register,

  - Reset control of peripheral devices (on R-Car Gen1),

  - Watchdog timer (on R-Car Gen1),

  - Register-based reset control and boot address registers for the various CPU

    cores (on R-Car Gen2 and Gen3, and on RZ/G).





Required properties:

  - compatible: Should be

		  - "renesas,<soctype>-reset-wdt" for R-Car Gen1,

		  - "renesas,<soctype>-rst" for R-Car Gen2 and Gen3, and RZ/G

		Examples with soctypes are:

		  - "renesas,r8a7743-rst" (RZ/G1M)

		  - "renesas,r8a7745-rst" (RZ/G1E)

		  - "renesas,r8a7778-reset-wdt" (R-Car M1A)

		  - "renesas,r8a7779-reset-wdt" (R-Car H1)

		  - "renesas,r8a7790-rst" (R-Car H2)

		  - "renesas,r8a7791-rst" (R-Car M2-W)

		  - "renesas,r8a7792-rst" (R-Car V2H

		  - "renesas,r8a7793-rst" (R-Car M2-N)

		  - "renesas,r8a7794-rst" (R-Car E2)

		  - "renesas,r8a7795-rst" (R-Car H3)

		  - "renesas,r8a7796-rst" (R-Car M3-W)

  - reg: Address start and address range for the device.





Example:



	rst: reset-controller@e6160000 {

		compatible = "renesas,r8a7795-rst";

		reg = <0 0xe6160000 0 0x0200>;

	};

arch/arm/boot/dts/r8a7778.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -626,4 +626,9 @@ 
				"sru-src6", "sru-src7", "sru-src8";

		};

	};



	rst: reset-controller@ffcc0000 {

		compatible = "renesas,r8a7778-reset-wdt";

		reg = <0xffcc0000 0x40>;

	};

};

arch/arm/boot/dts/r8a7779.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -590,6 +590,11 @@ 
		};

	};



	rst: reset-controller@ffcc0000 {

		compatible = "renesas,r8a7779-reset-wdt";

		reg = <0xffcc0000 0x48>;

	};



	sysc: system-controller@ffd85000 {

		compatible = "renesas,r8a7779-sysc";

		reg = <0xffd85000 0x0200>;

arch/arm/boot/dts/r8a7790.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -1471,6 +1471,11 @@ 
		};

	};



	rst: reset-controller@e6160000 {

		compatible = "renesas,r8a7790-rst";

		reg = <0 0xe6160000 0 0x0100>;

	};



	sysc: system-controller@e6180000 {

		compatible = "renesas,r8a7790-sysc";

		reg = <0 0xe6180000 0 0x0200>;

arch/arm/boot/dts/r8a7791.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -1482,6 +1482,11 @@ 
		};

	};



	rst: reset-controller@e6160000 {

		compatible = "renesas,r8a7791-rst";

		reg = <0 0xe6160000 0 0x0100>;

	};



	sysc: system-controller@e6180000 {

		compatible = "renesas,r8a7791-sysc";

		reg = <0 0xe6180000 0 0x0200>;