lkml.org 
[lkml]   [2014]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/22] clk: sunxi: move "ahb_sdram" to protected clock list
    Date
    With sunxi_gates clocks registered with clkdev, we can use the
    protected clocks list to enable the "ahb_sdram" clock, instead
    of looking for it and adding CLK_IGNORE_UNUSED inline in the
    clock setup code.

    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    ---
    drivers/clk/sunxi/clk-sunxi.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
    index 3e33bc1..b2c6d12 100644
    --- a/drivers/clk/sunxi/clk-sunxi.c
    +++ b/drivers/clk/sunxi/clk-sunxi.c
    @@ -870,7 +870,6 @@ static void __init sunxi_gates_clk_setup(struct device_node *node,
    int qty;
    int i = 0;
    int j = 0;
    - int ignore;

    reg = of_iomap(node, 0);

    @@ -891,15 +890,12 @@ static void __init sunxi_gates_clk_setup(struct device_node *node,
    of_property_read_string_index(node, "clock-output-names",
    j, &clk_name);

    - /* No driver claims this clock, but it should remain gated */
    - ignore = !strcmp("ahb_sdram", clk_name) ? CLK_IGNORE_UNUSED : 0;
    -
    clk_data->clks[i] = clk_register_gate(NULL, clk_name,
    - clk_parent, ignore,
    + clk_parent, 0,
    reg + 4 * (i/32), i % 32,
    0, &clk_lock);
    WARN_ON(IS_ERR(clk_data->clks[i]));
    - clk_register_clkdev(clks[i], clk_name, NULL);
    + clk_register_clkdev(clk_data->clks[i], clk_name, NULL);

    j++;
    }
    @@ -1204,6 +1200,7 @@ static void __init sunxi_init_clocks(const char *clocks[], int nclocks)

    static const char *sun4i_a10_critical_clocks[] __initdata = {
    "pll5_ddr",
    + "ahb_sdram",
    };

    static void __init sun4i_a10_init_clocks(void)
    @@ -1216,6 +1213,7 @@ CLK_OF_DECLARE(sun4i_a10_clk_init, "allwinner,sun4i-a10", sun4i_a10_init_clocks)
    static const char *sun5i_critical_clocks[] __initdata = {
    "mbus",
    "pll5_ddr",
    + "ahb_sdram",
    };

    static void __init sun5i_init_clocks(void)
    --
    2.0.0.rc2


    \
     
     \ /
      Last update: 2014-05-24 05:41    [W:8.720 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site