Commit 02871d2d authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: dts: Update omap3 musb to probe with ti-sysc 



We can drop the legacy booting for the related musb driver if we update
the omap3 SoCs variants to boot using ti-sysc interconnect target module.

devicetree@vger.kernel.org
Cc: H. Nikolaus Schaller <hns@goldelico.com>
Tested-by: default avatarSicelo A. Mhlongo <absicsz@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 41c3b936

arch/arm/boot/dts/am3517.dtsi

+30 −8
Original line number Diff line number Diff line
@@ -49,14 +49,36 @@ opp100-600000000 { 
	};



	ocp@68000000 {

		am35x_otg_hs: am35x_otg_hs@5c040000 {

		target-module@5c040000 {

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

			reg = <0x5c040400 0x4>,

			      <0x5c040404 0x4>,

			      <0x5c040408 0x4>;

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

			ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |

					 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>;

			clocks = <&hsotgusb_ick_am35xx>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x5c040000 0x1000>;



			am35x_otg_hs: am35x_otg_hs@0 {

				compatible = "ti,omap3-musb";

			ti,hwmods = "am35x_otg_hs";

				status = "disabled";

			reg = <0x5c040000 0x1000>;

				reg = <0 0x1000>;

				interrupts = <71>;

				interrupt-names = "mc";

			};

		};



		davinci_emac: ethernet@5c000000 {

			compatible = "ti,am3517-emac";
@@ -154,7 +176,7 @@ &rng_target { 
};



/* Table Table 5-79 of the TRM shows 480ab000 is reserved */

&usb_otg_hs {

&usb_otg_target {

	status = "disabled";

};

arch/arm/boot/dts/omap3.dtsi

+31 −9
Original line number Diff line number Diff line
@@ -893,16 +893,38 @@ gpmc: gpmc@6e000000 { 
			#gpio-cells = <2>;

		};



		usb_otg_hs: usb_otg_hs@480ab000 {

		usb_otg_target: target-module@480ab000 {

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

			reg = <0x480ab400 0x4>,

			      <0x480ab404 0x4>,

			      <0x480ab408 0x4>;

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

			ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |

					 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>;

			/* Clock defined in the SoC specific dtsi file */

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x480ab000 0x1000>;



			usb_otg_hs: usb@0 {

				compatible = "ti,omap3-musb";

			reg = <0x480ab000 0x1000>;

				reg = <0 0x1000>;

				interrupts = <92>, <93>;

				interrupt-names = "mc", "dma";

			ti,hwmods = "usb_otg_hs";

				multipoint = <1>;

				num-eps = <16>;

				ram-bits = <12>;

			};

		};



		dss: dss@48050000 {

			compatible = "ti,omap3-dss";

arch/arm/boot/dts/omap34xx.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -189,6 +189,10 @@ &ssi { 
		      "ssi_ick";

};



&usb_otg_target {

	clocks = <&hsotgusb_ick_3430es2>;

};



/include/ "omap34xx-omap36xx-clocks.dtsi"

/include/ "omap36xx-omap3430es2plus-clocks.dtsi"

/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"

arch/arm/boot/dts/omap36xx.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -240,6 +240,10 @@ &ssi { 
		      "ssi_ick";

};



&usb_otg_target {

	clocks = <&hsotgusb_ick_3430es2>;

};



/include/ "omap34xx-omap36xx-clocks.dtsi"

/include/ "omap36xx-omap3430es2plus-clocks.dtsi"

/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"