Commit graph

17772 commits

Author SHA1 Message Date
Linux Build Service Account
ac1480d7b4 Merge "sound: soc: Add docking station jack support" 2014-07-10 15:42:15 -07:00
Linux Build Service Account
5c7c1b70b3 Merge "ASoC: wcd_cpe_services: Fix the state propogation for OFFLINE state" 2014-07-10 15:41:47 -07:00
Venkat Sudhir
1bb38a60b4 ASoC: wcd9330: Send bus status to CPE core
When slimbus state changes this needs to be updated
to CPE core. CPE core will load the images when codec
get slimbus online notification.

Change-Id: Ib58c7eaa3f6e9abb8aee7c1c5fe4ea7200460111
Signed-off-by: Venkat Sudhir <vsudhir@codeaurora.org>
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2014-07-10 14:59:33 -07:00
Bhalchandra Gajare
277cf3d542 ASoC: wcd_cpe_core: Add support for CPE restart
The CPE hardware block on the codec may become unresponsive due to
unknown reasons. In such situation, the codec hardware has functionality
to interrupt the driver so that driver can take necessary steps to
reinitialize the CPE hardware block. Add support for detecting CPE
hardware state and reinitialize the CPE block so that further use
cases are not affected.

Change-Id: I8a3447925216f0d6c3bd177162800e3e3c8df879
Signed-off-by: Venkat Sudhir <vsudhir@codeaurora.org>
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2014-07-10 14:58:45 -07:00
Phani Kumar Uppalapati
ae061fe23c ASoC: wcd9330: Wait for enough time for Line PAs to get settled
During fast switching of audio playback, we need to wait
for 5ms for the LINE PAs to get settled down before enabling
them again for playback. Same delay is also required after PA
is enabled. Add the required delays after LINE PAs are enabled
or disabled.

CRs-Fixed: 668339
Change-Id: Ic867ca555bb0cf211cd6afa0e78d63e04e525076
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
2014-07-10 10:41:45 -07:00
Tanya Finkel
0dfb375b17 sound: soc: Add docking station jack support
Add docking station jack interrupt support to msm8994
audio machine driver.

Change-Id: I0af9a78cee92554fe75d2fd3c33fe0be98fc2576
Signed-off-by: Tanya Finkel <tfinkel@codeaurora.org>
2014-07-10 07:31:03 -07:00
Linux Build Service Account
715f10b40c Merge "ASoC: apq8084: add NULL pointer check for function return value" 2014-07-10 05:06:45 -07:00
Linux Build Service Account
2f0d7b70fe Merge "ASoC: msm: qdsp6v2: check dai before dereference" 2014-07-10 02:37:39 -07:00
Linux Build Service Account
10e36d476d Merge "ASoC: msm: qdsp6v2: check dai before dereference" 2014-07-10 02:37:34 -07:00
Linux Build Service Account
56f51a6968 Merge "ASoC: msm8x16-wcd: support boost enable by default" 2014-07-09 22:49:45 -07:00
Linux Build Service Account
2179c8dddc Merge "ASoC: msm8x16: fix the TCXO shutdown issue" 2014-07-09 22:49:38 -07:00
Linux Build Service Account
2305e21a70 Merge "ASoC: msm: qdsp6v2: Fix memory corruption in ASM driver" 2014-07-09 10:46:21 -07:00
Venkata Narendra Kumar Gutta
0a804758a2 ASoC: msm: qdsp6v2: do not allow multiple instances of VoIP driver
Multiple instances of VoIP driver are not supported and when opened
multiple instances causing corruption in the VoIP data structure.
Add condition checks to handle invalid requests from userspace.

CRs-Fixed: 669865
Change-Id: I3f1b5cc0fb31ba76fbeb3d3e186bfcce49c3505a
Signed-off-by: Venkata Narendra Kumar Gutta <vgutta@codeaurora.org>
2014-07-09 18:18:44 +05:30
Aravind Kumar
a795ea3078 ASoC: msm8x16-wcd: support boost enable by default
The current code cannot support ear boost in bypass
mode and speaker boost enabled by default.
The change ensures that the register writes for
ear boost in bypass mode and speaker boost are present
only in the ear path and speaker path respectively

