diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-26 17:46:55 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-11-26 17:46:56 -0700 |
| commit | a6fff3c86ee7b4fa4e33384634f4ea73b44ffb23 (patch) | |
| tree | 34deda2952363839768405ddc71d879ca6d9a970 /include | |
| parent | 9811ea8f33b639a3a2e11661be50c19f2fec9927 (diff) | |
| parent | b23cd82dba85b13ace45d0c638452f1b641039cd (diff) | |
Promotion of kernel.lnx.4.4-161126.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1086894 I78770eea7fdd57f12d92ff40ed8043987e742024 msm: mdss: refine the calculation of tmds clock rate
1086976 Iae12fa648df17dddd48f3a71e94d06c2c3b03277 soc: qcom: socinfo: Change offset of image OEM attribute
1056661 If225dc4ec2c2e3eb8996f49f4fdf6acd31a50680 Revert "msm: kgsl: Enable limits management on A540v2"
1093546 I8f1cba6e1efa65ae41e674b14bd7598b4b521f05 soc: qcom: msm_bus: Set current index to default value
1092875 I53f89cf6b7c11f32c5e8e5a51a5986fa31424b92 qpnp-smb2: force UFP mode before shutdown
1084600 I53cd6ed709263669edbc34f096a21cddffcf4489 smb-lib: fix null ptr access while handling src change i
1081033 I6fc8323cbcf395a2c24e49e65cc7012709d031a2 input: synaptics_dsx: add checks of user input data
1086894 Ia3ea67cc7658098928a442460198b2dccc8ff8e1 msm: mdss: update vic info when powering on HDMI
1091972 I36ca125143cf9929fb0bd781990bdd8ab1dbeebf ARM: dts: msm: Add thermal mitigation properties to msmf
1091972 Ie564c181db61f6229479a49917cdb9e6c1887fc5 ARM: dts: msm: Add thermal sensor info for msmfalcon
1091566 Ic68cd12cc861d04e107b70e2b96200483f13da26 qpnp-smb2: add support to configure auto recharge
1072067 I7c6ab8bc0e88010eb221788cf8ce4c182e3128d9 ASoc: msm: qdsp6v2: Add support for compress capture
1060631 Icb48ac2624d489ff054dca3158f52c45cc85cce7 msm: camera: Enable secure camera feature
1087473 I09fbda8eb92c81acf24d0ff07ca9c040141680e1 msm: mdss: fix to handle multi-rect configuration in err
1082636 I3db0c20ac5fa47ed278f3d60368c406f472430c1 msm: crypto: fix issues on digest buf and copy_from_user
1090500 Ie592d06d2e09c2e263a2e9485a42eafb368e49cc include: clock: Add audio external clock of_index extrie
1084152 I48b5fc1c9e98994c8a7d92d462138cbacb246005 ASoC: wcd9335: Add dapm ignore suspend for codec dai
Change-Id: I0cc98bd7e0978cccd6a24fd1ead5e80d66e76a30
CRs-Fixed: 1056661, 1086894, 1087473, 1081033, 1091566, 1086976, 1093546, 1092875, 1060631, 1072067, 1084152, 1084600, 1090500, 1091972, 1082636
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/audio-ext-clk.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/audio-ext-clk.h b/include/dt-bindings/clock/audio-ext-clk.h index 6e4932342751..c9a8286d7c7f 100644 --- a/include/dt-bindings/clock/audio-ext-clk.h +++ b/include/dt-bindings/clock/audio-ext-clk.h @@ -14,9 +14,19 @@ #define __AUDIO_EXT_CLK_H /* Audio External Clocks */ +#ifdef CONFIG_COMMON_CLK_QCOM +#define AUDIO_PMI_CLK 0 +#define AUDIO_PMIC_LNBB_CLK 1 +#define AUDIO_AP_CLK 2 +#define AUDIO_AP_CLK2 3 +#define AUDIO_LPASS_MCLK 4 +#define AUDIO_LPASS_MCLK2 5 +#else #define clk_audio_ap_clk 0x9b5727cb #define clk_audio_pmi_clk 0xcbfe416d #define clk_audio_ap_clk2 0x454d1e91 #define clk_audio_lpass_mclk 0xf0f2a284 #define clk_audio_pmi_lnbb_clk 0x57312343 #endif + +#endif |