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

Commit 72b10ac0 authored by Tero Kristo's avatar Tero Kristo
Browse files

ARM: dts: omap24xx: add minimal l4 bus layout with control module support 



This patch creates an l4 / l4-wkup interconnects for omap2420 / omap2430
SoCs, and moves some of the generic peripherals under it. System control
module nodes are moved under this new interconnect also, and the SCM
clock layout is changed to use the new SCM node as the clock provider.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent e5b63574

Documentation/devicetree/bindings/arm/omap/l4.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
L4 interconnect bindings



These bindings describe the OMAP SoCs L4 interconnect bus.



Required properties:

- compatible : Should be "ti,omap2-l4" for OMAP2 family l4 core bus

	       Should be "ti,omap2-l4-wkup" for OMAP2 family l4 wkup bus

- ranges : contains the IO map range for the bus



Examples:



l4: l4@48000000 {

	compatible "ti,omap2-l4", "simple-bus";

	#address-cells = <1>;

	#size-cells = <1>;

	ranges = <0 0x48000000 0x100000>;

};

Documentation/devicetree/bindings/arm/omap/prcm.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Required properties: 
		"ti,am4-prcm"

		"ti,am4-scrm"

		"ti,omap2-prcm"

		"ti,omap2-scrm"

		"ti,omap2-scm"

		"ti,omap3-prm"

		"ti,omap3-cm"

		"ti,omap3-scrm"

arch/arm/boot/dts/omap2420.dtsi

