Commit 0d7ce5c5 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v5.10/prm-genpd' into omap-for-v5.10/ti-sysc-drop-pdata

parents 90aa4ed5 0fd1594b

Documentation/devicetree/bindings/arm/omap/prm-inst.txt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
		(base address and length)



Optional properties:

- #power-domain-cells:	Should be 0 if the instance is a power domain provider.

- #reset-cells:	Should be 1 if the PRM instance in question supports resets.



Example:
@@ -25,5 +26,6 @@ Example: 
prm_dsp2: prm@1b00 {

	compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";

	reg = <0x1b00 0x40>;

	#power-domain-cells = <0>;

	#reset-cells = <1>;

};

arch/arm/boot/dts/am33xx.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -578,6 +578,7 @@ target-module@56000000 { 
					<SYSC_IDLE_SMART>;

			clocks = <&gfx_l3_clkctrl AM3_GFX_L3_GFX_CLKCTRL 0>;

			clock-names = "fck";

			power-domains = <&prm_gfx>;

			resets = <&prm_gfx 0>;

			reset-names = "rstctrl";

			#address-cells = <1>;
@@ -617,6 +618,7 @@ prm_device: prm@f00 { 
	prm_gfx: prm@1100 {

		compatible = "ti,am3-prm-inst", "ti,omap-prm-inst";

		reg = <0x1100 0x100>;

		#power-domain-cells = <0>;

		#reset-cells = <1>;

	};

};

arch/arm/boot/dts/am4372.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ target-module@56000000 { 
					<SYSC_IDLE_SMART>;

			clocks = <&gfx_l3_clkctrl AM4_GFX_L3_GFX_CLKCTRL 0>;

			clock-names = "fck";

			power-domains = <&prm_gfx>;

			resets = <&prm_gfx 0>;

			reset-names = "rstctrl";

			#address-cells = <1>;
@@ -533,6 +534,7 @@ &prcm { 
	prm_gfx: prm@400 {

		compatible = "ti,am4-prm-inst", "ti,omap-prm-inst";

		reg = <0x400 0x100>;

		#power-domain-cells = <0>;

		#reset-cells = <1>;

	};

arch/arm/boot/dts/omap4-l4-abe.dtsi

+4 −2
Original line number Diff line number Diff line 
&l4_abe {						/* 0x40100000 */

	compatible = "ti,omap4-l4-abe", "simple-bus";

	compatible = "ti,omap4-l4-abe", "simple-pm-bus";

	reg = <0x40100000 0x400>,

	      <0x40100400 0x400>;

	reg-names = "la", "ap";

	power-domains = <&prm_abe>;

	/* OMAP4_L4_ABE_CLKCTRL is read-only */

	#address-cells = <1>;

	#size-cells = <1>;

	ranges = <0x00000000 0x40100000 0x100000>,	/* segment 0 */

		 <0x49000000 0x49000000 0x100000>;

	segment@0 {					/* 0x40100000 */

		compatible = "simple-bus";

		compatible = "simple-pm-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges =

arch/arm/boot/dts/omap4.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -658,6 +658,12 @@ prm_tesla: prm@400 { 
		#reset-cells = <1>;

	};



	prm_abe: prm@500 {

		compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";

		reg = <0x500 0x100>;

		#power-domain-cells = <0>;

	};



	prm_core: prm@700 {

		compatible = "ti,omap4-prm-inst", "ti,omap-prm-inst";

		reg = <0x700 0x100>;