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

Commit daf9d2db authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-dt-for-v5.4-tag1' of... 

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

Renesas ARM DT updates for v5.4

  - Fix HSCIF PM Domain on R-Car H1,
  - PMU support for RZ/G1C.

* tag 'renesas-arm-dt-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: dts: r8a77470: Add PMU device node
  ARM: dts: r8a7779: Use SYSC "always-on" PM Domain for HSCIF

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1c92b326 57012813

arch/arm/boot/dts/r8a77470.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,13 @@ 
		clock-frequency = <0>;

	};



	pmu {

		compatible = "arm,cortex-a7-pmu";

		interrupts-extended = <&gic GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,

				      <&gic GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-affinity = <&cpu0>, <&cpu1>;

	};



	/* External SCIF clock */

	scif_clk: scif {

		compatible = "fixed-clock";

arch/arm/boot/dts/r8a7779.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ 
			 <&cpg_clocks R8A7779_CLK_S>,

			 <&scif_clk>;

		clock-names = "fck", "brg_int", "scif_clk";

		power-domains = <&cpg_clocks>;

		power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;

		status = "disabled";

	};
@@ -309,7 +309,7 @@ 
			 <&cpg_clocks R8A7779_CLK_S>,

			 <&scif_clk>;

		clock-names = "fck", "brg_int", "scif_clk";

		power-domains = <&cpg_clocks>;

		power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;

		status = "disabled";

	};