[PATCH] i.MX: clk-pllv3: Initially disable PLL_BYPASS bit

[Andrey Smirnov]

On Tue, Jul 11, 2017 at 4:30 AM, Philipp Zabel <p.zabel at pengutronix.de> wrote:
> Commit cbff8031b491 ("i.MX: clk-pllv3: Do not touch PLL_BYPASS bit")
> overreached a bit by removing the code that disables the PLL_BYPASS bit
> for all architectures instead of making an exception for Vybrid and
> i.MX6SL. This causes the USB controller on i.MX6Q to run at bypass
> frequency and fail:
>
>     barebox at Boundary Devices i.MX6 Quad Nitrogen6x Board:/ usb
>     usb: USB: scanning bus for devices...
>     usb: Bus 001 Device 001: ID 0000:0000 EHCI Host Controller
>     imx-usb 2184200.usb: port(0) reset error
>
> Also, the linux clk-pllv3 driver never looks at or touches the
> PLL_BYPASS bit, but expects the bootloader to set it up correctly.
>

Hmm, wouldn't this code:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/clk/imx/clk-imx6q.c?h=v4.12#n469

alter the state of BYPASS bit?

> This patch adds code to unconditionally disable the PLL_BYPASS bit
> initially, when the PLL clocks are registered.
>

The reason I didn't make that patch as a exception for Vybrid and
i.MX6SL was because any other i.MX6 clock trees didn't reference that
clock mux, so I incorrectly assumed it not to be present in the
hardware. IMHO, if this is not the case, a better fix for this would
be to change the clock tree to include PLL_BYPASS related mux and call
clk_set_parent() explicitly.

And having looked at i.MX6Q clock tree code in the kerenel it seems
like Barebox version got out of sync and kernel code does create such
clock tree node, so maybe we should do that as well?

Thanks,
Andrey Smirnov

> Cc: Andrey Smirnov <andrew.smirnov at gmail.com>
> Cc: Sascha Hauer <s.hauer at pengutronix.de>
> Fixes: cbff8031b491 ("i.MX: clk-pllv3: Do not touch PLL_BYPASS bit")
> Signed-off-by: Philipp Zabel <p.zabel at pengutronix.de>
> ---
>  drivers/clk/imx/clk-pllv3.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
> index 0e55a63e9..44642e88f 100644
> --- a/drivers/clk/imx/clk-pllv3.c
> +++ b/drivers/clk/imx/clk-pllv3.c
> @@ -370,6 +370,7 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,
>         struct clk_pllv3 *pll;
>         const struct clk_ops *ops;
>         int ret;
> +       u32 val;
>
>         pll = xzalloc(sizeof(*pll));
>
> @@ -414,6 +415,10 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,
>         pll->clk.parent_names = &pll->parent;
>         pll->clk.num_parents = 1;
>
> +       val = readl(pll->base);
> +       val &= ~BM_PLL_BYPASS;
> +       writel(val, pll->base);
> +
>         ret = clk_register(&pll->clk);
>         if (ret) {
>                 free(pll);
> --
> 2.11.0
>