Merge "clk: msm: Add COMMON_CLK branch memory flags"

This commit is contained in:
Linux Build Service Account 2016-10-31 13:04:02 -07:00 committed by Gerrit - the friendly Code Review server
commit c5d6943008

View file

@ -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;