usb: usb: dsps: update code according to the binding document

This relfects the code and dts requires changes due to recent .dts
binding updates:
- use mg prefix for the Metor Graphics specific attributes
- use power in mA not in mA/2 as specifed in the USB2.0 specification
- remove the child node for USB. This is driver specific on won't be
  reflected in the device tree
- use the "mentor" prefix instead of "mg".
- use "dr_mode" istead of "mg,port-mode" for the port mode. The former
  is used by a few other drivers.

Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: devicetree@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

4 files changed, 31 insertions, 46 deletions

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index a8907b57c75c..e8447a79dc7e 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -127,7 +127,7 @@
                                 status = "okay";
                         };
 
-                        phy@47401300 {
+                        usb-phy@47401300 {
                                 status = "okay";
                         };
 
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index c26c16cace3c..648a67e74d1b 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -178,11 +178,11 @@
                                 status = "okay";
                         };
 
-                        phy@47401300 {
+                        usb-phy@47401300 {
                                 status = "okay";
                         };
 
-                        phy@47401b00 {
+                        usb-phy@47401b00 {
                                 status = "okay";
                         };
 
@@ -194,7 +194,7 @@
                                 status = "okay";
                         };
 
-                        dma@07402000  {
+                        dma-controller@07402000  {
                                 status = "okay";
                         };
                 };
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index e92446c6846e..a6c5033be442 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -214,7 +214,7 @@
                                 status = "okay";
                         };
 
-                        phy@47401300 {
+                        usb-phy@47401300 {
                                 status = "okay";
                         };
 
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index a38f8d362a86..f9c5da9c7fe1 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -354,7 +354,7 @@
                                 status = "disabled";
                         };
 
-                        usb0_phy: phy@47401300 {
+                        usb0_phy: usb-phy@47401300 {
                                 compatible = "ti,am335x-usb-phy";
                                 reg = <0x47401300 0x100>;
                                 reg-names = "phy";
@@ -364,25 +364,19 @@
 
                         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>;
+                                reg = <0x47401400 0x400
+                                        0x47401000 0x200>;
+                                reg-names = "mc", "control";
+
+                                interrupts = <18>;
+                                interrupt-names = "mc";
+                                dr_mode = "otg";
+                                mentor,multipoint = <1>;
+                                mentor,num-eps = <16>;
+                                mentor,ram-bits = <12>;
+                                mentor,power = <500>;
+                                phys = <&usb0_phy>;
 
                                 dmas = <&cppi41dma  0 0 &cppi41dma  1 0
                                         &cppi41dma  2 0 &cppi41dma  3 0
@@ -406,10 +400,9 @@
                                         "tx1", "tx2", "tx3", "tx4", "tx5", "tx6", "tx7",
                                         "tx8", "tx9", "tx10", "tx11", "tx12", "tx13",
                                         "tx14", "tx15";
-                                };
                         };
 
-                        usb1_phy: phy@47401b00 {
+                        usb1_phy: usb-phy@47401b00 {
                                 compatible = "ti,am335x-usb-phy";
                                 reg = <0x47401b00 0x100>;
                                 reg-names = "phy";
@@ -419,25 +412,18 @@
 
                         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>;
+                                reg = <0x47401c00 0x400
+                                        0x47401800 0x200>;
+                                reg-names = "mc", "control";
+                                interrupts = <19>;
+                                interrupt-names = "mc";
+                                dr_mode = "otg";
+                                mentor,multipoint = <1>;
+                                mentor,num-eps = <16>;
+                                mentor,ram-bits = <12>;
+                                mentor,power = <500>;
+                                phys = <&usb1_phy>;
 
                                 dmas = <&cppi41dma 15 0 &cppi41dma 16 0
                                         &cppi41dma 17 0 &cppi41dma 18 0
@@ -461,10 +447,9 @@
                                         "tx1", "tx2", "tx3", "tx4", "tx5", "tx6", "tx7",
                                         "tx8", "tx9", "tx10", "tx11", "tx12", "tx13",
                                         "tx14", "tx15";
-                                };
                         };
 
-                        cppi41dma: dma@07402000 {
+                        cppi41dma: dma-controller@07402000 {
                                 compatible = "ti,am3359-cppi41";
                                 reg =  <0x47400000 0x1000
                                         0x47402000 0x1000