Change-Id: Icf5a78ffb7ecd2354aba3904faf2180647780048
Signed-off-by: Aravind Kumar <akumark@codeaurora.org>
2014-07-09 12:53:17 +05:30
Aviral Gupta
aa5cf68187 ASoC: msm8x16: fix the TCXO shutdown issue
The SCLK is getting enabled twice for each playback,
the sclk is never turned off by the Q6.
Due to this Q6 keeps voting against TCXO resulting
in the failure for the system to go in the TCXO shutdown.

CRs-Fixed: 684388
Change-Id: Iedaca288d997cbc41015c8de7081858ac32b0316
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-07-09 11:06:45 +05:30
Bhalchandra Gajare
d3af110c57 ASoC: wcd_cpe_services: Fix the state propogation for OFFLINE state
Under normal operation, the cpe services state never goes to OFFLINE,
but during SSR handling, the state transitions to OFFLINE. Fix the
propogation of OFFLINE state transition to avoid erroneous CPE state
which can lead to unexpected issues.

Change-Id: I54b9e68e98615a186cfa1b59de0759838e9ba95d
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2014-07-08 14:15:00 -07:00
Linux Build Service Account
5bbc9bf6e3 Merge "ASoC: msm8x16-wcd: make default spkr_ocp hold enable" 2014-07-08 06:55:40 -07:00
Linux Build Service Account
8f9cf4cd74 Merge "ASoC: q6asm: Fix the memory leak during the SSR" 2014-07-08 06:55:22 -07:00
Venkata Narendra Kumar Gutta
5f880fc614 ASoC: msm: qdsp6v2: Fix memory corruption in ASM driver
During VoIP call if SSR happens there is no audio from the next call
onwards. Incorrect typecasting of void pointer causing memory corruption
in ASM driver resulting in aforementioned issue.

CRs-Fixed: 687854
Change-Id: Ib04b40b978c82e00fe78cc7b12122f2052fb14c1
Signed-off-by: Venkata Narendra Kumar Gutta <vgutta@codeaurora.org>
2014-07-08 15:18:02 +05:30
Laxminath Kasam
62b48b39a3 ASoC: msm8x16-wcd: make default spkr_ocp hold enable
Currently, OCP hold is set to zero by default which is
preventing the PA from holding the shutdown state.
Set this bit to enable OCP hold by default. Once hold is set
PA would shut down immediately during overcurrent and hold
that state unless SPKR_PA_EN bit is toggled.

Change-Id: Ib37edddea5a4a34f5f6d046d3bf3baa835598d89
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2014-07-08 11:58:47 +05:30
Linux Build Service Account
8b57dbb94c Merge "misc: Rename apq8084_dock to liquid_dock" 2014-07-07 21:55:25 -07:00
Linux Build Service Account
875d3fc4ab Merge "ASoC: msm: qdsp6v2: Add mutex to ensure atomicity" 2014-07-07 14:25:17 -07:00
Anish Kumar
3e62c61c74 ASoC: msm: qdsp6v2: Add mutex to ensure atomicity
Make sure that afe command sent to DSP is atomic in nature
and doesn't get overwritten in concurrent scenarios.

Change-Id: I86558c293f0ce5d78533b79ed13a23e52e367c1d
Signed-off-by: Anish Kumar <kanish@codeaurora.org>
2014-07-07 10:23:16 -07:00
Aviral Gupta
4c74289c96 ASoC: q6asm: Fix the memory leak during the SSR
If a session is released during the SSR, then the memory unmap
command to DSP fails. This results in not releasing up the memory
block shared among apps and the DSP.
Fix by checking if the session has been invalidated during the SSR
and free up the memory during the close command.

CRs-Fixed: 687190
Change-Id: I66251e624e5cc1abd816c2e4647997482b96c771
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-07-04 23:56:27 +05:30
Linux Build Service Account
3f73eb4cd5 Merge "ASoC: msm: unblock the calls sent to the driver during SSR" 2014-07-04 06:25:05 -07:00
Linux Build Service Account
c910dcd4ab Merge "ASoC: compress: fix the target not going to TCXO shutdown" 2014-07-04 02:35:14 -07:00
Aviral Gupta
832c721045 ASoC: msm: unblock the calls sent to the driver during SSR
Return error code ENETRESET from the platform driver
during the SSR recovery.
This facilitates the client to handle the error code
and take corrective measures rather than being blocked
on the call.

CRs-Fixed: 683288
Change-Id: I618edf0276bbe8826b47edec39df0dd4f87ffe93
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-07-04 12:27:21 +05:30
Linux Build Service Account
5ce8cf118f Merge "ASoC: wcd9330: Add support to reduce TX Analog Mic click and pop" 2014-07-03 21:11:01 -07:00
Gopikrishnaiah Anandan
361b3b42bb ASoC: pcm: Fix the compat pointer assignment
Compat ioctl pointer is assigned to ioctl field instead of compat_ioctl
member variable. Change updates the assignment.

CRs-fixed: 688027
Change-Id: I248e3225493f0ceafcb5e70ce0ff827ab77c7a74
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
2014-07-03 17:52:19 -07:00
Linux Build Service Account
c66490dbc8 Merge "ASoC: msm: qdsp6v2: avoid null pointer dereference" 2014-07-03 00:09:24 -07:00
Linux Build Service Account
fae17d9103 Merge "ASoC: msm: qdsp6v2: support for tertiary_mi2s_tx" 2014-07-03 00:09:18 -07:00
Sudheer Papothi
6a1083d599 ASoC: wcd9330: Add NULL check to avoid crash
Check for NULL pointer before passing the parameter for string
manipulation to avoid pointer dereference.

CRs-Fixed: 682554
Change-Id: Ic0c17f7019124f482767a3fcb54c0562ffed0ce8
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2014-07-02 05:12:01 +05:30
Sudheer Papothi
7196ed1f57 ASoC: wcd9320: Add NULL check to avoid crash
Check for NULL pointer before passing the parameter for string
manipulation to avoid pointer dereference.

CRs-Fixed: 682551
Change-Id: I74610e4679e4808c633c0ea80d3b3e389faf46d0
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2014-07-02 03:27:09 +05:30
Sudheer Papothi
1cf2b645b9 ASoC: msm8994: Ultrasound and ANC headset support
Ultrasound emitter uses lineout device path. Change enables
lineout device path and ultrasound gpio for ultrasound usecase
and support for Active Noise Cancellation(ANC) headset detection.

Change-Id: Ieccf93117126064f14af04ad394b5b8464f669ed
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2014-07-01 01:47:07 +05:30
Linux Build Service Account
7127232ad6 Merge "ASoC: wcd: enable regulators and interrupts properly" 2014-06-30 04:41:51 -07:00
Aviral Gupta
bc668d3b74 ASoC: compress: fix the target not going to TCXO shutdown
The error code propagated from the flush cmd in the trigger stop
is causing the error in the state of the soc compress framework.
This hinders in closing the BE connected to the FE.
If the AFE is not closed it prevents the target to go into TCXO
shutdown.
Fixed by removing the error handling of the flush command in the
trigger stop, since failure in flush doesn't signify the
failure in the stop command.

CRs-Fixed: 687111
Change-Id: I8f6e2bfbd0e59516ede2359dda4cedf027948a72
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-06-29 21:49:36 +05:30
Linux Build Service Account
95f7929d67 Merge "ASoC: msm: qdsp6v2: Add support to improve debug logging" 2014-06-27 22:49:10 -07:00
Linux Build Service Account
33698e576f Merge "ASoC: msm8994: fix voice call over BTSCO Wideband" 2014-06-27 22:49:02 -07:00
Jack Pham
83c40d8ad8 misc: Rename apq8084_dock to liquid_dock
The LiQUID dock support driver is not specific to the
APQ8084 SoC. Rename it to reflect its generality since
it can be used for other MSM/APQ LiQUID platforms.

