qdsp6v2: re-add removed audio_dev_ctl.c
acdb: allow ACDB to use PMEM (to keep compatibility with older acdbloader)
audio: htc: update htc_acoustic_8x60
audio: dev_ctl: implement HTC's msm_get_call_state and msm_set_voc_freq
adie-codec: update ifdef, we won't use _1X anymore
audio: qdsp6v2: update board-msm8x60-audio for HTC specific, add timpani_profile_8x60_htc.h
qdsp6v2: htc: add HTC specific functions (support_adie, aic3254, ..)
headset: add htc_headset_8x60 driver
pyramid: update board for audio (using MSM8X60_AUDIO) (not working yet)
audio: qdsp: update header
pyramid: audio: use correct headers
pyramid: board cleanup
pyramid: display: when backlight level is zero, do not enable clocks for mipi bus, it will result in a mismatched clock count and throw a warning
Merge branch 'cm-11.0' into 8660-audio
msm: camera: add 8x60 conditions for HAL to init (WIP)
camera: add and update pyramid boards
pyramid: update defconfig
iomap: add SHARED_RAM_PHYS in msm_iomap-8x60 header, like in 8960
pyramid: fixup typo in regulator board
pyramid: board cleanup (again)