1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Commit graph

17772 commits

Author SHA1 Message Date
Linux Build Service Account
2afa2a9d58 Merge "Revert "ASoC: msm: qdsp6v2: Return error for invalid ioctl's"" 2014-07-21 04:17:05 -07:00
Linux Build Service Account
3043ed014d Merge "ASoC: msm: qdsp6v2: Add support for HFP on 8994" 2014-07-20 23:59:33 -07:00
Linux Build Service Account
0459ad7a88 Merge "ASoC: wcd: maintain different thresholds for CS and MICBIAS" 2014-07-18 19:20:03 -07:00
Gopikrishnaiah Anandan
4d4067fb26 Revert "ASoC: msm: qdsp6v2: Return error for invalid ioctl's"
This patch reverts commit c9c67fe553.
hwparams compat ioctl path was failing since platform driver was
returning an error. Platform driver should call pcm_lib layer of alsa
framework instead of returning invalid ioctl error.
This change fixes AMRNB recording usecase which was failing when hw
params ioctl was issued by userspace client.

CRs-fixed: 683867
Change-Id: Id17939d9803a4184649fde0afaef3fdce1ec1955
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
2014-07-18 15:49:30 -07:00
Linux Build Service Account
bbb4423828 Merge "ASoC: pcm: Fix the compat pointer assignment" 2014-07-18 06:54:56 -07:00
Yeleswarapu Nagaradhesh
1c25c4982c ASoC: wcd: maintain different thresholds for CS and MICBIAS
Program different button thresholds for current source
and MICBIAS for proper button detection.Also enable PULL_UP
for MICBIAS2 during playback for proper button detection.

CRs-Fixed: 691749
Change-Id: I6720e33d7c2882648bd2f465dc3abb9f68c24e05
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2014-07-18 17:48:02 +05:30
Linux Build Service Account
548e7c2846 Merge "ASoC: msm: qdsp6v2: Fix the boundary check for COPP" 2014-07-18 02:21:57 -07:00
Linux Build Service Account
a32ea06af7 Merge "ASoC: update drivers to handle errors correctly" 2014-07-18 02:21:47 -07:00
Linux Build Service Account
c3feebb4fe Merge "ASoC: wcd: add support for extension cable feature" 2014-07-17 16:08:49 -07:00
Linux Build Service Account
3030359443 Merge "ASoC: msm8x16-wcd: update the gain on EAR sound device" 2014-07-17 16:08:41 -07:00
Linux Build Service Account
e0664be7f5 Merge "ASoC: wcd9xxx: Don't enable micbias if headset is removed" 2014-07-17 00:40:57 -07:00
Simmi Pateriya
007ad23043 ASoC: wcd: add support for extension cable feature
Add support to detect extension cable feature using
electrical insertion and FSM removal interrupts.
Add option to configure driver for either special
headset detection or extn cable feature.

CRs-Fixed: 662020
Change-Id: I6c42edbf4052d4e08473c34bad9e7122792792b4
Signed-off-by: Simmi Pateriya <simmip@codeaurora.org>
2014-07-17 11:01:03 +05:30
Linux Build Service Account
6242563ce5 Merge "ASoC: msm: qdsp6v2: Add a new waitqueue and state for mem map/unmap" 2014-07-16 16:11:58 -07:00
Damir Didjusto
833e0ee83a ASoC: msm: qdsp6v2: Fix the boundary check for COPP
Fix the boundary check for the array that holds the COPP
information.

Change-Id: Ie0bbaf25aae25e722ebefac434b00c05b8a0a2c6
Signed-off-by: Damir Didjusto <damird@codeaurora.org>
2014-07-16 15:56:25 -07:00
Linux Build Service Account
8aa4fe3554 Merge "ASoC: msm: reorg q6core header file" 2014-07-16 11:54:42 -07:00
Linux Build Service Account
fce36017c3 Merge "ASoC: wcd9330: Wait for enough time for Line PAs to get settled" 2014-07-16 11:54:15 -07:00
Linux Build Service Account
8bc67f5005 Merge "ASoC: msm8x16-wcd: add mixer control to update loopback mode" 2014-07-16 11:54:01 -07:00
Linux Build Service Account
95a83be2e3 Merge "ASoC: msm: qdsp6v2: do not allow multiple instances of VoIP driver" 2014-07-16 11:53:58 -07:00
Linux Build Service Account
598b134a02 Merge "ASoC: msm: qdsp6v2: Add volume for Primary MI2S" 2014-07-16 11:53:32 -07:00
Linux Build Service Account
deec3055d5 Merge "ASoC: wcd9330: Add NULL check to avoid crash" 2014-07-16 11:53:25 -07:00
Linux Build Service Account
3ead650177 Merge "ASoC: wcd9320: Add NULL check to avoid crash" 2014-07-16 11:53:23 -07:00
Linux Build Service Account
a745cb82c5 Merge "ASoC: wcd: avoid noise during recording" 2014-07-16 11:53:10 -07:00
Santosh Mardi
7a87f56326 ASoC: msm8x16-wcd: update the gain on EAR sound device
Update the EAR path device with proper gain settings when
proper configuration is set from the userspace.