Change-Id: I4a969077c543cd84e98dd198d3d7670b6071605a
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2014-06-27 11:14:13 -07:00
Yeleswarapu Nagaradhesh
602095167b ASoC: wcd: enable regulators and interrupts properly
Ensure required regulators are enabled during plug type determation
otherwise it will effect Plug determination.
call enable_irq_wake properly for all the interrutps otherwise headset
won't get detected when device is in sleep mode.

CRs-Fixed: 685319 685322
Change-Id: I3f10bb4f21bdc47c3f9882ae5fc668a942390a76
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2014-06-27 15:04:14 +05:30
Linux Build Service Account
21f25e45d8 Merge "ASoC: msm: set the master gain to 0 on DSP while configuring" 2014-06-26 23:06:17 -07:00
Narsinga Rao Chella
f93f507a2f ASoC: msm8994: fix voice call over BTSCO Wideband
Voice call over BTSCO wideband does not work because of
the mismatch in the string values used in user space and
kernel for the aux pcm sample rates. Change the values in
kernel to be consistent with other targets.

Change-Id: Ifd45484705fc0e4b98b2978cf03cbfcc908a8693
Signed-off-by: Narsinga Rao Chella <nrchella@codeaurora.org>
CRs-fixed: 686078
2014-06-26 12:08:58 -07:00
Ramjee Singh
46b02d0a09 ASoC: msm: set the master gain to 0 on DSP while configuring
- Mute media volume and play any music clip then reboot
  the phone. Play music again noise comes. This noise
  is introduced in DSP/LPASS.

- DSP suggestion is to mute master volume gain while
  configuring ASM session to avoid such noise at
  begining of asm playback.

Change-Id: I2aa2846d6e3e9a85c459534e9108e6fe7aebb962
Signed-off-by: Ramjee Singh <ramjee@codeaurora.org>
2014-06-26 21:05:11 +05:30
Srikanth Uyyala
563880de50 ASoC: msm: qdsp6v2: support for tertiary_mi2s_tx
AFE_PORT_ID for tertiary_mi2s_tx is missing in afe driver
this is resulting failure while pushing adm cal data associated
to this port. This change add this port in valid port list.

Change-Id: Icefc778be7f89b7925e0951ce76bf74fb0c52e9d
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2014-06-26 15:31:38 +05:30
Linux Build Service Account
9dd8bd6a32 Merge "ASoC: msm8939: add support for external codec over slimbus" 2014-06-26 02:10:05 -07:00
Aravind Kumar
24a57d52a9 ASoC: msm: qdsp6v2: avoid null pointer dereference
If memory allocation fails or allocation of extremely
large buffer is attempted causing kmalloc to return a
NULL, the present code goes ahead and dereferences the
NULL pointer.
The change returns from the function immediately if
kmalloc returns a NULL.

CRs-Fixed: 683684
Change-Id: Iffd532b9eacebfc3c365ced6856a117164111988
Signed-off-by: Aravind Kumar <akumark@codeaurora.org>
2014-06-26 13:16:46 +05:30
Linux Build Service Account
24b2d86a29 Merge "ASoC: mbhc: fix the no audio issue in the voice call" 2014-06-25 23:27:13 -07:00
Banajit Goswami
5864bc3110 ASoC: apq8084: add NULL pointer check for function return value
Add check for NULL pointer as return value from function before
dereferencing the pointer.

CRs-Fixed: 682545
Change-Id: I856f29e1f4a608e4de765a6b43214a55c896ef2f
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
2014-06-25 20:07:59 -07:00
Linux Build Service Account
1be4911f69 Merge "ASoC: msm8x16-wcd: enable ocp when hph pa is enabled" 2014-06-25 17:10:43 -07:00
Linux Build Service Account
a5f5fdb8ce Merge "ASoC: msm: qdsp6v2: Add support to improve debug logging" 2014-06-25 17:10:42 -07:00
Linux Build Service Account
1ec4c7a886 Merge "ASoC: compress: propagate the error code from the compress framework" 2014-06-25 12:51:23 -07:00
Linux Build Service Account
73c98ac919 Merge "ASoC: apq8084: add support for in-call music delivery on second sub" 2014-06-25 12:51:10 -07:00
Aravind Kumar
196d10d9df ASoC: msm8x16-wcd: enable ocp when hph pa is enabled
The present code enables over current protection for
headphones during boot up. This causes leakage current
on the cdc boost rail when the device is in idle state.
The change enables the ocp before hph pa is enabled
and disables them after hph pa is disabled.

