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: Sicelo A. Mhlongo <absicsz@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index cb316135bc7c96ff50aa09d91bbf421f8f23c9ff..823f63502e9fe3e7652dd5ce63ad4b3ff75e6378 100644 (file)
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -49,13 +49,35 @@
        };
 
        ocp@68000000 {
-               am35x_otg_hs: am35x_otg_hs@5c040000 {
-                       compatible = "ti,omap3-musb";
-                       ti,hwmods = "am35x_otg_hs";
-                       status = "disabled";
-                       reg = <0x5c040000 0x1000>;
-                       interrupts = <71>;
-                       interrupt-names = "mc";
+               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";
+                               status = "disabled";
+                               reg = <0 0x1000>;
+                               interrupts = <71>;
+                               interrupt-names = "mc";
+                       };
                };
 
                davinci_emac: ethernet@5c000000 {
@@ -154,7 +176,7 @@
 };
 
 /* Table Table 5-79 of the TRM shows 480ab000 is reserved */
-&usb_otg_hs {
+&usb_otg_target {
        status = "disabled";
 };
 

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 825075ff0e342b1f8e0eb8f35cb47a067588dfc7..92cd4c99dae7207ee24ca3e9d2365251923de059 100644 (file)
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -893,15 +893,37 @@
                        #gpio-cells = <2>;
                };
 
-               usb_otg_hs: usb_otg_hs@480ab000 {
-                       compatible = "ti,omap3-musb";
-                       reg = <0x480ab000 0x1000>;
-                       interrupts = <92>, <93>;
-                       interrupt-names = "mc", "dma";
-                       ti,hwmods = "usb_otg_hs";
-                       multipoint = <1>;
-                       num-eps = <16>;
-                       ram-bits = <12>;
+               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 = <0 0x1000>;
+                               interrupts = <92>, <93>;
+                               interrupt-names = "mc", "dma";
+                               multipoint = <1>;
+                               num-eps = <16>;
+                               ram-bits = <12>;
+                       };
                };
 
                dss: dss@48050000 {

diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
index 2eb73ae7ef3e7865fdafcc239e37848517834b19..9dbf62797f0f92fabd55a73855fa32fc135cfc42 100644 (file)
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -189,6 +189,10 @@
                      "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"

diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 32ac7924a13032e5bcf9f28dadc77d79d749bbb7..fff9c3d341938613a2e226be98a27a7c6db3cbf0 100644 (file)
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -240,6 +240,10 @@
                      "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"