Commit bfab07ee authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: dts: Configure interconnect target module for omap3 sdma 



We can now probe devices with device tree only configuration using
ti-sysc interconnect target module driver. Let's configure the
module, but keep the legacy "ti,hwmods" peroperty to avoid new boot
time warnings. The legacy property will be removed in later patches
together with the legacy platform data.

Note that we want to use separate compatible for omap34xx and
omap36xx so let's do that here too while at it.

Cc: devicetree@vger.kernel.org
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Vinod Koul <vkoul@kernel.org>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent eb6b38b2

arch/arm/boot/dts/omap3-n900.dts

+5 −0
Original line number Diff line number Diff line
@@ -482,6 +482,11 @@ 
	regulator-always-on;

};



/* First two dma channels are reserved on secure omap3 */

&sdma {

	dma-channel-mask = <0xfffffffc>;

};



&twl {

	twl_audio: audio {

		compatible = "ti,twl4030-audio";

arch/arm/boot/dts/omap3.dtsi

+35 −10
Original line number Diff line number Diff line
@@ -206,9 +206,34 @@ 
			reg = <0x48200000 0x1000>;

		};



		sdma: dma-controller@48056000 {

			compatible = "ti,omap3630-sdma", "ti,omap3430-sdma";

			reg = <0x48056000 0x1000>;

		target-module@48056000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "dma";

			reg = <0x48056000 0x4>,

			      <0x4805602c 0x4>,

			      <0x48056028 0x4>;

			reg-names = "rev", "sysc", "syss";

			ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |

					 SYSC_OMAP2_EMUFREE |

					 SYSC_OMAP2_SOFTRESET |

					 SYSC_OMAP2_AUTOIDLE)>;

			ti,sysc-midle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>;

			ti,syss-mask = <1>;

			/* Domains (V, P, C): core, core_pwrdm, core_l3_clkdm */

			clocks = <&core_l3_ick>;

			clock-names = "ick";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0x48056000 0x1000>;



			sdma: dma-controller@0 {

				compatible = "ti,omap3430-sdma", "ti,omap-sdma";

				reg = <0x0 0x1000>;

				interrupts = <12>,

					     <13>,

					     <14>,
@@ -216,7 +241,7 @@ 
				#dma-cells = <1>;

				dma-channels = <32>;

				dma-requests = <96>;

			ti,hwmods = "dma";

			};

		};



		gpio1: gpio@48310000 {

arch/arm/boot/dts/omap36xx.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -223,6 +223,10 @@ 
	};

};



&sdma {

	compatible = "ti,omap3630-sdma", "ti,omap-sdma";

};



/* OMAP3630 needs dss_96m_fck for VENC */

&venc {

	clocks = <&dss_tv_fck>, <&dss_96m_fck>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE