usb: musb: dsps: fixes for -rc

Hi Balbi,

This series contains a couple of fixes for musb dsps wrapper.

First one restores capability to support at least one instance of musb. Without it, even a single instance can't be supported as change which is reverted by it was made along with multi phy changes and nop transciever dt support, both other changes didn't make it in during previous merge window.

Second one corrects binding document; changes were made in driver as per review comments, but documentation was not updated.

Please consider this series for inclusion in the next -rc cycle.

To support usb on beagle bone, further changes to handle control module registers for phy has to be made, they will be posted as a seperate series.

Regards
Afzal

Afzal Mohammed (2):
Revert "usb: musb: dsps: remove explicit NOP device creation"
usb: musb: dsps: document dt bindings properly

 Documentation/devicetree/bindings/usb/am33xx-usb.txt | 8 ++++----
 drivers/usb/musb/musb_dsps.c                         | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

1.7.12

This reverts commit d8c3ef256f88b7c6ecd673d03073b5645be9c5e4.

Above mentioned change was made along with multi usb phy change and adding DT support for nop transceiver. But other two changes did not make it to mainline. This in effect makes dsps musb wrapper unusable even for single instance.

Hence revert it so that at least single instance can be supported.

---
 drivers/usb/musb/musb_dsps.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 828d2a2..63128a3 100644
@@ -377,7 +377,8 @@ static int dsps_musb_init(struct musb *musb)
 	/* mentor core register starts at offset of 0x400 from musb base */
 	musb->mregs += wrp->musb_core_offset;
 
-	/* Get the NOP PHY */
+	/* NOP driver needs change if supporting dual instance */
+	usb_nop_xceiv_register();
 	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
 	if (IS_ERR_OR_NULL(musb->xceiv))
 		return -ENODEV;

1.7.12

DT bindings normally use '-' (hyphens) instead of '_' (underscore), driver has it the proper way, but binding documentation does not reflect it, fix it.

---
 Documentation/devicetree/bindings/usb/am33xx-usb.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

index ca8fa56..a922505 100644
@@ -3,12 +3,12 @@ AM33XX MUSB GLUE
  - ti,hwmods : must be "usb_otg_hs"
  - multipoint : Should be "1" indicating the musb controller supports
    multipoint. This is a MUSB configuration-specific setting.
- - num_eps : Specifies the number of endpoints. This is also a
+ - num-eps : Specifies the number of endpoints. This is also a
    MUSB configuration-specific setting. Should be set to "16"
- - ram_bits : Specifies the ram address size. Should be set to "12"
- - port0_mode : Should be "3" to represent OTG. "1" signifies HOST and "2"
+ - ram-bits : Specifies the ram address size. Should be set to "12"
+ - port0-mode : Should be "3" to represent OTG. "1" signifies HOST and "2"
    represents PERIPHERAL.
- - port1_mode : Should be "1" to represent HOST. "3" signifies OTG and "2"
+ - port1-mode : Should be "1" to represent HOST. "3" signifies OTG and "2"
    represents PERIPHERAL.
  - power : Should be "250". This signifies the controller can supply upto
    500mA when operating in host mode.

1.7.12

Hi Balbi,

Can you please consider this series for inclusion in -rc cycle, if you have any comments on this please let me know.

Regards
Afzal
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html