lkml.org 
[lkml]   [2019]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 3.18 09/19] clk: imx6q: reset exclusive gates on init
    Date
    From: Lucas Stach <l.stach@pengutronix.de>

    [ Upstream commit f7542d817733f461258fd3a47d77da35b2d9fc81 ]

    The exclusive gates may be set up in the wrong way by software running
    before the clock driver comes up. In that case the exclusive setup is
    locked in its initial state, as the complementary function can't be
    activated without disabling the initial setup first.

    To avoid this lock situation, reset the exclusive gates to the off
    state and allow the kernel to provide the proper setup.

    Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
    Reviewed-by: Dong Aisheng <Aisheng.dong@nxp.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-imx/clk-imx6q.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
    index 5474a76803f0..936ed9bae595 100644
    --- a/arch/arm/mach-imx/clk-imx6q.c
    +++ b/arch/arm/mach-imx/clk-imx6q.c
    @@ -222,8 +222,12 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
    * lvds1_gate and lvds2_gate are pseudo-gates. Both can be
    * independently configured as clock inputs or outputs. We treat
    * the "output_enable" bit as a gate, even though it's really just
    - * enabling clock output.
    + * enabling clock output. Initially the gate bits are cleared, as
    + * otherwise the exclusive configuration gets locked in the setup done
    + * by software running before the clock driver, with no way to change
    + * it.
    */
    + writel(readl(base + 0x160) & ~0x3c00, base + 0x160);
    clk[IMX6QDL_CLK_LVDS1_GATE] = imx_clk_gate_exclusive("lvds1_gate", "lvds1_sel", base + 0x160, 10, BIT(12));
    clk[IMX6QDL_CLK_LVDS2_GATE] = imx_clk_gate_exclusive("lvds2_gate", "lvds2_sel", base + 0x160, 11, BIT(13));

    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-08 20:37    [W:2.954 / U:1.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site