CRs-Fixed: 684587
Change-Id: I549dce1b76221f2cf822dac0c819a0a673a3a960
Signed-off-by: Aravind Kumar <akumark@codeaurora.org>
2014-06-25 15:56:27 +05:30
Laxminath Kasam
84abfaf362 ASoC: msm8939: add support for external codec over slimbus
With new sound cards possible to connect over SLIMBUS,
add SLIMBUS as primary BE dai.

Change-Id: I6ebb3744a539f3409caad0565f7a80e6f531cc07
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2014-06-25 14:56:45 +05:30
Linux Build Service Account
5df047d242 Merge "ASoC: msm: add support for in-call music delivery on second sub" 2014-06-24 17:25:46 -07:00
Vidyakumar Athota
b220b60cd1 ASoC: apq8084: add support for in-call music delivery on second sub
Add multimedia9 frond end DAI in 8084 machine driver
to support in-call music feature on second subscription.

Change-Id: Id79d32b78465799ec9bcfc2567e1b0cd716fec73
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2014-06-24 15:17:41 -07:00
Linux Build Service Account
16f29b7fb5 Merge "ASoC: wcd9306: remove runtime PM voting" 2014-06-24 14:27:20 -07:00
Linux Build Service Account
a13d158409 Merge "ASoC: q6asm: fix the error during playback in ffbm" 2014-06-24 14:27:18 -07:00
Aviral Gupta
d27ea798de ASoC: compress: propagate the error code from the compress framework
Propagate the error code from the compress framework for the timestamp
query. This error code will be used by the client to handle the
error case scenarios gracefully.

CRs-Fixed: 683288
Change-Id: I68ad14d52327dd0156531fe8d17ac54ba110fdf6
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-06-24 22:02:56 +05:30
Linux Build Service Account
430983de08 Merge "ASoC: msm8x16: fix the target crash due to dpm timeout" 2014-06-24 06:45:35 -07:00
Aviral Gupta
36b3581809 ASoC: mbhc: fix the no audio issue in the voice call
The headset removal during the voice call causes the master bias to be
turned down impairing the speaker functionality.
Fix by removing the disable sequence of the MASTER_BIAS
during the headset plugout.

CRs-Fixed: 684711
Change-Id: I8ba382549f7efb08bda9412d0c401a9e7d78915d
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-06-24 17:58:38 +05:30
Laxminath Kasam
f01c35c55c ASoC: wcd9306: remove runtime PM voting
All the codec reads/writes go through slimbus satellite driver on APPS.
Slimbus satellite driver is already voting for slimbus clock before any
codec read or write so remove the vote from codec driver

Change-Id: I61f5b22d14f87668766d8d2f948a087066a73b11
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2014-06-24 14:44:42 +05:30
Aviral Gupta
be9938de22 ASoC: q6asm: fix the error during playback in ffbm
If the calibration data is not present the open of the audio
client was failing.
Even if the calibration data is not present then also the playback
should continue.
Fix by returning success even if the calibration data is not
present.

Change-Id: I768b6541686c71b03d5aa140cc62a59dce291f89
CRs-Fixed: 683320
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-06-24 12:14:31 +05:30
Linux Build Service Account
2bde62163a Merge "ASoC: wcd9330: Fix for VI feedback underflow errors" 2014-06-23 20:16:42 -07:00
Linux Build Service Account
2a0c3afb04 Merge "ASoC: msm8x16: Fix memory leakage in vmalloc address space" 2014-06-23 20:16:26 -07:00
Anish Kumar
f59bd78751 ASoC: msm: qdsp6v2: check dai before dereference
Check dai pointer before dereference.

Change-Id: I25d0986be1ce98d74b76d6aee73402500174f723
Signed-off-by: Anish Kumar <kanish@codeaurora.org>
2014-06-23 16:17:27 -07:00
Anish Kumar
66a4d7a533 ASoC: msm: qdsp6v2: check dai before dereference
Check dai pointer before dereference.

