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

Commit fb414e90 authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge branch 'irqchip/stacked-exynos' into irqchip/core

parents 07c523f1 d4ad0759

Documentation/devicetree/bindings/arm/samsung/pmu.txt

+17 −0
Original line number Diff line number Diff line
@@ -29,10 +29,27 @@ Properties: 
 - clocks : list of phandles and specifiers to all input clocks listed in

		clock-names property.



Optional properties:



Some PMUs are capable of behaving as an interrupt controller (mostly

to wake up a suspended PMU). In which case, they can have the

following properties:



- interrupt-controller: indicate that said PMU is an interrupt controller



- #interrupt-cells: must be identical to the that of the parent interrupt

  controller.



- interrupt-parent: a phandle indicating which interrupt controller

  this PMU signals interrupts to.



Example :

pmu_system_controller: system-controller@10040000 {

	compatible = "samsung,exynos5250-pmu", "syscon";

	reg = <0x10040000 0x5000>;

	interrupt-controller;

	#interrupt-cells = <3>;

	interrupt-parent = <&gic>;

	#clock-cells = <1>;

	clock-names = "clkout0", "clkout1", "clkout2", "clkout3",

			"clkout4", "clkout8", "clkout9";

arch/arm/boot/dts/exynos3250.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ 
		pmu_system_controller: system-controller@10020000 {

			compatible = "samsung,exynos3250-pmu", "syscon";

			reg = <0x10020000 0x4000>;

			interrupt-controller;

			#interrupt-cells = <3>;

			interrupt-parent = <&gic>;

		};



		mipi_phy: video-phy@10020710 {
@@ -184,6 +187,7 @@ 
			compatible = "samsung,exynos3250-rtc";

			reg = <0x10070000 0x100>;

			interrupts = <0 73 0>, <0 74 0>;

			interrupt-parent = <&pmu_system_controller>;

			status = "disabled";

		};

arch/arm/boot/dts/exynos4.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ 
	pmu_system_controller: system-controller@10020000 {

		compatible = "samsung,exynos4210-pmu", "syscon";

		reg = <0x10020000 0x4000>;

		interrupt-controller;

		#interrupt-cells = <3>;

		interrupt-parent = <&gic>;

	};



	dsi_0: dsi@11C80000 {
@@ -264,6 +267,7 @@ 
	rtc@10070000 {

		compatible = "samsung,s3c6410-rtc";

		reg = <0x10070000 0x100>;

		interrupt-parent = <&pmu_system_controller>;

		interrupts = <0 44 0>, <0 45 0>;

		clocks = <&clock CLK_RTC>;

		clock-names = "rtc";

arch/arm/boot/dts/exynos5250.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ 
		clock-names = "clkout16";

		clocks = <&clock CLK_FIN_PLL>;

		#clock-cells = <1>;

		interrupt-controller;

		#interrupt-cells = <3>;

		interrupt-parent = <&gic>;

	};



	sysreg_system_controller: syscon@10050000 {
@@ -232,6 +235,7 @@ 
	rtc: rtc@101E0000 {

		clocks = <&clock CLK_RTC>;

		clock-names = "rtc";

		interrupt-parent = <&pmu_system_controller>;

		status = "disabled";

	};

arch/arm/boot/dts/exynos5420.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ 
	rtc: rtc@101E0000 {

		clocks = <&clock CLK_RTC>;

		clock-names = "rtc";

		interrupt-parent = <&pmu_system_controller>;

		status = "disabled";

	};
@@ -769,6 +770,9 @@ 
		clock-names = "clkout16";

		clocks = <&clock CLK_FIN_PLL>;

		#clock-cells = <1>;

		interrupt-controller;

		#interrupt-cells = <3>;

		interrupt-parent = <&gic>;

	};



	sysreg_system_controller: syscon@10050000 {