ASoC: msm: Mixer control to update the sample rate of SEC I2S interface

Updating the sample rate for the compressed stream playback of the I2S
interface. For PCM playback DSP supports 32 & 48KHz only, so fixing the
sample rate to 48KHz.

CRs-Fixed: 401928
Change-Id: I7c67daa526a9d25c4185c4a8a1aca3c9862abadb
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
(cherry picked from commit af3670d9c7329062184cb4f2d80fdf46fd040235)

Conflicts:

	sound/soc/msm/mpq8064.c

Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>
ASoC: msm: Mixer control to update the sample rate of HDMI interface

Updating the sample rate for the compressed stream playback of the HDMI
interface through the mixer control.

Change-Id: Ie4fdeafb56f0177715ec6f397370194f23674f16
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
(cherry picked from commit c0840c8651c77bcfa71ca5aba573ee73a9f595f2)

Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>
Merge commit 'AU_LINUX_ANDROID_JB_2.2_RB2_2.04.01.01.29.005' into HEAD

Conflicts:
	sound/soc/msm/msm8930.c

Change-Id: I86a56542e8ec6bdad7ee14e691c78f3569fb7465
Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>
USB: Allow skipping device resume during system resume

Some buses would like to keep their devices in suspend state during system
resume.  For example HSIC controller driver prevent system suspend when
HSIC device is active.  If this device is resumed, during system resume
HSIC controller acquire wake lock and prevent the subsequent suspend till
HSIC device is auto suspended.

(cherry picked from commit 6f199aa800253a69e5679d1057823039f1bd65c9)

Change-Id: Ic1a79bcefa04e2d2432f0abc8b48d2491ffb6c23
CRs-Fixed: 403975
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
msm_fb: display: Create sysfs entries in mdp_probe for MDP3 targets

vsync sysfs entries should be created in mdp_probe instead of
creating in panel on. This avoids waiting for the first event
control in framework

(cherry picked from commit 6db43b58111cfd39eaee0d694c223cbc7461d16c)

Change-Id: Icec525e02bb3c49ba82aa847246afc65fe4f587d
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
msm: camera: Fix msm.h include path.

msm.h is now moved to drivers/media/video/msm
directory.

Fixes following compilation error:
drivers/media/video/msm/server/msm_cam_server.h:20:
fatal error: msm.h: No such file or directory

(cherry picked from commit 1811cbac5c4245d1bdbf31ac0913efcf949b9e24)

Change-Id: I889f3f3f6106c6ef52e0262ac82addc4c81eb455
Signed-off-by: Rajeev Kulkarni <krajeev@codeaurora.org>
msm: camera: Add missing unsubscribe function in server ops.

The entry for unsubsribe_event function is missing from the server ops
table. Add this entry and point to the correct implementation of the
function.

(cherry picked from commit c0b42559aa2d1543435b7fee500887cc86c71f3f)

Change-Id: I74c573cdd1e498e0f746637c59d5973b9254436c
CRs-Fixed: 399710
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
Merge "ASoC: msm: Mixer control to update the sample rate of SEC I2S interface"
Merge "ASoC: msm: Mixer control to update the sample rate of HDMI interface"
Merge "USB: Allow skipping device resume during system resume"
Merge "msm_fb: display: Create sysfs entries in mdp_probe for MDP3 targets"
Merge "msm: camera: Fix msm.h include path."
Merge "msm: camera: Add missing unsubscribe function in server ops."
msm: camera: Update bandwidth requirement for 8x30.

8x30 hardware configuration is slightly lower compared
to 8960/8064. So the bus bandwidth figures need to be
adjusted to avoid bus overflow issues seen in different
camera usecases.

(cherry picked from commit 58fcda89b37bc9cbecfa23b04f580894b85ec7ba)
(cherry picked from commit 01259f44b88457f91dde3a41ea5af311a7bfa04c)

Change-Id: I391366cd27dd077858082e3b9c211d987a12e230
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>
Merge "msm: camera: Update bandwidth requirement for 8x30."
power: pm8921-bms: fix divide by 0 issue when charging

The current code can divide by zero in the scale_soc_while_chg
function if calculated_soc drops while charging.

Fix the issue by not scaling soc if catch_up_time_us is zero.

(cherry picked from commit bccae61ccd29b1b7a2c2dc8f934853391072dff3)

Change-Id: If482afff230694b2b7ac54fc1a0e27b84c65fd99
CRs-Fixed: 418419
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
power: pm8921-bms: change r_sense unit from mOhm to uOhm

Change the unit of r_sense from Milli Ohms to Micro Ohms in order to
increase the precision of ccadc and current readings.

(cherry picked from commit d69c91e4be0c921d8be7b75837d81562b856b4d9)

Change-Id: Icef1120a20fac1c89e61ae6d190c99dd29a1693e
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>
Merge "power: pm8921-bms: fix divide by 0 issue when charging"
Merge "power: pm8921-bms: change r_sense unit from mOhm to uOhm"
msm_fb: display: wfd with vsync driven frame push

To improve performance, hardware vsync event at mdp driver
is passed to framework so that both composition and frame
update are aligned at vsync event. This patch will upgrade
wfd to incorporate vsync driven frame push in consistence
with other interfaces.

Change-Id: If088826ec387446301f1f6acc311d909edb04163
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>

Conflicts:

	drivers/video/msm/mdp4_overlay.c

Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>