From 76d0d08e1166f5b2bf85204a1ddfe5f00b322992 Mon Sep 17 00:00:00 2001 From: Amit Nischal <anischal@codeaurora.org> Date: Mon, 24 Oct 2016 18:06:02 +0530 Subject: [PATCH] clk: msm: Add COMMON_CLK branch memory flags clk_set_flags would fail for clients using the branch memory flags as the macros vary between the COMMON_CLK_QCOM and COMMON_CLK_MSM. Fix the same by adding the enum definitions. Change-Id: I30cd3fb0435e085e76a60043b80b6ff7aded2819 Signed-off-by: Amit Nischal <anischal@codeaurora.org> --- include/linux/clk/msm-clk.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/linux/clk/msm-clk.h b/include/linux/clk/msm-clk.h index 22587e8852e2..964909d25021 100644 --- a/include/linux/clk/msm-clk.h +++ b/include/linux/clk/msm-clk.h @@ -14,6 +14,16 @@ #include <linux/notifier.h> +#if defined(CONFIG_COMMON_CLK_QCOM) +enum branch_mem_flags { + CLKFLAG_RETAIN_PERIPH, + CLKFLAG_NORETAIN_PERIPH, + CLKFLAG_RETAIN_MEM, + CLKFLAG_NORETAIN_MEM, + CLKFLAG_PERIPH_OFF_SET, + CLKFLAG_PERIPH_OFF_CLEAR, +}; +#elif defined(CONFIG_COMMON_CLK_MSM) #define CLKFLAG_INVERT 0x00000001 #define CLKFLAG_NOINVERT 0x00000002 #define CLKFLAG_NONEST 0x00000004 @@ -32,6 +42,7 @@ #define CLKFLAG_EPROBE_DEFER 0x00010000 #define CLKFLAG_PERIPH_OFF_SET 0x00020000 #define CLKFLAG_PERIPH_OFF_CLEAR 0x00040000 +#endif struct clk_lookup; struct clk;