4 files changed, 139 insertions, 14 deletions

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 444b4ede0d60..a8907b57c75c 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -120,6 +120,22 @@
                         status = "okay";
                 };
 
+                musb: usb@47400000 {
+                        status = "okay";
+
+                        control@44e10000 {
+                                status = "okay";
+                        };
+
+                        phy@47401300 {
+                                status = "okay";
+                        };
+
+                        usb@47401000 {
+                                status = "okay";
+                        };
+                };
+
                 i2c0: i2c@44e0b000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c0_pins>;
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 3aee1a43782d..b2987e03b19f 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -171,6 +171,30 @@
                         };
                 };
 
+                musb: usb@47400000 {
+                        status = "okay";
+
+                        control@44e10000 {
+                                status = "okay";
+                        };
+
+                        phy@47401300 {
+                                status = "okay";
+                        };
+
+                        phy@47401b00 {
+                                status = "okay";
+                        };
+
+                        usb@47401000 {
+                                status = "okay";
+                        };
+
+                        usb@47401800 {
+                                status = "okay";
+                        };
+                };
+
                 i2c1: i2c@4802a000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c1_pins>;
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 0c8ad173d2b0..e92446c6846e 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -207,6 +207,22 @@
                         };
                 };
 
+                musb: usb@47400000 {
+                        status = "okay";
+
+                        control@44e10000 {
+                                status = "okay";
+                        };
+
+                        phy@47401300 {
+                                status = "okay";
+                        };
+
+                        usb@47401000 {
+                                status = "okay";
+                        };
+                };
+
                 epwmss2: epwmss@48304000 {
                         status = "okay";
 
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 38b446ba1ce1..e1e773cd2556 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -26,6 +26,10 @@
                 serial5 = &uart5;
                 d_can0 = &dcan0;
                 d_can1 = &dcan1;
+                usb0 = &usb0;
+                usb1 = &usb1;
+                phy0 = &usb0_phy;
+                phy1 = &usb1_phy;
         };
 
         cpus {
@@ -333,21 +337,86 @@
                         status = "disabled";
                 };
 
-                usb@47400000 {
-                        compatible = "ti,musb-am33xx";
-                        reg = <0x47400000 0x1000        /* usbss */
-                               0x47401000 0x800         /* musb instance 0 */
-                               0x47401800 0x800>;       /* musb instance 1 */
-                        interrupts = <17                /* usbss */
-                                      18                /* musb instance 0 */
-                                      19>;              /* musb instance 1 */
-                        multipoint = <1>;
-                        num-eps = <16>;
-                        ram-bits = <12>;
-                        port0-mode = <3>;
-                        port1-mode = <3>;
-                        power = <250>;
+                usb: usb@47400000 {
+                        compatible = "ti,am33xx-usb";
+                        reg = <0x47400000 0x1000>;
+                        ranges;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         ti,hwmods = "usb_otg_hs";
+                        status = "disabled";
+
+                        ctrl_mod: control@44e10000 {
+                                compatible = "ti,am335x-usb-ctrl-module";
+                                reg = <0x44e10620 0x10
+                                        0x44e10648 0x4>;
+                                reg-names = "phy_ctrl", "wakeup";
+                                status = "disabled";
+                        };
+
+                        usb0_phy: phy@47401300 {
+                                compatible = "ti,am335x-usb-phy";
+                                reg = <0x47401300 0x100>;
+                                reg-names = "phy";
+                                status = "disabled";
+                                ti,ctrl_mod = <&ctrl_mod>;
+                        };
+
+                        usb0: usb@47401000 {
+                                compatible = "ti,musb-am33xx";
+                                ranges;
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0x47401000 0x200>;
+                                reg-names = "control";
+                                status = "disabled";
+
+                                musb0: usb@47401400 {
+                                        compatible = "mg,musbmhdrc";
+                                        reg = <0x47401400 0x400>;
+                                        reg-names = "mc";
+                                        interrupts = <18>;
+                                        interrupt-names = "mc";
+                                        multipoint = <1>;
+                                        num-eps = <16>;
+                                        ram-bits = <12>;
+                                        port-mode = <3>;
+                                        power = <250>;
+                                        phys = <&usb0_phy>;
+                                };
+                        };
+
+                        usb1_phy: phy@47401b00 {
+                                compatible = "ti,am335x-usb-phy";
+                                reg = <0x47401b00 0x100>;
+                                reg-names = "phy";
+                                status = "disabled";
+                                ti,ctrl_mod = <&ctrl_mod>;
+                        };
+
+                        usb1: usb@47401800 {
+                                compatible = "ti,musb-am33xx";
+                                ranges;
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0x47401800 0x200>;
+                                reg-names = "control";
+                                status = "disabled";
+
+                                musb1: usb@47401c00 {
+                                        compatible = "mg,musbmhdrc";
+                                        reg = <0x47401c00 0x400>;
+                                        reg-names = "mc";
+                                        interrupts = <19>;
+                                        interrupt-names = "mc";
+                                        multipoint = <1>;
+                                        num-eps = <16>;
+                                        ram-bits = <12>;
+                                        port-mode = <3>;
+                                        power = <250>;
+                                        phys = <&usb1_phy>;
+                                };
+                        };
                 };
 
                 epwmss0: epwmss@48300000 {