CRs-Fixed: 689069
Change-Id: I644903f23906467e63a2711d3319a8408351f973
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2014-07-16 19:06:52 +05:30
Asish Bhattacharya
401b3c618d ASoC: msm: reorg q6core header file
This is needed to allow include from
non soc folder.

CRs-Fixed: 689849
Change-Id: I753012d5ce9c5a788e75b4edf9b0099b58b30ec0
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
2014-07-16 12:44:28 +05:30
Linux Build Service Account
98a70b28d0 Merge "ASoC: msm8994: Ultrasound and ANC headset support" 2014-07-15 21:45:06 -07:00
Sudheer Papothi
6e9a163d58 ASoC: msm: qdsp6v2: Add volume for Primary MI2S
Add support for loopback volume control for primary MI2S.

Change-Id: Ic08537426301d59402b2ce4b240be476dff8eb73
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2014-07-16 08:07:01 +05:30
Linux Build Service Account
b31147a76f Merge "ASoC: msm8994: enable hdmi audio playback feature" 2014-07-15 15:54:07 -07:00
Sudheer Papothi
fd69c2bd08 ASoC: msm: qdsp6v2: Add support for HFP on 8994
Hands Free Profile(HFP) uses secondary AUXPCM interface on 8994.
Change enables HFP on 8994.

Change-Id: I149b3a7aaa4752f9fe2cd600191ecb8f1c8e12a5
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2014-07-16 02:25:35 +05:30
Gopikrishnaiah Anandan
76bad14f3d ASoC: msm8994: enable hdmi audio playback feature
Change enables hdmi audio playback feature for msm8994.

Change-Id: Ibcd95a3ad97adb9d6131a6e3337a867b2cbcbdec
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
2014-07-15 10:40:00 -07:00
Linux Build Service Account
7f228bd00c Merge "ASoC: msm: 8939: schedule mbhc start after 4sec" 2014-07-15 06:59:44 -07:00
Simmi Pateriya
7931abf5c5 ASoC: wcd: avoid noise during recording
If micbias is disabled during headset detection
while recording is happening through handset, it results
in noise in recorded data.So make sure micbias is
not disabled during recording.

CRs-Fixed: 689844
Change-Id: I6fa56770e365553603021f9e3ac713ccfc67d38b
Signed-off-by: Simmi Pateriya <simmip@codeaurora.org>
2014-07-15 17:48:42 +05:30
Laxminath Kasam
3f7a83bc5a ASoC: update drivers to handle errors correctly
Avoid logical conflicts seen while error handling.

Change-Id: I4c6b58bfcbd87f4d764fc6b923bf718e5f642ae5
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2014-07-15 15:59:52 +05:30
Linux Build Service Account
f08356273d Merge "ASoC: msm: 8994: enable hdmi audio feature" 2014-07-15 01:51:28 -07:00
Yeleswarapu Nagaradhesh
5445822e91 ASoC: msm: 8939: schedule mbhc start after 4sec
mbhc initial calibration needs mclk to be enabled, so schedule
headset detection for 4sec so that modem gets loaded and will be ready
to accept mclk enable request command.

Change-Id: I19d07f5c4d9b35cbff3df72ebf7cdff99419d38e
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2014-07-15 12:27:06 +05:30
Linux Build Service Account
e3b164d155 Merge "ASoC: msm: qdsp6v2: handle VoIP call recovery during SSR" 2014-07-14 15:17:57 -07:00
Linux Build Service Account
a06db4f62f Merge "ASoC: wcd: disable interrupts properly and modify headphone detection" 2014-07-14 15:17:46 -07:00
Linux Build Service Account
786caaa7f8 Merge "ASoC: wcd: add polling for cross connection" 2014-07-14 15:17:45 -07:00
Yeleswarapu Nagaradhesh
46d2a64e56 ASoC: wcd: disable interrupts properly and modify headphone detection
Correct disabling of analog and digital interrupts
and correct headphone detection.
Currently cross_conn_det function is disabling MICBIAS,
due to this recording/button detection is not working
if cable is inserted in recording mode.