Change-Id: I47ba4154483aba962ac80ec45f51db8d0177cf5d
Signed-off-by: Anish Kumar <kanish@codeaurora.org>
2014-06-23 15:55:21 -07:00
Gopikrishnaiah Anandan
ef225a42f8 ASoC: wcd9330: Fix for VI feedback underflow errors
VI(voltage/current) feedback capture widget is part of speaker RX path.
When speaker is enabled, the VI feedback capture widget would be turned on.
During the shutdown of speaker RX path VI feedback codec path is
shutdown first and then the AFE port is closed. This will cause the
underflow errors during the shutdown seqeunce.
Change removes the vifeedback capture widget from playback path and
creates a new capture path. Userspace module will enable/disable the
VI feedback path via mixer control.

CRs-fixed: 591723
Change-Id: Ibceb5ff404e7cd7b73c490877e6b6e07faa06ab7
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
2014-06-23 11:25:16 -07:00
Vidyakumar Athota
25f6426815 ASoC: msm: add support for in-call music delivery on second sub
Add Multimedia9 mixer controls to support in-call music
delivery on second subscription.

Change-Id: I8f7a43dc5e1cefcaf834c9c62ef56de5486dce88
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2014-06-23 11:19:31 -07:00
Linux Build Service Account
07d6e746a9 Merge "ASoC: msm8x16-wcd: initialise ocp registers correctly" 2014-06-23 08:59:26 -07:00
Linux Build Service Account
3a1d2bde49 Merge "ASoC: wcd: update mbhc driver to release pm wake lock" 2014-06-21 23:57:51 -07:00
Asish Bhattacharya
d543cfb99d ASoC: msm8x16: Fix memory leakage in vmalloc address space
Ioremap for LPASS_CSR_GP_IO_MUX_MIC_CTL is called twice
without iounmap(). It causes memory leakage.

CRs-Fixed: 683280
Change-Id: I77b25c4d148c69e9387f8d813a43f86f452a07c8
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
2014-06-22 10:21:08 +05:30
Linux Build Service Account
5068a3d6a4 Merge "ASoC: msm: qdsp6v2: Add SLIMBUS 3 TX port as valid port" 2014-06-21 01:59:59 -07:00
Santosh Mardi
ee8ba82e1e ASoC: wcd: update mbhc driver to release pm wake lock
MBHC driver moves pm wake lock state to awake before
scheduling work which detects the headset type.
But the work scheduled does not move the pm wake lock
state back to sleepable. This is causing the target
not to enter into tcxo.

CRs-Fixed: 681157
Change-Id: Ib8d94d5d50a8180365ba4fdaee7c4c587769cbe4
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2014-06-21 12:30:37 +05:30
Aviral Gupta
1d1b1f5e85 ASoC: msm8x16: fix the target crash due to dpm timeout
DPM timeout was happening due to the suspend call to the
codec driver being blocked.
This was due to a deadlock by acquiring the same mutex by the
suspend call and the work queue.
Fix by modifying the codeflow so that the deadlock is avoided.

CRs-Fixed: 681986
Change-Id: I96f11ee968a0e9bd267a80d2d11f1fa49985f5a9
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-06-20 19:58:10 +05:30
Linux Build Service Account
ff37a4d4b5 Merge "ASoC: wcd: Add polling for proper headphone detection" 2014-06-20 05:20:31 -07:00
Linux Build Service Account
89f07cdc04 Merge "ASoC: msm8994: Add pinctrl changes for BT and FM" 2014-06-20 05:20:18 -07:00
Linux Build Service Account
67a383249d Merge "Merge v3.10.40 and related reverts into msm-3.10" 2014-06-20 00:09:33 -07:00
Linux Build Service Account
8a92473c81 Merge "ASoC: msm: qdsp6v2: add compat mode support for voice driver" 2014-06-20 00:09:17 -07:00
Linux Build Service Account
302fe11e9f Merge "ASoC: msm8x16: add mixer control to set BT sample rate" 2014-06-19 17:51:27 -07:00
Linux Build Service Account
a2cefc9cd4 Merge "ASoC: msm8x16-wcd: fix the no audio on speaker post SSR" 2014-06-19 15:00:41 -07:00
Linux Build Service Account
8b5cd905ec Merge "ASoC: wcd9306: fix the NULL pointer dereference in the tapan codec" 2014-06-19 15:00:23 -07:00
Linux Build Service Account
06edf9c7e1 Merge "ASoC: msm: qdsp6v2: add routing for voice2 on secondary aux pcm" 2014-06-19 12:11:04 -07:00
Anish Kumar
1fe8a3a7e6 ASoC: msm: qdsp6v2: Add support to improve debug logging
Improve debug logs by adding function names. This
change is required to fix rarely reproducible
customer issues.

Change-Id: Ic8b7f5b06bac1695904cecdc071cc13dc4b034ec
Signed-off-by: Anish Kumar <kanish@codeaurora.org>
2014-06-19 11:13:53 -07:00
Anish Kumar
6a5efe79cc ASoC: msm: qdsp6v2: Add support to improve debug logging
Improve debug logs by adding function names. This
change is required to fix rarely reproducible
customer issues.

Change-Id: I8f1e4f7c7b65bfdbbb7cf55595710985a7d3a5f7
Signed-off-by: Anish Kumar <kanish@codeaurora.org>
2014-06-19 10:47:38 -07:00
Linux Build Service Account
fda1f1650b Merge "ASoC: msm8x16-wcd: update power down sequence" 2014-06-19 06:13:08 -07:00
Walter Yang
fc600205ea ASoC: wcd: Add polling for proper headphone detection
When we insert headphone slowly, it may be detected as HEADSET
incorrectly.
So when we detect the HEADSET type, report it first and then schedule
the polling for it. If then button press interrupt is triggered
without corresponding button release paired, correct it to headphone.

CRs-Fixed: 678536
Change-Id: I82a043bf3ccccd956a79b9a96d393a9c0f46e8da
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
2014-06-19 10:32:42 +08:00
Damir Didjusto
0bb9c7f976 ASoC: msm: qdsp6v2: Add SLIMBUS 3 TX port as valid port
Add Slimbus 3 TX port to the list of valid ports.
Otherwise opening of this port will fail.

CRs-fixed: 682168
Change-Id: I53bdde37afb4c5b0773eff86bfcc45541532e4e7
Signed-off-by: Damir Didjusto <damird@codeaurora.org>
2014-06-18 16:59:44 -07:00
Ian Maund
491fb5c232 Merge upstream tag 'v3.10.40' into msm-3.10
* commit 'v3.10.40': (203 commits)
  Linux 3.10.40
  ARC: !PREEMPT: Ensure Return to kernel mode is IRQ safe
  drm: cirrus: add power management support
  Input: synaptics - add min/max quirk for ThinkPad Edge E431
  Input: synaptics - add min/max quirk for ThinkPad T431s, L440, L540, S1 Yoga and X1
  lockd: ensure we tear down any live sockets when socket creation fails during lockd_up
  dm thin: fix dangling bio in process_deferred_bios error path
  dm transaction manager: fix corruption due to non-atomic transaction commit
  Skip intel_crt_init for Dell XPS 8700
  mtd: sm_ftl: heap corruption in sm_create_sysfs_attributes()
  mtd: nuc900_nand: NULL dereference in nuc900_nand_enable()
  mtd: atmel_nand: Disable subpage NAND write when using Atmel PMECC
  tgafb: fix data copying
  gpio: mxs: Allow for recursive enable_irq_wake() call
  rtlwifi: rtl8188ee: initialize packet_beacon
  rtlwifi: rtl8192se: Fix regression due to commit 1bf4bbb
  rtlwifi: rtl8192se: Fix too long disable of IRQs
  rtlwifi: rtl8192cu: Fix too long disable of IRQs
  rtlwifi: rtl8188ee: Fix too long disable of IRQs
  rtlwifi: rtl8723ae: Fix too long disable of IRQs
  ...

Change-Id: If5388cf980cb123e35e1b29275ba288c89c5aa18
Signed-off-by: Ian Maund <imaund@codeaurora.org>
2014-06-18 13:10:54 -07:00
Santosh Mardi
1804b5b164 ASoC: msm8x16-wcd: update power down sequence
Update register write sequence for speaker and headset devices
during device tear down.

For PMIC 2.0 and QCRG 2_0_7 version has changes in the QCRG sequence
update the code to match the QCRG.

CRs-Fixed: 680225, 680246
Change-Id: I9ddfc478665d936080fca40b004cdd32bd8579b1
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2014-06-18 22:46:21 +05:30
Aviral Gupta
d14cb1188c ASoC: msm8x16-wcd: initialise ocp registers correctly
Initialization values for over current protection
registers are not proper. Enable IRQ/Disable IRQ calls
should be equal which has been ensured.

CRs-Fixed: 672584
Change-Id: I93528d3e59cf1238b6ccaeebf9116e6641027009
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2014-06-18 22:45:56 +05:30
Asish Bhattacharya
856308b2f9 ASoC: msm8x16: add mixer control to set BT sample rate
The interface to set sample rate for BT is not available. Its
set at 8KHz hardcoded and hence need mixer control to allow
set from user space based on need.

Change-Id: I8a522c9d96cff5a0433fce0a5b549b5b7f90a5fe
CRs-Fixed: 681676
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
2014-06-18 16:46:31 +05:30
Haynes Mathew George
7aa6d77653 ASoC: compr: timestamp fix for non-gapless mode
Cache last known playback timestamp before resetting the
in use session in preparation for possible re-use of the
same session.

Change-Id: Id422f5654960818c159f9f07d5af3c497192bae2
Signed-off-by: Haynes Mathew George <hgeorge@codeaurora.org>
Signed-off-by: Dhananjay Kumar <dhakumar@codeaurora.org>
2014-06-18 15:38:19 +05:30
Narsinga Rao Chella
23eef3344d ASoC: msm: qdsp6v2: add compat mode support for voice driver
When kernel is compiled for 64 bit and user space client is in
32 bit mode, then compat IOCTL path is taken instead of normal
IOCTL path. Add compat IOCTL support in voice platform driver.
This is needed to enable local call hold in DSDA use case.

Change-Id: I74e49f4986a4754a25189613828cf11283fe16e3
Signed-off-by: Narsinga Rao Chella <nrchella@codeaurora.org>
CRs-fixed: 673882
2014-06-17 10:36:17 -07:00
Aviral Gupta
cf45766834 ASoC: msm8x16-wcd: fix the no audio on speaker post SSR
On triggering the SSR the audio was not heard on the speaker for the
pmic 2.0 hardware.
For the pmic 2.0 hardware the register set which gets initialized post SSR
didn't have the speaker DAC ctl register hence the whole chain in the DAPM
was not established leading to no audio.
Fix by updating the array of the default registers for the 2.0 hardware.

CRs-Fixed: 679797
Change-Id: If11c7e9e573d878710d59f2f2294a0a039eb8dcc
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
2014-06-17 17:53:12 +05:30
Linux Build Service Account
d6207ed1ac Merge "ASoC: msm: fix a use after free problem in audio_calibration" 2014-06-17 04:45:27 -07:00
Linux Build Service Account
02a2c6ee94 Merge "ASoC: wcd: ensure regulator is on during plug detection" 2014-06-16 23:37:07 -07:00
Sudheer Papothi
747bfe26be ASoC: msm8994: Add pinctrl changes for BT and FM
AUXPCM and MI2S gpios are used for Bluetooth and FM. Configure
AUXPCM and MI2S gpios using pin control method. Change enables
Bluetooth and FM usecases.

Change-Id: Iea24c060e01036f694ec60f16f12024e917131ea
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2014-06-17 07:07:45 +05:30
Linux Build Service Account
1e5a07473d Merge "ASoC: msm: qdsp6v2: Add Primary MI2S support" 2014-06-16 18:06:53 -07:00
Linux Build Service Account
39ec2349fb Merge "ASoC: msm: qdsp6v2: fix for mutex deadlock in listen driver" 2014-06-16 18:06:25 -07:00