lkml.org 
[lkml]   [2015]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 029/102] clk: rockchip: rk3288: add CLK_SET_RATE_PARENT to sclk_mac
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Heiko Stuebner <heiko@sntech.de>

    commit 4791eb61dbe8100ccac59fecfac9d93a15db1447 upstream.

    The dwmac ethernet controller on the rk3288 supports phys connected
    via rgmii and rmii. With rgmii phys it is expected that the mac clock
    is provided externally while with rmii phys the clock can be external
    but also generated from the plls. In the later case it of course needs
    be at 50MHz, which gets set from the dwmac_rk driver.
    As most devices use a rgmii phy it never surfaced so far that the mac
    clk mux, doesn't go up one lever to the pll clock in the rmii case with
    internal clock generation, as it is missing the CLK_SET_RATE_PARENT flag,
    and thus will not set the correct frequency in most cases.

    Fixes: b9e4ba541607 ("clk: rockchip: add clock controller for rk3288")
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/clk/rockchip/clk-rk3288.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/clk/rockchip/clk-rk3288.c
    +++ b/drivers/clk/rockchip/clk-rk3288.c
    @@ -578,7 +578,7 @@ static struct rockchip_clk_branch rk3288
    COMPOSITE(0, "mac_pll_src", mux_pll_src_npll_cpll_gpll_p, 0,
    RK3288_CLKSEL_CON(21), 0, 2, MFLAGS, 8, 5, DFLAGS,
    RK3288_CLKGATE_CON(2), 5, GFLAGS),
    - MUX(SCLK_MAC, "mac_clk", mux_mac_p, 0,
    + MUX(SCLK_MAC, "mac_clk", mux_mac_p, CLK_SET_RATE_PARENT,
    RK3288_CLKSEL_CON(21), 4, 1, MFLAGS),
    GATE(SCLK_MACREF_OUT, "sclk_macref_out", "mac_clk", 0,
    RK3288_CLKGATE_CON(5), 3, GFLAGS),



    \
     
     \ /
      Last update: 2015-09-19 20:41    [W:5.316 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site