[PATCH v2] Register NOP tranciever driver in JZ4740 musb glue layer

[PATCH v2] Register NOP tranciever driver in JZ4740 musb glue layer

[Apelete Seketeli]

Hello,

The name of the NOP transceiver driver was changed during v3.16
release cycle from usb_phy_gen_xceiv to usb_phy_generic.

The patch that comes as a follow up of this message registers the NOP
transceiver driver before calling usb_get_phy() to avoid issues
related to accessing its data structure while it was not registered.

Changes since v1: 
  - specify commit 4525bee summary line in parens in commit message.

For notice, I updated corresponding platform data to rename NOP
transceiver used for JZ4740 in a patch sent to linux-mips.

Changes were rebased on top of the linux-usb master branch, built and
tested successfully.

The following changes since commit 80235c4:

  Merge tag 'v3.16-rc2'

are available in the git repository at:

  git://git.seketeli.net/~apelete/linux-usb.git register-jz4740-phy

Apelete Seketeli (1):
  usb: musb: register nop transceiver driver for jz4740

 drivers/usb/musb/jz4740.c |    3 +++
 1 file changed, 3 insertions(+)

-- 
1.7.10.4

[PATCH v2] usb: musb: register nop transceiver driver for jz4740

[Apelete Seketeli]

Following the name change of the NOP transceiver driver in commit
4525bee (usb: phy: rename usb_nop_xceiv to usb_phy_generic), make sure
to register the transceiver driver before calling usb_get_phy() to
avoid issues related to accessing its data structure while it was not
registered.

Signed-off-by: Apelete Seketeli <apelete@seketeli.net>
---
 drivers/usb/musb/jz4740.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index 5f30537..d118729 100644
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/usb/usb_phy_generic.h>
 
 #include "musb_core.h"
 
@@ -80,6 +81,7 @@ static struct musb_hdrc_platform_data jz4740_musb_platform_data = {
 
 static int jz4740_musb_init(struct musb *musb)
 {
+	usb_phy_generic_register();
 	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
 	if (!musb->xceiv) {
 		pr_err("HS UDC: no transceiver configured\n");
@@ -182,6 +184,7 @@ static int jz4740_remove(struct platform_device *pdev)
 	struct jz4740_glue	*glue = platform_get_drvdata(pdev);
 
 	platform_device_unregister(glue->musb);
+	usb_phy_generic_unregister(pdev);
 	clk_disable_unprepare(glue->clk);
 
 	return 0;
-- 
1.7.10.4