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

Commit 1cf257ab authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt-pm-domain-for-v4.7' of... 

Merge tag 'renesas-dt-pm-domain-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/late

Merge "Renesas ARM Based SoC DT PM Domain Updates for v4.7" into next/late

* Add SYSC PM Domains to DT for R-Car Gen 1 and 2 SoCs

This pull requests is based on a merge of:

* "[GIT PULL] Second Round of Renesas ARM Based SoC R-Car SYSC Updates for
  v4.7", tagged as renesas-rcar-sysc2-for-v4.7, which you have already
  pulled.
* "[GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7",
  tagged as renesas-dt-for-v4.7, which you have also already pulled.

The reason for the somewhat tedious base on
renesas-rcar-sysc2-for-v4.7, which provides driver changes,
is a hard run-time dependency.

I also have a similar set of changes for arm64 which I will send separately.

* tag 'renesas-dt-pm-domain-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (88 commits)
  ARM: dts: r8a7794: Use SYSC "always-on" PM Domain
  ARM: dts: r8a7793: Use SYSC "always-on" PM Domain
  ARM: dts: r8a7791: Use SYSC "always-on" PM Domain
  ARM: dts: r8a7790: Use SYSC "always-on" PM Domain
  ARM: dts: r8a7779: Use SYSC "always-on" PM Domain
  ARM: dts: r8a7794: Add SYSC PM Domains
  ARM: dts: r8a7793: Add SYSC PM Domains
  ARM: dts: r8a7791: Add SYSC PM Domains
  ARM: dts: r8a7790: Add SYSC PM Domains
  ARM: dts: r8a7779: Add SYSC PM Domains
  soc: renesas: rcar-sysc: Add support for R-Car H3 power areas
  soc: renesas: rcar-sysc: Add support for R-Car E2 power areas
  soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas
  soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas
  soc: renesas: rcar-sysc: Add support for R-Car H2 power areas
  soc: renesas: rcar-sysc: Add support for R-Car H1 power areas
  soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
  ARM: dts: gose: Enable SDHI controllers
  ARM: dts: r8a7793: Add SDHI controllers
  ARM: dts: r8a7790: fix max-frequency for SDHI
  ...
parents bf162006 25611e4e

Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt

0 → 100644
+48 −0
Original line number Diff line number Diff line 
DT bindings for the Renesas R-Car System Controller



== System Controller Node ==



The R-Car System Controller provides power management for the CPU cores and

various coprocessors.



Required properties:

  - compatible: Must contain exactly one of the following:

      - "renesas,r8a7779-sysc" (R-Car H1)

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

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

      - "renesas,r8a7792-sysc" (R-Car V2H)

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

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

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

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

  - #power-domain-cells: Must be 1.





Example:



	sysc: system-controller@e6180000 {

		compatible = "renesas,r8a7791-sysc";

		reg = <0 0xe6180000 0 0x0200>;

		#power-domain-cells = <1>;

	};





== PM Domain Consumers ==



Devices residing in a power area must refer to that power area, as documented

by the generic PM domain bindings in

Documentation/devicetree/bindings/power/power_domain.txt.



Required properties:

  - power-domains: A phandle and symbolic PM domain specifier, as defined in

		   <dt-bindings/power/r8a77*-sysc.h>.





Example:



	L2_CA15: cache-controller@0 {

		compatible = "cache";

		power-domains = <&sysc R8A7791_PD_CA15_SCU>;

		cache-unified;

		cache-level = <2>;

	};

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,8 @@ Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next

S:	Supported

F:	arch/arm64/boot/dts/renesas/

F:	drivers/soc/renesas/

F:	include/linux/soc/renesas/



ARM/RISCPC ARCHITECTURE

M:	Russell King <linux@arm.linux.org.uk>
@@ -1604,6 +1606,8 @@ F: arch/arm/configs/shmobile_defconfig 
F:	arch/arm/include/debug/renesas-scif.S

F:	arch/arm/mach-shmobile/

F:	drivers/sh/

F:	drivers/soc/renesas/

F:	include/linux/soc/renesas/



ARM/SOCFPGA ARCHITECTURE

M:	Dinh Nguyen <dinguyen@opensource.altera.com>

arch/arm/boot/dts/emev2-kzm9d.dts

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ 


&pfc {

	uart1_pins: serial@e1030000 {

		renesas,groups = "uart1_ctrl", "uart1_data";

		renesas,function = "uart1";

		groups = "uart1_ctrl", "uart1_data";

		function = "uart1";

	};

};

arch/arm/boot/dts/r7s72100.dtsi

+5 −10
Original line number Diff line number Diff line
@@ -37,46 +37,41 @@ 
		#size-cells = <1>;



		/* External clocks */

		extal_clk: extal_clk {

		extal_clk: extal {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			/* If clk present, value must be set by board */

			clock-frequency = <0>;

			clock-output-names = "extal";

		};



		usb_x1_clk: usb_x1_clk {

		usb_x1_clk: usb_x1 {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			/* If clk present, value must be set by board */

			clock-frequency = <0>;

			clock-output-names = "usb_x1";

		};



		/* Fixed factor clocks */

		b_clk: b_clk {

		b_clk: b {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			clocks = <&cpg_clocks R7S72100_CLK_PLL>;

			clock-mult = <1>;

			clock-div = <3>;

			clock-output-names = "b";

		};

		p1_clk: p1_clk {

		p1_clk: p1 {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			clocks = <&cpg_clocks R7S72100_CLK_PLL>;

			clock-mult = <1>;

			clock-div = <6>;

			clock-output-names = "p1";

		};

		p0_clk: p0_clk {

		p0_clk: p0 {

			#clock-cells = <0>;

			compatible = "fixed-factor-clock";

			clocks = <&cpg_clocks R7S72100_CLK_PLL>;

			clock-mult = <1>;

			clock-div = <12>;

			clock-output-names = "p0";

		};



		/* Special CPG clocks */

arch/arm/boot/dts/r8a73a4-ape6evm.dts

+10 −10
Original line number Diff line number Diff line
@@ -189,28 +189,28 @@ 


&pfc {

	scifa0_pins: serial0 {

		renesas,groups = "scifa0_data";

		renesas,function = "scifa0";

		groups = "scifa0_data";

		function = "scifa0";

	};



	mmc0_pins: mmc {

		renesas,groups = "mmc0_data8", "mmc0_ctrl";

		renesas,function = "mmc0";

		groups = "mmc0_data8", "mmc0_ctrl";

		function = "mmc0";

	};



	sdhi0_pins: sd0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";

		renesas,function = "sdhi0";

		groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";

		function = "sdhi0";

	};



	sdhi1_pins: sd1 {

		renesas,groups = "sdhi1_data4", "sdhi1_ctrl";

		renesas,function = "sdhi1";

		groups = "sdhi1_data4", "sdhi1_ctrl";

		function = "sdhi1";

	};



	keyboard_pins: keyboard {

		renesas,pins = "PORT324", "PORT325", "PORT326", "PORT327",

			       "PORT328", "PORT329";

		pins = "PORT324", "PORT325", "PORT326", "PORT327", "PORT328",

		       "PORT329";

		bias-pull-up;

	};

};