* [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14)
@ 2014-01-20 14:11 Roger Quadros
2014-01-20 14:11 ` [PATCH v6 01/10] mfd: omap-usb-host: Use resource managed clk_get() Roger Quadros
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros
Hi Benoit & Tony,
This patchset brings up USB Host ports and Ethernet port on
the OMAP5 uEVM board.
It depends on the TI Clock DT conversion patches [1] and is based
on 3.13
[1] - http://article.gmane.org/gmane.linux.ports.arm.kernel/293147
Tested on:
- OMAP5 uEVM
- Pandaboard ES Rev. B1
- Beagleboard-XM Rev C2
- Beagleboard Rev C4.
cheers,
-roger
Changelog:
v6:
- Initialized clocks to -ENODEV and split patch 3.
v5:
- Expose all clocks in the DT binding document for mfd:omap-usb-host
and mfd:omap-usb-tll
v4:
- Updated DT binding document for clock binding
v3:
- Rebased on top of 3.13-rc7
cheers,
-roger
Roger Quadros (10):
mfd: omap-usb-host: Use resource managed clk_get()
mfd: omap-usb-host: Get clocks based on hardware revision
mfd: omap-usb-host: Use clock names as per function for reference
clocks
mfd: omap-usb-host: Update DT clock binding information
mfd: omap-usb-tll: Update DT clock binding information
ARM: dts: omap4: Update omap-usb-host node
ARM: dts: omap5: Update omap-usb-host node
ARM: dts: omap4-panda: Provide USB PHY clock
ARM: dts: omap5-uevm: Provide USB PHY clock
ARM: OMAP2+: Remove legacy_init_ehci_clk()
.../devicetree/bindings/mfd/omap-usb-host.txt | 23 +++
.../devicetree/bindings/mfd/omap-usb-tll.txt | 10 ++
arch/arm/boot/dts/omap4-panda-common.dtsi | 8 +-
arch/arm/boot/dts/omap4.dtsi | 6 +
arch/arm/boot/dts/omap5-uevm.dts | 8 +-
arch/arm/boot/dts/omap5.dtsi | 6 +
arch/arm/mach-omap2/pdata-quirks.c | 16 --
drivers/mfd/omap-usb-host.c | 171 ++++++++++-----------
8 files changed, 128 insertions(+), 120 deletions(-)
--
1.8.3.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v6 01/10] mfd: omap-usb-host: Use resource managed clk_get()
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 02/10] mfd: omap-usb-host: Get clocks based on hardware revision Roger Quadros
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros, Samuel Ortiz
Use devm_clk_get() instead of clk_get().
CC: Lee Jones <lee.jones@linaro.org>
CC: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/omap-usb-host.c | 81 +++++++++------------------------------------
1 file changed, 16 insertions(+), 65 deletions(-)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 142650f..1c9bca2 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -674,46 +674,46 @@ static int usbhs_omap_probe(struct platform_device *pdev)
omap->ehci_logic_fck = ERR_PTR(-EINVAL);
if (need_logic_fck) {
- omap->ehci_logic_fck = clk_get(dev, "ehci_logic_fck");
+ omap->ehci_logic_fck = devm_clk_get(dev, "ehci_logic_fck");
if (IS_ERR(omap->ehci_logic_fck)) {
ret = PTR_ERR(omap->ehci_logic_fck);
dev_dbg(dev, "ehci_logic_fck failed:%d\n", ret);
}
}
- omap->utmi_p1_gfclk = clk_get(dev, "utmi_p1_gfclk");
+ omap->utmi_p1_gfclk = devm_clk_get(dev, "utmi_p1_gfclk");
if (IS_ERR(omap->utmi_p1_gfclk)) {
ret = PTR_ERR(omap->utmi_p1_gfclk);
dev_err(dev, "utmi_p1_gfclk failed error:%d\n", ret);
- goto err_p1_gfclk;
+ goto err_mem;
}
- omap->utmi_p2_gfclk = clk_get(dev, "utmi_p2_gfclk");
+ omap->utmi_p2_gfclk = devm_clk_get(dev, "utmi_p2_gfclk");
if (IS_ERR(omap->utmi_p2_gfclk)) {
ret = PTR_ERR(omap->utmi_p2_gfclk);
dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);
- goto err_p2_gfclk;
+ goto err_mem;
}
- omap->xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
+ omap->xclk60mhsp1_ck = devm_clk_get(dev, "xclk60mhsp1_ck");
if (IS_ERR(omap->xclk60mhsp1_ck)) {
ret = PTR_ERR(omap->xclk60mhsp1_ck);
dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
- goto err_xclk60mhsp1;
+ goto err_mem;
}
- omap->xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");
+ omap->xclk60mhsp2_ck = devm_clk_get(dev, "xclk60mhsp2_ck");
if (IS_ERR(omap->xclk60mhsp2_ck)) {
ret = PTR_ERR(omap->xclk60mhsp2_ck);
dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
- goto err_xclk60mhsp2;
+ goto err_mem;
}
- omap->init_60m_fclk = clk_get(dev, "init_60m_fclk");
+ omap->init_60m_fclk = devm_clk_get(dev, "init_60m_fclk");
if (IS_ERR(omap->init_60m_fclk)) {
ret = PTR_ERR(omap->init_60m_fclk);
dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
- goto err_init60m;
+ goto err_mem;
}
for (i = 0; i < omap->nports; i++) {
@@ -727,21 +727,21 @@ static int usbhs_omap_probe(struct platform_device *pdev)
* platforms have all clocks and we can function without
* them
*/
- omap->utmi_clk[i] = clk_get(dev, clkname);
+ omap->utmi_clk[i] = devm_clk_get(dev, clkname);
if (IS_ERR(omap->utmi_clk[i]))
dev_dbg(dev, "Failed to get clock : %s : %ld\n",
clkname, PTR_ERR(omap->utmi_clk[i]));
snprintf(clkname, sizeof(clkname),
"usb_host_hs_hsic480m_p%d_clk", i + 1);
- omap->hsic480m_clk[i] = clk_get(dev, clkname);
+ omap->hsic480m_clk[i] = devm_clk_get(dev, clkname);
if (IS_ERR(omap->hsic480m_clk[i]))
dev_dbg(dev, "Failed to get clock : %s : %ld\n",
clkname, PTR_ERR(omap->hsic480m_clk[i]));
snprintf(clkname, sizeof(clkname),
"usb_host_hs_hsic60m_p%d_clk", i + 1);
- omap->hsic60m_clk[i] = clk_get(dev, clkname);
+ omap->hsic60m_clk[i] = devm_clk_get(dev, clkname);
if (IS_ERR(omap->hsic60m_clk[i]))
dev_dbg(dev, "Failed to get clock : %s : %ld\n",
clkname, PTR_ERR(omap->hsic60m_clk[i]));
@@ -784,7 +784,7 @@ static int usbhs_omap_probe(struct platform_device *pdev)
if (ret) {
dev_err(dev, "Failed to create DT children: %d\n", ret);
- goto err_alloc;
+ goto err_mem;
}
} else {
@@ -792,40 +792,12 @@ static int usbhs_omap_probe(struct platform_device *pdev)
if (ret) {
dev_err(dev, "omap_usbhs_alloc_children failed: %d\n",
ret);
- goto err_alloc;
+ goto err_mem;
}
}
return 0;
-err_alloc:
- for (i = 0; i < omap->nports; i++) {
- if (!IS_ERR(omap->utmi_clk[i]))
- clk_put(omap->utmi_clk[i]);
- if (!IS_ERR(omap->hsic60m_clk[i]))
- clk_put(omap->hsic60m_clk[i]);
- if (!IS_ERR(omap->hsic480m_clk[i]))
- clk_put(omap->hsic480m_clk[i]);
- }
-
- clk_put(omap->init_60m_fclk);
-
-err_init60m:
- clk_put(omap->xclk60mhsp2_ck);
-
-err_xclk60mhsp2:
- clk_put(omap->xclk60mhsp1_ck);
-
-err_xclk60mhsp1:
- clk_put(omap->utmi_p2_gfclk);
-
-err_p2_gfclk:
- clk_put(omap->utmi_p1_gfclk);
-
-err_p1_gfclk:
- if (!IS_ERR(omap->ehci_logic_fck))
- clk_put(omap->ehci_logic_fck);
-
err_mem:
pm_runtime_disable(dev);
@@ -847,27 +819,6 @@ static int usbhs_omap_remove_child(struct device *dev, void *data)
*/
static int usbhs_omap_remove(struct platform_device *pdev)
{
- struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);
- int i;
-
- for (i = 0; i < omap->nports; i++) {
- if (!IS_ERR(omap->utmi_clk[i]))
- clk_put(omap->utmi_clk[i]);
- if (!IS_ERR(omap->hsic60m_clk[i]))
- clk_put(omap->hsic60m_clk[i]);
- if (!IS_ERR(omap->hsic480m_clk[i]))
- clk_put(omap->hsic480m_clk[i]);
- }
-
- clk_put(omap->init_60m_fclk);
- clk_put(omap->utmi_p1_gfclk);
- clk_put(omap->utmi_p2_gfclk);
- clk_put(omap->xclk60mhsp2_ck);
- clk_put(omap->xclk60mhsp1_ck);
-
- if (!IS_ERR(omap->ehci_logic_fck))
- clk_put(omap->ehci_logic_fck);
-
pm_runtime_disable(&pdev->dev);
/* remove children */
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 02/10] mfd: omap-usb-host: Get clocks based on hardware revision
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
2014-01-20 14:11 ` [PATCH v6 01/10] mfd: omap-usb-host: Use resource managed clk_get() Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 03/10] mfd: omap-usb-host: Use clock names as per function for reference clocks Roger Quadros
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros, Samuel Ortiz
Not all revisions have all the clocks so get the necessary clocks
based on hardware revision.
This should avoid un-necessary clk_get failure messages that were
observed earlier.
Be more strict and always fail on clk_get() error.
CC: Lee Jones <lee.jones@linaro.org>
CC: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/mfd/omap-usb-host.c | 92 +++++++++++++++++++++++++++++++--------------
1 file changed, 64 insertions(+), 28 deletions(-)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 1c9bca2..eaafd2e 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -665,22 +665,41 @@ static int usbhs_omap_probe(struct platform_device *pdev)
goto err_mem;
}
- need_logic_fck = false;
+ /* Set all clocks as invalid to begin with */
+ omap->ehci_logic_fck = omap->init_60m_fclk = ERR_PTR(-ENODEV);
+ omap->utmi_p1_gfclk = omap->utmi_p2_gfclk = ERR_PTR(-ENODEV);
+ omap->xclk60mhsp1_ck = omap->xclk60mhsp2_ck = ERR_PTR(-ENODEV);
+
for (i = 0; i < omap->nports; i++) {
- if (is_ehci_phy_mode(i) || is_ehci_tll_mode(i) ||
- is_ehci_hsic_mode(i))
- need_logic_fck |= true;
+ omap->utmi_clk[i] = ERR_PTR(-ENODEV);
+ omap->hsic480m_clk[i] = ERR_PTR(-ENODEV);
+ omap->hsic60m_clk[i] = ERR_PTR(-ENODEV);
}
- omap->ehci_logic_fck = ERR_PTR(-EINVAL);
- if (need_logic_fck) {
- omap->ehci_logic_fck = devm_clk_get(dev, "ehci_logic_fck");
- if (IS_ERR(omap->ehci_logic_fck)) {
- ret = PTR_ERR(omap->ehci_logic_fck);
- dev_dbg(dev, "ehci_logic_fck failed:%d\n", ret);
+ /* for OMAP3 i.e. USBHS REV1 */
+ if (omap->usbhs_rev == OMAP_USBHS_REV1) {
+ need_logic_fck = false;
+ for (i = 0; i < omap->nports; i++) {
+ if (is_ehci_phy_mode(pdata->port_mode[i]) ||
+ is_ehci_tll_mode(pdata->port_mode[i]) ||
+ is_ehci_hsic_mode(pdata->port_mode[i]))
+
+ need_logic_fck |= true;
+ }
+
+ if (need_logic_fck) {
+ omap->ehci_logic_fck = clk_get(dev, "usbhost_120m_fck");
+ if (IS_ERR(omap->ehci_logic_fck)) {
+ ret = PTR_ERR(omap->ehci_logic_fck);
+ dev_err(dev, "usbhost_120m_fck failed:%d\n",
+ ret);
+ goto err_mem;
+ }
}
+ goto initialize;
}
+ /* for OMAP4+ i.e. USBHS REV2+ */
omap->utmi_p1_gfclk = devm_clk_get(dev, "utmi_p1_gfclk");
if (IS_ERR(omap->utmi_p1_gfclk)) {
ret = PTR_ERR(omap->utmi_p1_gfclk);
@@ -728,54 +747,71 @@ static int usbhs_omap_probe(struct platform_device *pdev)
* them
*/
omap->utmi_clk[i] = devm_clk_get(dev, clkname);
- if (IS_ERR(omap->utmi_clk[i]))
- dev_dbg(dev, "Failed to get clock : %s : %ld\n",
- clkname, PTR_ERR(omap->utmi_clk[i]));
+ if (IS_ERR(omap->utmi_clk[i])) {
+ ret = PTR_ERR(omap->utmi_clk[i]);
+ dev_err(dev, "Failed to get clock : %s : %d\n",
+ clkname, ret);
+ goto err_mem;
+ }
snprintf(clkname, sizeof(clkname),
"usb_host_hs_hsic480m_p%d_clk", i + 1);
omap->hsic480m_clk[i] = devm_clk_get(dev, clkname);
- if (IS_ERR(omap->hsic480m_clk[i]))
- dev_dbg(dev, "Failed to get clock : %s : %ld\n",
- clkname, PTR_ERR(omap->hsic480m_clk[i]));
+ if (IS_ERR(omap->hsic480m_clk[i])) {
+ ret = PTR_ERR(omap->hsic480m_clk[i]);
+ dev_err(dev, "Failed to get clock : %s : %d\n",
+ clkname, ret);
+ goto err_mem;
+ }
snprintf(clkname, sizeof(clkname),
"usb_host_hs_hsic60m_p%d_clk", i + 1);
omap->hsic60m_clk[i] = devm_clk_get(dev, clkname);
- if (IS_ERR(omap->hsic60m_clk[i]))
- dev_dbg(dev, "Failed to get clock : %s : %ld\n",
- clkname, PTR_ERR(omap->hsic60m_clk[i]));
+ if (IS_ERR(omap->hsic60m_clk[i])) {
+ ret = PTR_ERR(omap->hsic60m_clk[i]);
+ dev_err(dev, "Failed to get clock : %s : %d\n",
+ clkname, ret);
+ goto err_mem;
+ }
}
if (is_ehci_phy_mode(pdata->port_mode[0])) {
- /* for OMAP3, clk_set_parent fails */
ret = clk_set_parent(omap->utmi_p1_gfclk,
omap->xclk60mhsp1_ck);
- if (ret != 0)
- dev_dbg(dev, "xclk60mhsp1_ck set parent failed: %d\n",
+ if (ret != 0) {
+ dev_err(dev, "xclk60mhsp1_ck set parent failed: %d\n",
ret);
+ goto err_mem;
+ }
} else if (is_ehci_tll_mode(pdata->port_mode[0])) {
ret = clk_set_parent(omap->utmi_p1_gfclk,
omap->init_60m_fclk);
- if (ret != 0)
- dev_dbg(dev, "P0 init_60m_fclk set parent failed: %d\n",
+ if (ret != 0) {
+ dev_err(dev, "P0 init_60m_fclk set parent failed: %d\n",
ret);
+ goto err_mem;
+ }
}
if (is_ehci_phy_mode(pdata->port_mode[1])) {
ret = clk_set_parent(omap->utmi_p2_gfclk,
omap->xclk60mhsp2_ck);
- if (ret != 0)
- dev_dbg(dev, "xclk60mhsp2_ck set parent failed: %d\n",
+ if (ret != 0) {
+ dev_err(dev, "xclk60mhsp2_ck set parent failed: %d\n",
ret);
+ goto err_mem;
+ }
} else if (is_ehci_tll_mode(pdata->port_mode[1])) {
ret = clk_set_parent(omap->utmi_p2_gfclk,
omap->init_60m_fclk);
- if (ret != 0)
- dev_dbg(dev, "P1 init_60m_fclk set parent failed: %d\n",
+ if (ret != 0) {
+ dev_err(dev, "P1 init_60m_fclk set parent failed: %d\n",
ret);
+ goto err_mem;
+ }
}
+initialize:
omap_usbhs_init(dev);
if (dev->of_node) {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 03/10] mfd: omap-usb-host: Use clock names as per function for reference clocks
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
2014-01-20 14:11 ` [PATCH v6 01/10] mfd: omap-usb-host: Use resource managed clk_get() Roger Quadros
2014-01-20 14:11 ` [PATCH v6 02/10] mfd: omap-usb-host: Get clocks based on hardware revision Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 04/10] mfd: omap-usb-host: Update DT clock binding information Roger Quadros
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros, Samuel Ortiz
Use a meaningful name for the reference clocks so that it indicates the function.
CC: Lee Jones <lee.jones@linaro.org>
CC: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/mfd/omap-usb-host.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index eaafd2e..d6fab3e 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -714,21 +714,21 @@ static int usbhs_omap_probe(struct platform_device *pdev)
goto err_mem;
}
- omap->xclk60mhsp1_ck = devm_clk_get(dev, "xclk60mhsp1_ck");
+ omap->xclk60mhsp1_ck = devm_clk_get(dev, "refclk_60m_ext_p1");
if (IS_ERR(omap->xclk60mhsp1_ck)) {
ret = PTR_ERR(omap->xclk60mhsp1_ck);
dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
goto err_mem;
}
- omap->xclk60mhsp2_ck = devm_clk_get(dev, "xclk60mhsp2_ck");
+ omap->xclk60mhsp2_ck = devm_clk_get(dev, "refclk_60m_ext_p2");
if (IS_ERR(omap->xclk60mhsp2_ck)) {
ret = PTR_ERR(omap->xclk60mhsp2_ck);
dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
goto err_mem;
}
- omap->init_60m_fclk = devm_clk_get(dev, "init_60m_fclk");
+ omap->init_60m_fclk = devm_clk_get(dev, "refclk_60m_int");
if (IS_ERR(omap->init_60m_fclk)) {
ret = PTR_ERR(omap->init_60m_fclk);
dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 04/10] mfd: omap-usb-host: Update DT clock binding information
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
` (2 preceding siblings ...)
2014-01-20 14:11 ` [PATCH v6 03/10] mfd: omap-usb-host: Use clock names as per function for reference clocks Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 05/10] mfd: omap-usb-tll: " Roger Quadros
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros, Samuel Ortiz
The omap-usb-host driver expects certained named clocks.
Add this information to the DT binding document.
CC: Lee Jones <lee.jones@linaro.org>
CC: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
.../devicetree/bindings/mfd/omap-usb-host.txt | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt
index b381fa6..4721b2d 100644
--- a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt
+++ b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt
@@ -32,6 +32,29 @@ Optional properties:
- single-ulpi-bypass: Must be present if the controller contains a single
ULPI bypass control bit. e.g. OMAP3 silicon <= ES2.1
+- clocks: a list of phandles and clock-specifier pairs, one for each entry in
+ clock-names.
+
+- clock-names: should include:
+ For OMAP3
+ * "usbhost_120m_fck" - 120MHz Functional clock.
+
+ For OMAP4+
+ * "refclk_60m_int" - 60MHz internal reference clock for UTMI clock mux
+ * "refclk_60m_ext_p1" - 60MHz external ref. clock for Port 1's UTMI clock mux.
+ * "refclk_60m_ext_p2" - 60MHz external ref. clock for Port 2's UTMI clock mux
+ * "utmi_p1_gfclk" - Port 1 UTMI clock mux.
+ * "utmi_p2_gfclk" - Port 2 UTMI clock mux.
+ * "usb_host_hs_utmi_p1_clk" - Port 1 UTMI clock gate.
+ * "usb_host_hs_utmi_p2_clk" - Port 2 UTMI clock gate.
+ * "usb_host_hs_utmi_p3_clk" - Port 3 UTMI clock gate.
+ * "usb_host_hs_hsic480m_p1_clk" - Port 1 480MHz HSIC clock gate.
+ * "usb_host_hs_hsic480m_p2_clk" - Port 2 480MHz HSIC clock gate.
+ * "usb_host_hs_hsic480m_p3_clk" - Port 3 480MHz HSIC clock gate.
+ * "usb_host_hs_hsic60m_p1_clk" - Port 1 60MHz HSIC clock gate.
+ * "usb_host_hs_hsic60m_p2_clk" - Port 2 60MHz HSIC clock gate.
+ * "usb_host_hs_hsic60m_p3_clk" - Port 3 60MHz HSIC clock gate.
+
Required properties if child node exists:
- #address-cells: Must be 1
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 05/10] mfd: omap-usb-tll: Update DT clock binding information
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
` (3 preceding siblings ...)
2014-01-20 14:11 ` [PATCH v6 04/10] mfd: omap-usb-host: Update DT clock binding information Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 06/10] ARM: dts: omap4: Update omap-usb-host node Roger Quadros
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros, Samuel Ortiz
The omap-usb-tll driver needs one clock for each TLL channel.
Add this information to the DT binding document.
CC: Lee Jones <lee.jones@linaro.org>
CC: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
Documentation/devicetree/bindings/mfd/omap-usb-tll.txt | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/omap-usb-tll.txt b/Documentation/devicetree/bindings/mfd/omap-usb-tll.txt
index 62fe697..c58d704 100644
--- a/Documentation/devicetree/bindings/mfd/omap-usb-tll.txt
+++ b/Documentation/devicetree/bindings/mfd/omap-usb-tll.txt
@@ -7,6 +7,16 @@ Required properties:
- interrupts : should contain the TLL module's interrupt
- ti,hwmod : must contain "usb_tll_hs"
+Optional properties:
+
+- clocks: a list of phandles and clock-specifier pairs, one for each entry in
+ clock-names.
+
+- clock-names: should include:
+ * "usb_tll_hs_usb_ch0_clk" - USB TLL channel 0 clock
+ * "usb_tll_hs_usb_ch1_clk" - USB TLL channel 1 clock
+ * "usb_tll_hs_usb_ch2_clk" - USB TLL channel 2 clock
+
Example:
usbhstll: usbhstll@4a062000 {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 06/10] ARM: dts: omap4: Update omap-usb-host node
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
` (4 preceding siblings ...)
2014-01-20 14:11 ` [PATCH v6 05/10] mfd: omap-usb-tll: " Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 07/10] ARM: dts: omap5: " Roger Quadros
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros
The omap-usb-host driver expects a certain name for internal
and external reference clocks. Provide these clocks.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index d3f8a6e..39a05ce 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -697,6 +697,12 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
+ clocks = <&init_60m_fclk>,
+ <&xclk60mhsp1_ck>,
+ <&xclk60mhsp2_ck>;
+ clock-names = "refclk_60m_int",
+ "refclk_60m_ext_p1",
+ "refclk_60m_ext_p2";
usbhsohci: ohci@4a064800 {
compatible = "ti,ohci-omap3", "usb-ohci";
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 07/10] ARM: dts: omap5: Update omap-usb-host node
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
` (5 preceding siblings ...)
2014-01-20 14:11 ` [PATCH v6 06/10] ARM: dts: omap4: Update omap-usb-host node Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 08/10] ARM: dts: omap4-panda: Provide USB PHY clock Roger Quadros
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros
The omap-usb-host driver expects a certain name for internal
and external reference clocks. Provide these clocks.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
arch/arm/boot/dts/omap5.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 2f12a47..0f82ecf 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -765,6 +765,12 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
+ clocks = <&l3init_60m_fclk>,
+ <&xclk60mhsp1_ck>,
+ <&xclk60mhsp2_ck>;
+ clock-names = "refclk_60m_int",
+ "refclk_60m_ext_p1",
+ "refclk_60m_ext_p2";
usbhsohci: ohci@4a064800 {
compatible = "ti,ohci-omap3", "usb-ohci";
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 08/10] ARM: dts: omap4-panda: Provide USB PHY clock
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
` (6 preceding siblings ...)
2014-01-20 14:11 ` [PATCH v6 07/10] ARM: dts: omap5: " Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 09/10] ARM: dts: omap5-uevm: " Roger Quadros
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros
The USB PHY gets its clock from AUXCLK3. Provide this
information.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
arch/arm/boot/dts/omap4-panda-common.dtsi | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 88c6a05..50b72966 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -83,12 +83,8 @@
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; /* gpio_62 */
vcc-supply = <&hsusb1_power>;
- /**
- * FIXME:
- * put the right clock phandle here when available
- * clocks = <&auxclk3>;
- * clock-names = "main_clk";
- */
+ clocks = <&auxclk3_ck>;
+ clock-names = "main_clk";
clock-frequency = <19200000>;
};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 09/10] ARM: dts: omap5-uevm: Provide USB PHY clock
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
` (7 preceding siblings ...)
2014-01-20 14:11 ` [PATCH v6 08/10] ARM: dts: omap4-panda: Provide USB PHY clock Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-20 14:11 ` [PATCH v6 10/10] ARM: OMAP2+: Remove legacy_init_ehci_clk() Roger Quadros
2014-01-21 17:19 ` [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Lee Jones
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros
The HS USB 2 PHY gets its clock from AUXCLK1. Provide this
information.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
arch/arm/boot/dts/omap5-uevm.dts | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 002fa70..3b99ec2 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -31,12 +31,8 @@
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
reset-gpios = <&gpio3 16 GPIO_ACTIVE_LOW>; /* gpio3_80 HUB_NRESET */
- /**
- * FIXME
- * Put the right clock phandle here when available
- * clocks = <&auxclk1>;
- * clock-names = "main_clk";
- */
+ clocks = <&auxclk1_ck>;
+ clock-names = "main_clk";
clock-frequency = <19200000>;
};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 10/10] ARM: OMAP2+: Remove legacy_init_ehci_clk()
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
` (8 preceding siblings ...)
2014-01-20 14:11 ` [PATCH v6 09/10] ARM: dts: omap5-uevm: " Roger Quadros
@ 2014-01-20 14:11 ` Roger Quadros
2014-01-21 17:19 ` [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Lee Jones
10 siblings, 0 replies; 12+ messages in thread
From: Roger Quadros @ 2014-01-20 14:11 UTC (permalink / raw)
To: bcousson, tony
Cc: balbi, lee.jones, arnd, sre, mark.rutland, m.paolino, linux-omap,
linux-usb, devicetree, linux-arm-kernel, linux-kernel,
Roger Quadros
The necessary clock phandle for the EHCI clock is now provided
via device tree so we no longer need this legacy method.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
arch/arm/mach-omap2/pdata-quirks.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 39f020c..6a4e2d1 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -26,20 +26,6 @@ struct pdata_init {
void (*fn)(void);
};
-/*
- * Create alias for USB host PHY clock.
- * Remove this when clock phandle can be provided via DT
- */
-static void __init __used legacy_init_ehci_clk(char *clkname)
-{
- int ret;
-
- ret = clk_add_alias("main_clk", NULL, clkname, NULL);
- if (ret)
- pr_err("%s:Failed to add main_clk alias to %s :%d\n",
- __func__, clkname, ret);
-}
-
#if IS_ENABLED(CONFIG_WL12XX)
static struct wl12xx_platform_data wl12xx __initdata;
@@ -105,7 +91,6 @@ static void __init omap4_sdp_legacy_init(void)
static void __init omap4_panda_legacy_init(void)
{
omap4_panda_display_init_of();
- legacy_init_ehci_clk("auxclk3_ck");
legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53);
}
#endif
@@ -113,7 +98,6 @@ static void __init omap4_panda_legacy_init(void)
#ifdef CONFIG_SOC_OMAP5
static void __init omap5_uevm_legacy_init(void)
{
- legacy_init_ehci_clk("auxclk1_ck");
}
#endif
--
1.8.3.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14)
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
` (9 preceding siblings ...)
2014-01-20 14:11 ` [PATCH v6 10/10] ARM: OMAP2+: Remove legacy_init_ehci_clk() Roger Quadros
@ 2014-01-21 17:19 ` Lee Jones
10 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2014-01-21 17:19 UTC (permalink / raw)
To: Roger Quadros
Cc: bcousson, tony, balbi, arnd, sre, mark.rutland, m.paolino,
linux-omap, linux-usb, devicetree, linux-arm-kernel,
linux-kernel
> This patchset brings up USB Host ports and Ethernet port on
> the OMAP5 uEVM board.
I'd keep hold of this and send it out again when the merge-window is
closed.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-01-21 17:19 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-20 14:11 [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Roger Quadros
2014-01-20 14:11 ` [PATCH v6 01/10] mfd: omap-usb-host: Use resource managed clk_get() Roger Quadros
2014-01-20 14:11 ` [PATCH v6 02/10] mfd: omap-usb-host: Get clocks based on hardware revision Roger Quadros
2014-01-20 14:11 ` [PATCH v6 03/10] mfd: omap-usb-host: Use clock names as per function for reference clocks Roger Quadros
2014-01-20 14:11 ` [PATCH v6 04/10] mfd: omap-usb-host: Update DT clock binding information Roger Quadros
2014-01-20 14:11 ` [PATCH v6 05/10] mfd: omap-usb-tll: " Roger Quadros
2014-01-20 14:11 ` [PATCH v6 06/10] ARM: dts: omap4: Update omap-usb-host node Roger Quadros
2014-01-20 14:11 ` [PATCH v6 07/10] ARM: dts: omap5: " Roger Quadros
2014-01-20 14:11 ` [PATCH v6 08/10] ARM: dts: omap4-panda: Provide USB PHY clock Roger Quadros
2014-01-20 14:11 ` [PATCH v6 09/10] ARM: dts: omap5-uevm: " Roger Quadros
2014-01-20 14:11 ` [PATCH v6 10/10] ARM: OMAP2+: Remove legacy_init_ehci_clk() Roger Quadros
2014-01-21 17:19 ` [PATCH v6 00/10] USB Host support for OMAP5 uEVM (for 3.14) Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).