ソースを参照

usb: isp1760: Move PORT1 configuration to core code

Configuring the mode of operation of port 1 doesn't belong to the HCD
code, as it's related to the soon to come UDC support. Move the
configuration to core code.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Laurent Pinchart 10 年 前
コミット
9a66e13290
2 ファイル変更8 行追加9 行削除
  1. 8 0
      drivers/usb/host/isp1760-core.c
  2. 0 9
      drivers/usb/host/isp1760-hcd.c

+ 8 - 0
drivers/usb/host/isp1760-core.c

@@ -67,6 +67,14 @@ static void isp1760_init_core(struct isp1760_device *isp)
 	isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
 	isp1760_write32(isp->regs, HC_HW_MODE_CTRL, hwmode);
 
+	/*
+	 * PORT 1 Control register of the ISP1760 is the OTG control register on
+	 * ISP1761. Since there is no OTG or device controller support in this
+	 * driver, we use port 1 as a "normal" USB host port on both chips.
+	 */
+	isp1760_write32(isp->regs, HC_PORT1_CTRL, PORT1_POWER | PORT1_INIT2);
+	usleep_range(10000, 11000);
+
 	dev_info(isp->dev, "bus width: %u, oc: %s\n",
 		 isp->devflags & ISP1760_FLAG_BUS_WIDTH_16 ? 16 : 32,
 		 isp->devflags & ISP1760_FLAG_ANALOG_OC ? "analog" : "digital");

+ 0 - 9
drivers/usb/host/isp1760-hcd.c

@@ -503,15 +503,6 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
 
 	reg_write32(hcd->regs, HC_INTERRUPT_ENABLE, INTERRUPT_ENABLE_MASK);
 
-	/*
-	 * PORT 1 Control register of the ISP1760 is the OTG control
-	 * register on ISP1761. Since there is no OTG or device controller
-	 * support in this driver, we use port 1 as a "normal" USB host port on
-	 * both chips.
-	 */
-	reg_write32(hcd->regs, HC_PORT1_CTRL, PORT1_POWER | PORT1_INIT2);
-	mdelay(10);
-
 	priv->hcs_params = reg_read32(hcd->regs, HC_HCSPARAMS);
 
 	return priv_init(hcd);