diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/ice.h | 5 | ||||
| -rw-r--r-- | include/dt-bindings/clock/msm-clocks-cobalt.h | 26 | ||||
| -rw-r--r-- | include/linux/pfk.h | 15 |
3 files changed, 40 insertions, 6 deletions
diff --git a/include/crypto/ice.h b/include/crypto/ice.h index b835a7f5f057..ef4be0e5fe36 100644 --- a/include/crypto/ice.h +++ b/include/crypto/ice.h @@ -69,8 +69,9 @@ struct qcom_ice_variant_ops { int (*reset)(struct platform_device *); int (*resume)(struct platform_device *); int (*suspend)(struct platform_device *); - int (*config)(struct platform_device *, struct request* , - struct ice_data_setting*); + int (*config_start)(struct platform_device *, struct request *, + struct ice_data_setting *, bool); + int (*config_end)(struct request *); int (*status)(struct platform_device *); void (*debug)(struct platform_device *); }; diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h index 0d9e850b5f5e..dfda7b1239d9 100644 --- a/include/dt-bindings/clock/msm-clocks-cobalt.h +++ b/include/dt-bindings/clock/msm-clocks-cobalt.h @@ -424,6 +424,27 @@ #define clk_mmss_vmem_maxi_clk 0xb6067889 #define clk_mmss_debug_mux 0xe646ffda +/* external multimedia clocks */ +#define clk_dsi0pll_byteclk_mux 0xecf2c434 +#define clk_dsi0pll_byteclk_src 0x6f6f740f +#define clk_dsi0pll_pclk_mux 0x6c9da335 +#define clk_dsi0pll_pclk_src 0x5efd85d4 +#define clk_dsi0pll_pclk_src_mux 0x84b14663 +#define clk_dsi0pll_post_bit_div 0xf46dcf27 +#define clk_dsi0pll_post_vco_div 0x8ee956ff +#define clk_dsi0pll_bitclk_src 0x36c3c437 +#define clk_dsi0pll_vco_clk 0x15940d40 + +#define clk_dsi1pll_byteclk_mux 0x14e2f38f +#define clk_dsi1pll_byteclk_src 0x4b65c298 +#define clk_dsi1pll_pclk_mux 0x4c0518b5 +#define clk_dsi1pll_pclk_src 0xeddcd80e +#define clk_dsi1pll_pclk_src_mux 0x3651feb3 +#define clk_dsi1pll_post_bit_div 0x712f0260 +#define clk_dsi1pll_post_vco_div 0x623e04de +#define clk_dsi1pll_bitclk_src 0x13ab045b +#define clk_dsi1pll_vco_clk 0x99797b50 + /* clock_gpu controlled clocks*/ #define clk_gpucc_xo 0xc4e1a890 #define clk_gpucc_gpll0 0x0db0e37f @@ -455,4 +476,9 @@ #define clk_sys_apcsaux_clk_gcc 0xf905e862 #define clk_xo_ao 0x428c856d +/* Audio External Clocks */ +#define clk_audio_ap_clk 0x9b5727cb +#define clk_audio_pmi_clk 0xcbfe416d +#define clk_audio_ap_clk2 0x454d1e91 + #endif diff --git a/include/linux/pfk.h b/include/linux/pfk.h index f492d758291e..a7e8ecbea8f5 100644 --- a/include/linux/pfk.h +++ b/include/linux/pfk.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -19,13 +19,20 @@ struct ice_crypto_setting; #ifdef CONFIG_PFK -int pfk_load_key(const struct bio *bio, struct ice_crypto_setting *ice_setting); +int pfk_load_key_start(const struct bio *bio, + struct ice_crypto_setting *ice_setting, bool *is_pfe, bool); +int pfk_load_key_end(const struct bio *bio, bool *is_pfe); int pfk_remove_key(const unsigned char *key, size_t key_size); bool pfk_allow_merge_bio(struct bio *bio1, struct bio *bio2); #else -static inline int pfk_load_key(const struct bio *bio, - struct ice_crypto_setting *ice_setting) +static inline int pfk_load_key_start(const struct bio *bio, + struct ice_crypto_setting *ice_setting, bool *is_pfe, bool async) +{ + return -ENODEV; +} + +static inline int pfk_load_key_end(const struct bio *bio, bool *is_pfe) { return -ENODEV; } |