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
Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
---
arch/arm/boot/dts/am335x-bone.dts | 2 +-
arch/arm/boot/dts/am335x-evm.dts | 6 +++---
arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
arch/arm/boot/dts/am33xx.dtsi | 26 +++++++++++++-------------
drivers/usb/musb/musb_dsps.c | 11 ++++++-----
5 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-bone.dts
b/arch/arm/boot/dts/am335x-bone.dts
index a8907b5..e8447a7 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 c26c16c..648a67e 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 e92446c..a6c5033 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 a38f8d3..c57c6b8 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";
@@ -377,11 +377,11 @@
reg-names = "mc";
interrupts = <18>;
interrupt-names = "mc";
- multipoint = <1>;
- num-eps = <16>;
- ram-bits = <12>;
- port-mode = <3>;
- power = <250>;
+ mg,multipoint = <1>;
+ mg,num-eps = <16>;
+ mg,ram-bits = <12>;
+ mg,port-mode = <3>;
+ mg,power = <500>;
phys = <&usb0_phy>;
dmas = <&cppi41dma 0 0 &cppi41dma 1 0
@@ -409,7 +409,7 @@
};
};
- usb1_phy: phy@47401b00 {
+ usb1_phy: usb-phy@47401b00 {
compatible = "ti,am335x-usb-phy";
reg = <0x47401b00 0x100>;
reg-names = "phy";
@@ -432,11 +432,11 @@
reg-names = "mc";
interrupts = <19>;
interrupt-names = "mc";
- multipoint = <1>;
- num-eps = <16>;
- ram-bits = <12>;
- port-mode = <3>;
- power = <250>;
+ mg,multipoint = <1>;
+ mg,num-eps = <16>;
+ mg,ram-bits = <12>;
+ mg,port-mode = <3>;
+ mg,power = <500>;
phys = <&usb1_phy>;
dmas = <&cppi41dma 15 0 &cppi41dma 16 0
@@ -464,7 +464,7 @@
};
};
- cppi41dma: dma@07402000 {
+ cppi41dma: dma-controller@07402000 {
compatible = "ti,am3359-cppi41";
reg = <0x47400000 0x1000
0x47402000 0x1000
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 4ffbaac..7368577 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -485,11 +485,12 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue,
pdata.config = config;
pdata.platform_ops = &dsps_ops;
- config->num_eps = get_int_prop(child_node, "num-eps");
- config->ram_bits = get_int_prop(child_node, "ram-bits");
- pdata.mode = get_int_prop(child_node, "port-mode");
- pdata.power = get_int_prop(child_node, "power");
- config->multipoint = of_property_read_bool(child_node, "multipoint");
+ config->num_eps = get_int_prop(child_node, "mg,num-eps");
+ config->ram_bits = get_int_prop(child_node, "mg,ram-bits");
+ pdata.mode = get_int_prop(child_node, "mg,port-mode");
+ /* DT keeps this entry in mA, musb expects it as per USB spec */
+ pdata.power = get_int_prop(child_node, "mg,power") / 2;
+ config->multipoint = of_property_read_bool(child_node, "mg,multipoint");
ret = platform_device_add_data(musb, &pdata, sizeof(pdata));
if (ret) {
--
1.8.4.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