CRs-Fixed: 689558
Change-Id: I454e7e0a3cf180d0df9afdd672f1241ecfdfcdc9
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2014-07-14 18:15:39 +05:30
Simmi Pateriya
c70e4babb1 ASoC: wcd: add polling for cross connection
If headset is inserted slowly and FSM is enabled,
it is possible that cross connection is wrongly
detected. Add polling to recheck the type of headset.

CRs-Fixed: 671195
Change-Id: I0f759b77395403c0f30aa531790ead09217a8d3d
Signed-off-by: Simmi Pateriya <simmip@codeaurora.org>
2014-07-14 18:14:00 +05:30
Santosh Mardi
065526011d ASoC: msm8x16-wcd: add mixer control to update loopback mode
Digital mute is enabled as part of the DAPM sequence but unmute
is done through digital mute interface on TX path added in the
codec driver which facilitate soc framework to ensure the
decimator path is unmuted when the stream is started. but this
will not holds good for the ADIE loopback usecases.

Add mixer control to update the loopback status and during
the DAPM sequence based on this status unmute the DEC path as part
of DAPM sequence.

CRs-Fixed: 690350
Change-Id: Id3ba9d52e5615e4adb370ce3cf98ed9a64d9b5bb
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2014-07-14 16:11:54 +05:30
Venkata Narendra Kumar Gutta
5a799cb840 ASoC: msm: qdsp6v2: handle VoIP call recovery during SSR
Add support for VoIP call auto recovery during Sub System Restart(SSR).

Change-Id: Ie8dce8f575ba3af5560c523a00e8520aef1c68c3
Signed-off-by: Venkata Narendra Kumar Gutta <vgutta@codeaurora.org>
2014-07-14 12:47:22 +05:30
Yeleswarapu Nagaradhesh
3948d0fd78 ASoC: wcd: enable OCP interrupts on PA disable
Enable OCP interrupts when HPHL/HPHR PA gets disabled
by sending notification to the mbhc.

CRs-Fixed: 689558
Change-Id: Ie05d8baf082953dfa1ec0cdaee45900fc43cad9f
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2014-07-14 11:26:39 +05:30
Linux Build Service Account
c5dbccd45e Merge "ASoC: wcd9330: Send bus status to CPE core" 2014-07-12 21:07:54 -07:00
Linux Build Service Account
f6b2a48f98 Merge "ASoC: wcd_cpe_core: Add support for CPE restart" 2014-07-12 21:07:53 -07:00
Linux Build Service Account
c3c9a38b28 Merge "ASoC: wcd: add notifier between codec and mbhc" 2014-07-12 04:57:19 -07:00
Linux Build Service Account
6b1eb519b4 Merge "ASoC: msm: 8939: get mclk ready before tapan cal set" 2014-07-11 22:57:06 -07:00
Yeleswarapu Nagaradhesh
3625f2432c ASoC: wcd: add notifier between codec and mbhc
Refractor special headset detection logic.
For button's to work on special headset in MICBIAS mode,
we need to enable AutoZeroing. Add notification between
codec and mbhc to enable AutoZeroing when MICBIAS is enabled.

CRs-Fixed: 676586
Change-Id: I3430c029b22b2b5f80a8b267ea2e334b4ccae0a8
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2014-07-11 15:49:32 +05:30
Laxminath Kasam
b250c38b25 ASoC: msm: 8939: get mclk ready before tapan cal set
MBHC cal dce, sta is read as zero incase mclk is not
configured. Add changes to provide MCLK before MBHC
cal is read.

Change-Id: Id99b123f561573c436df5b1e2760716428a50d64
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2014-07-11 12:58:08 +05:30
Simmi Pateriya
3c20d5bd86 ASoC: wcd9xxx: Don't enable micbias if headset is removed
If special headset is removed, the callback to
disable micbias will be called, as micbias is
always on with special headset. Mbhc driver
checks a flag, used to disable/enable micbias
for special headset, to make sure micbias is
not disabled by recording. If this flag is not
updated properly before the callback is called
while the headset is removed, it can cause that
micbias is left enabled.

CRs-Fixed: 687630
Change-Id: Id49a2a0ba43821deef8fc5b6fb904239b2273f69
Signed-off-by: Simmi Pateriya <simmip@codeaurora.org>
2014-07-11 10:57:03 +05:30
Damir Didjusto
89f32db377 ASoC: msm: qdsp6v2: Add a new waitqueue and state for mem map/unmap
All of the commands being sent to the DSP are using cmd_state flag
which can be overwritten when several commands are sent at the same
time. This results in Memory map/unmap command timing out. The change
will separate the memory flag from flags for other commands so that
they do not overwrite each other.

CRs-fixed: 673781
Change-Id: I61e059f402feb2c4e1e3dbed1825990456e78471
Signed-off-by: Damir Didjusto <damird@codeaurora.org>
2014-07-10 18:13:45 -07:00