+49 −31
Original line number Diff line number Diff line
@@ -14,9 +14,15 @@ 
	compatible = "ti,omap2420", "ti,omap2";



	ocp {

		prcm: prcm@48008000 {

		l4: l4@48000000 {

			compatible = "ti,omap2-l4", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x48000000 0x100000>;



			prcm: prcm@8000 {

				compatible = "ti,omap2-prcm";

			reg = <0x48008000 0x1000>;

				reg = <0x8000 0x1000>;



				prcm_clocks: clocks {

					#address-cells = <1>;
@@ -27,32 +33,44 @@ 
				};

			};



		scrm: scrm@48000000 {

			compatible = "ti,omap2-scrm";

			reg = <0x48000000 0x1000>;

			scm: scm@0 {

				compatible = "ti,omap2-scm", "simple-bus";

				reg = <0x0 0x1000>;

				#address-cells = <1>;

				#size-cells = <1>;

				ranges = <0 0x0 0x1000>;



				omap2420_pmx: pinmux@30 {

					compatible = "ti,omap2420-padconf",

						     "pinctrl-single";

					reg = <0x30 0x0113>;

					#address-cells = <1>;

					#size-cells = <0>;

					pinctrl-single,register-width = <8>;

					pinctrl-single,function-mask = <0x3f>;

				};



				scm_conf: scm_conf@270 {

					compatible = "syscon";

					reg = <0x270 0x100>;

					#address-cells = <1>;

					#size-cells = <1>;



			scrm_clocks: clocks {

					scm_clocks: clocks {

						#address-cells = <1>;

						#size-cells = <0>;

					};

				};



			scrm_clockdomains: clockdomains {

				scm_clockdomains: clockdomains {

				};

			};



		counter32k: counter@48004000 {

			counter32k: counter@4000 {

				compatible = "ti,omap-counter32k";

			reg = <0x48004000 0x20>;

				reg = <0x4000 0x20>;

				ti,hwmods = "counter_32k";

			};



		omap2420_pmx: pinmux@48000030 {

			compatible = "ti,omap2420-padconf", "pinctrl-single";

			reg = <0x48000030 0x0113>;

			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-single,register-width = <8>;

			pinctrl-single,function-mask = <0x3f>;

		};



		gpio1: gpio@48018000 {

arch/arm/boot/dts/omap2430-clocks.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 
 * published by the Free Software Foundation.

 */



&scrm_clocks {

&scm_clocks {

	mcbsp3_mux_fck: mcbsp3_mux_fck {

		#clock-cells = <0>;

		compatible = "ti,composite-mux-clock";

		clocks = <&func_96m_ck>, <&mcbsp_clks>;

		reg = <0x02e8>;

		reg = <0x78>;

	};



	mcbsp3_fck: mcbsp3_fck {
@@ -27,7 +27,7 @@ 
		compatible = "ti,composite-mux-clock";

		clocks = <&func_96m_ck>, <&mcbsp_clks>;

		ti,bit-shift = <2>;

		reg = <0x02e8>;

		reg = <0x78>;

	};



	mcbsp4_fck: mcbsp4_fck {
@@ -41,7 +41,7 @@ 
		compatible = "ti,composite-mux-clock";

		clocks = <&func_96m_ck>, <&mcbsp_clks>;

		ti,bit-shift = <4>;

		reg = <0x02e8>;

		reg = <0x78>;

	};



	mcbsp5_fck: mcbsp5_fck {

arch/arm/boot/dts/omap2430.dtsi

+60 −47
Original line number Diff line number Diff line
@@ -14,9 +14,15 @@ 
	compatible = "ti,omap2430", "ti,omap2";



	ocp {

		prcm: prcm@49006000 {

		l4_wkup: l4_wkup@49000000 {

			compatible = "ti,omap2-l4-wkup", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x49000000 0x31000>;



			prcm: prcm@6000 {

				compatible = "ti,omap2-prcm";

			reg = <0x49006000 0x1000>;

				reg = <0x6000 0x1000>;



				prcm_clocks: clocks {

					#address-cells = <1>;
@@ -27,49 +33,56 @@ 
				};

			};



		scrm: scrm@49002000 {

			compatible = "ti,omap2-scrm";

			reg = <0x49002000 0x1000>;



			scrm_clocks: clocks {

			scm: scm@2000 {

				compatible = "ti,omap2-scm", "simple-bus";

				reg = <0x2000 0x1000>;

				#address-cells = <1>;

				#size-cells = <0>;

			};



			scrm_clockdomains: clockdomains {

			};

		};



		counter32k: counter@49020000 {

			compatible = "ti,omap-counter32k";

			reg = <0x49020000 0x20>;

			ti,hwmods = "counter_32k";

		};

				#size-cells = <1>;

				ranges = <0 0x2000 0x1000>;



		omap2430_pmx: pinmux@49002030 {

			compatible = "ti,omap2430-padconf", "pinctrl-single";

			reg = <0x49002030 0x0154>;

				omap2430_pmx: pinmux@30 {

					compatible = "ti,omap2430-padconf",

						     "pinctrl-single";

					reg = <0x30 0x0154>;

					#address-cells = <1>;

					#size-cells = <0>;

					pinctrl-single,register-width = <8>;

					pinctrl-single,function-mask = <0x3f>;

				};



		omap2_scm_general: tisyscon@49002270 {

				scm_conf: scm_conf@270 {

					compatible = "syscon";

			reg = <0x49002270 0x240>;

					reg = <0x270 0x240>;

					#address-cells = <1>;

					#size-cells = <1>;



					scm_clocks: clocks {

						#address-cells = <1>;

						#size-cells = <0>;

					};



					pbias_regulator: pbias_regulator {

						compatible = "ti,pbias-omap";

						reg = <0x230 0x4>;

			syscon = <&omap2_scm_general>;

						syscon = <&scm_conf>;

						pbias_mmc_reg: pbias_mmc_omap2430 {

							regulator-name = "pbias_mmc_omap2430";

							regulator-min-microvolt = <1800000>;

							regulator-max-microvolt = <3000000>;

						};

					};

				};



				scm_clockdomains: clockdomains {

				};

			};



			counter32k: counter@20000 {

				compatible = "ti,omap-counter32k";

				reg = <0x20000 0x20>;

				ti,hwmods = "counter_32k";

			};

		};



		gpio1: gpio@4900c000 {

			compatible = "ti,omap2-gpio";