| Message ID | 1357806954-27960-1-git-send-email-peter.chen@freescale.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jan 10, 2013 at 04:35:51PM +0800, Peter Chen wrote: > For mxs-phy user i.mx6q, the PHY's clock is controlled by > hardware automatically, the software only needs to enable it > at probe, this clock should be used like below: > > - Enable at mxs-phy's probe, and disable at mxs-phy's remove, so > The clk framework doesn't need to know it. But other mxs-phy user > mx28/mx23 may need it, so we give mxs-phy a dummy clock for imx6q. > - During the runtime, we don't need to control it. > Turning it into a dummy clock, you will have no way to maintain the use count. It could possibly cause parent clock be turned off while usbphy is in use. Let's try to find some other way. Shawn
> On Thu, Jan 10, 2013 at 04:35:51PM +0800, Peter Chen wrote: > > For mxs-phy user i.mx6q, the PHY's clock is controlled by > > hardware automatically, the software only needs to enable it > > at probe, this clock should be used like below: > > > > - Enable at mxs-phy's probe, and disable at mxs-phy's remove, so > > The clk framework doesn't need to know it. But other mxs-phy user > > mx28/mx23 may need it, so we give mxs-phy a dummy clock for imx6q. > > - During the runtime, we don't need to control it. > > > Turning it into a dummy clock, you will have no way to maintain the > use count. It could possibly cause parent clock be turned off while > usbphy is in use. > > Let's try to find some other way. > I will keep the phyclk unchanged, but just let it control a reserved bit In that case, the clk framework will know USB is using PLL. Meanwhile, the real USB PHY clk gate will only be open one time at phy driver's probe. > Shawn
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt index d77b4e6..5666486 100644 --- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt +++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt @@ -194,8 +194,6 @@ clocks and IDs. ssi2_ipg 179 ssi3_ipg 180 rom 181 - usbphy1 182 - usbphy2 183 ldb_di0_div_3_5 184 ldb_di1_div_3_5 185 sata_ref 186 diff --git a/Documentation/devicetree/bindings/usb/mxs-phy.txt b/Documentation/devicetree/bindings/usb/mxs-phy.txt index 5835b27..384e700 100644 --- a/Documentation/devicetree/bindings/usb/mxs-phy.txt +++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt @@ -4,10 +4,12 @@ Required properties: - compatible: Should be "fsl,imx23-usbphy" - reg: Should contain registers location and length - interrupts: Should contain phy interrupt +- The reg offset for PHY clock at anatop Example: usbphy1: usbphy@020c9000 { compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; reg = <0x020c9000 0x1000>; interrupts = <0 44 0x04>; + anatop-phy-reg-offset = <0x10>; }; diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index d6265ca..d958c49 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -518,14 +518,18 @@ compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; reg = <0x020c9000 0x1000>; interrupts = <0 44 0x04>; - clocks = <&clks 182>; - }; + anatop-phy-reg-offset = <0x10>; + /* the clk is controllered by hardware */ + clocks = <&clks 0>; + }; usbphy2: usbphy@020ca000 { compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; reg = <0x020ca000 0x1000>; interrupts = <0 45 0x04>; - clocks = <&clks 183>; + anatop-phy-reg-offset = <0x20>; + /* the clk is controllered by hardware */ + clocks = <&clks 0>; }; snvs@020cc000 { diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index 7f2c10c..fa62bc9 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -153,7 +153,7 @@ enum mx6q_clks { ssi2, ssi3, uart_ipg, uart_serial, usboh3, usdhc1, usdhc2, usdhc3, usdhc4, vdo_axi, vpu_axi, cko1, pll1_sys, pll2_bus, pll3_usb_otg, pll4_audio, pll5_video, pll8_mlb, pll7_usb_host, pll6_enet, ssi1_ipg, - ssi2_ipg, ssi3_ipg, rom, usbphy1, usbphy2, ldb_di0_div_3_5, ldb_di1_div_3_5, + ssi2_ipg, ssi3_ipg, rom, ldb_di0_div_3_5, ldb_di1_div_3_5, sata_ref, sata_ref_100m, pcie_ref, pcie_ref_125m, enet_ref, clk_max }; @@ -208,9 +208,6 @@ int __init mx6q_clocks_init(void) clk[pll7_usb_host] = imx_clk_pllv3(IMX_PLLV3_USB, "pll7_usb_host","osc", base + 0x20, 0x3); clk[pll8_mlb] = imx_clk_pllv3(IMX_PLLV3_MLB, "pll8_mlb", "osc", base + 0xd0, 0x0); - clk[usbphy1] = imx_clk_gate("usbphy1", "pll3_usb_otg", base + 0x10, 6); - clk[usbphy2] = imx_clk_gate("usbphy2", "pll7_usb_host", base + 0x20, 6); - clk[sata_ref] = imx_clk_fixed_factor("sata_ref", "pll6_enet", 1, 5); clk[pcie_ref] = imx_clk_fixed_factor("pcie_ref", "pll6_enet", 1, 4);
For mxs-phy user i.mx6q, the PHY's clock is controlled by hardware automatically, the software only needs to enable it at probe, this clock should be used like below: - Enable at mxs-phy's probe, and disable at mxs-phy's remove, so The clk framework doesn't need to know it. But other mxs-phy user mx28/mx23 may need it, so we give mxs-phy a dummy clock for imx6q. - During the runtime, we don't need to control it. Signed-off-by: Peter Chen <peter.chen@freescale.com> --- .../devicetree/bindings/clock/imx6q-clock.txt | 2 -- Documentation/devicetree/bindings/usb/mxs-phy.txt | 2 ++ arch/arm/boot/dts/imx6q.dtsi | 10 +++++++--- arch/arm/mach-imx/clk-imx6q.c | 5 +---- 4 files changed, 10 insertions(+), 9 deletions(-)