[PATCH v3] chipidea: ci_hdrc_imx: Allow handling the clock for an external USB hub

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



When using an external USB hub, it is common that they require a clock input.

Add a 'clk_usb' clock, so that it can be retrieved from the device tree and 
enabled in the driver, so that the clock can properly drive the external 
USB hub.

Tested on a imx6q-udoo board, that connects via USBH1 to a USB2514 hub.

In this board the USB2514 is clocked from a 24MHz clock that comes from the 
imx6q CLKO2 pin.

Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
---
Changes since v2:
- Do not use the term 'phy'. It is really a USB hub clock that this patch
aims to control
Changes since v1:
- Fix the clock error handling (Russell King)

 Documentation/devicetree/bindings/usb/ci13xxx-imx.txt |  2 ++
 drivers/usb/chipidea/ci_hdrc_imx.c                    | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
index b4b5b79..2089374 100644
--- a/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
+++ b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
@@ -18,6 +18,8 @@ Optional properties:
 - vbus-supply: regulator for vbus
 - disable-over-current: disable over current detect
 - external-vbus-divider: enables off-chip resistor divider for Vbus
+- clocks: phandle to the clock that drives the USB hub
+- clock-names: must be "hub"
 
 Examples:
 usb@02184000 { /* USB OTG */
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index bb5d976..ae39b98 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -27,6 +27,7 @@ struct ci_hdrc_imx_data {
 	struct usb_phy *phy;
 	struct platform_device *ci_pdev;
 	struct clk *clk;
+	struct clk *clk_hub;
 	struct imx_usbmisc_data *usbmisc_data;
 };
 
@@ -148,6 +149,16 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 		}
 	}
 
+	data->clk_hub = devm_clk_get(&pdev->dev, "hub");
+	if (!IS_ERR(data->clk_hub)) {
+		ret = clk_prepare_enable(data->clk_hub);
+		if (ret) {
+			dev_err(&pdev->dev,
+				"Failed to enable clk_hub: %d\n", ret);
+			goto disable_device;
+		}
+	}
+
 	platform_set_drvdata(pdev, data);
 
 	pm_runtime_no_callbacks(&pdev->dev);
@@ -167,6 +178,8 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev)
 	struct ci_hdrc_imx_data *data = platform_get_drvdata(pdev);
 
 	pm_runtime_disable(&pdev->dev);
+	if (!IS_ERR(data->clk_hub))
+		clk_disable_unprepare(data->clk_hub);
 	ci_hdrc_remove_device(data->ci_pdev);
 	clk_disable_unprepare(data->clk);
 
-- 
1.8.1.2


--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux