diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-30 12:00:47 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-11-30 12:00:48 -0700 |
| commit | fe5ce2a6bc4fd8b58f74731ca2d13452ee776d43 (patch) | |
| tree | 290a61fedf56009db6bb0dfbe8e4f86adff697b5 /include | |
| parent | 277e2eecbe3cd254fbf92c16d7fd988e1a9f9f50 (diff) | |
| parent | bde539edca7035e2f1f19c0d93ea02356b38ed48 (diff) | |
Promotion of kernel.lnx.4.4-161129.2.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1091566 I0cd6ca6679c19bbdf4ad980a22d9976396028316 qpnp-fg-gen3: Add support to configure auto recharge vol
1085699 I545771f9a84ecc9c2f641c17e057673a32b1f305 usb: gadget: Notify QTI upon cable connect for DPL
1094456 Ifefcbe4741ddd046755ecc24c3f2d619566c2823 clk: fix critical clock locking
1094461 I6f0f8f742d6e1b3ff735dcbeabd54ef101329cdf sched: Disable interrupts while holding related_thread_g
1094434 I69ae0d8589a0878b9758619893848afc272179c5 Crash due to mutex genl_lock called from RCU context
1094456 I2bf824bd2446ca87baabd31c166119d6c5c90643 clk: Provide OF helper to mark clocks as CRITICAL
Change-Id: If9a65e4592e6051e11e3501ecefc79a792097a3f
CRs-Fixed: 1085699, 1094434, 1094461, 1091566, 1094456
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clk-provider.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 83e9c6e23f2f..aed90a4902c7 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -788,7 +788,8 @@ int of_clk_get_parent_count(struct device_node *np); int of_clk_parent_fill(struct device_node *np, const char **parents, unsigned int size); const char *of_clk_get_parent_name(struct device_node *np, int index); - +int of_clk_detect_critical(struct device_node *np, int index, + unsigned long *flags); void of_clk_init(const struct of_device_id *matches); #else /* !CONFIG_OF */ @@ -826,6 +827,13 @@ static inline const char *of_clk_get_parent_name(struct device_node *np, { return NULL; } + +static inline int of_clk_detect_critical(struct device_node *np, int index, + unsigned long *flags) +{ + return 0; +} + #define of_clk_init(matches) \ { while (0); } #endif /* CONFIG_OF */ |