lkml.org 
[lkml]   [2014]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.17 120/122] clk: qcom: Fix duplicate rbcpr clock name
    Date
    3.17-stable review patch.  If anyone has any objections, please let me know.

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

    From: Georgi Djakov <gdjakov@mm-sol.com>

    commit 9a6cb70f40b0268297024949eb0a2689e3b7769b upstream.

    There is a duplication in a clock name for apq8084 platform that causes
    the following warning: "RBCPR_CLK_SRC" redefined

    Resolve this by adding a MMSS_ prefix to this clock and making its name
    coherent with msm8974 platform.

    Fixes: 2b46cd23a5a2 ("clk: qcom: Add APQ8084 Multimedia Clock Controller (MMCC) support")
    Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
    Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
    Signed-off-by: Michael Turquette <mturquette@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/clk/qcom/mmcc-apq8084.c | 2 +-
    include/dt-bindings/clock/qcom,mmcc-apq8084.h | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/clk/qcom/mmcc-apq8084.c
    +++ b/drivers/clk/qcom/mmcc-apq8084.c
    @@ -3122,7 +3122,7 @@ static struct clk_regmap *mmcc_apq8084_c
    [ESC1_CLK_SRC] = &esc1_clk_src.clkr,
    [HDMI_CLK_SRC] = &hdmi_clk_src.clkr,
    [VSYNC_CLK_SRC] = &vsync_clk_src.clkr,
    - [RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr,
    + [MMSS_RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr,
    [RBBMTIMER_CLK_SRC] = &rbbmtimer_clk_src.clkr,
    [MAPLE_CLK_SRC] = &maple_clk_src.clkr,
    [VDP_CLK_SRC] = &vdp_clk_src.clkr,
    --- a/include/dt-bindings/clock/qcom,mmcc-apq8084.h
    +++ b/include/dt-bindings/clock/qcom,mmcc-apq8084.h
    @@ -60,7 +60,7 @@
    #define ESC1_CLK_SRC 43
    #define HDMI_CLK_SRC 44
    #define VSYNC_CLK_SRC 45
    -#define RBCPR_CLK_SRC 46
    +#define MMSS_RBCPR_CLK_SRC 46
    #define RBBMTIMER_CLK_SRC 47
    #define MAPLE_CLK_SRC 48
    #define VDP_CLK_SRC 49



    \
     
     \ /
      Last update: 2014-12-06 01:01    [W:2.483 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site