summaryrefslogtreecommitdiff
path: root/soc
AgeCommit message (Collapse)Author
2022-12-21Merge branch 'LA.UM.9.12.C10.11.00.00.840.478' via branch ↵android-u-preview-2_r0.1android-u-beta-2_r0.1android-u-beta-2.1_r0.1android-u-beta-1_r0.2android-msm-redbull-4.19-u-preview-2android-msm-redbull-4.19-u-beta2android-msm-redbull-4.19-u-beta1JohnnLee
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Bug: 261541074 Change-Id: I9afc4042670bd395febcc0906666b49ca88f044d Signed-off-by: JohnnLee <johnnlee@google.com>
2022-11-01soc: swr-mstr: Store and compare dev_addr along with dev_numShalini Manjunatha
-> If enumeration is changed runtime, dev_num gets changed -> so it might result in different dev_num for same device -> between swrm_connect_port and swr_disconnect_port while powering up and down of widget -> This results in not emptying the port_req list, hence swrm not going to suspend state -> This results into adsp not going to sleep state Change-Id: I80326a35f0cac7f7be30cbbee119a8ba247a0f76
2022-10-27Merge branch 'LA.UM.9.12.C10.11.00.00.840.415' via branch ↵android-u-preview-1_r0.1android-msm-redbull-4.19-u-preview-1JohnnLee
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Bug: 253163588 Change-Id: Id8f721dfcc23ead6f4c6adc36a7b8471f3584aab Signed-off-by: JohnnLee <johnnlee@google.com>
2022-05-10asoc: codecs: Add nullptr checkShazmaan Ali
fix for nullptr deref issue Change-Id: I26acf2c5c696038c6d5c64d858174b2f2c58a7d3 Signed-off-by: Shazmaan Ali <quic_shazmaan@quicinc.com>
2021-06-22Merge LA.UM.9.12.C10.11.00.00.840.010 via branch ↵android-s-v2-beta-2_r0.4android-s-v2-beta-1_r0.4android-s-beta-5_r0.5android-s-beta-4_r0.5android-12.0.0_r0.6android-12.0.0_r0.24android-12.0.0_r0.14android-msm-redbull-4.19-s-beta-5android-msm-redbull-4.19-s-beta-4android-msm-redbull-4.19-android12-v2-beta-2android-msm-redbull-4.19-android12android-msm-redbull--s-v2-beta-1Lucas Wei
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: dsp/q6adm.c dsp/rtac.c include/dsp/q6adm-v2.h Bug: 187909050 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I9261f1c48a33410da347a0ed29da4b93d4ec0ec9
2021-06-21soc: add check condition before enabling irqJason Hsu
Enable interrupt request only when the interrupt is in disabled state. Bug: 187655844 Signed-off-by: Jason Hsu <jasonchhsu@google.com> Change-Id: I18d32113be7b81d5ea120bd7fd696474efd5229d
2021-04-21Merge branch 'LA.UM.9.12.R1.11.00.00.597.108' via branch ↵JohnnLee
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: asoc/kona.c Bug: 182748782 Change-Id: I3a9dffa6dd350b5a6b240e50c7e94eebb8b31243
2021-03-26asoc: codecs: fix race condition of core vote and reg accessVangala, Amarnath
Auto suspend timer for core vote is triggering before read write complete. Move the auto suspend of core vote to post read write operation. Change-Id: Ib0f6b026fe0e7fd3fbe052691db492915e436a78 Signed-off-by: Vangala, Amarnath <avangala@codeaurora.org>
2021-02-26Merge LA.UM.9.12.R2.10.00.00.685.039 via branch 'qcom-msm-4.19-7250' into ↵Lucas Wei
android-msm-pixel-4.19 Conflicts: Makefile asoc/kona.c asoc/msm-pcm-routing-v2.c Bug: 172988823 Signed-off-by: lucaswei <lucaswei@google.com> Change-Id: I7f325c91d3f13c62a046dd150bef827a25cb34ad
2021-02-05soc: swr-mstr: Check if fifo available before bulk writeVatsal Bucha
Check for fifo availability before writing slave registers during swrm master bulk write so as to prevent swr overflow, underflow errors. Change-Id: I97a914cac289b3f1215ccf5c1abec88b959a9f21 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2021-01-11soc: swr-mstr: Fix headset detect issue during clk stop wakeupVatsal Bucha
When ext clk stop wakeup and slave_pending_irq come together then interrupt at swrslave is cleared due to calling enable_slave_irq. Do not clear interrupts for enable_slave_irq when its called from clk stop wakeup. Change-Id: Ia710030ab80306d6750bea7264f0d4c07053d701 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-11-02soc: swr-mstr: Update soundwire state to SSR during UPLaxminath Kasam
During SSR up event handler, if soundwire state is already up or auto suspend jiffies is not completed, ensure put in suspend/SSR state. Change-Id: I853f42d125eb5a60e3f1f065a60516877e3a463c Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-09-11Merge "soc: swr-mstr: Fix headset detect issue due to master.num_dev not ↵qctecmdr
updated"
2020-09-11Merge "soc: swr-mstr: update component and interrupt enable sequence"qctecmdr
2020-09-04soc: swr-mstr: Fix headset detect issue due to master.num_dev not updatedVatsal Bucha
Headset is not detected sometimes due to master.num_dev not being updated when we call GET_ENUM_SLAVE_STATUS as get_logical address may not have been called. Also enable slave irq only when swr wokeup from clk stop and not when master is already up. This will prevent valid irq to be discarded as spurious irq. Change-Id: I00284e9340668c853d0bd604fe66801118982780 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-09-04soc: swr-mstr: update component and interrupt enable sequenceMeng Wang
Enable component after enabling interrupt to avoid missing some intterupt during master init. Change-Id: I0f60c5431a815c58f878d3b9275a046e47939111 Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-08-28soc: swr-mstr: Fix random headset detection issue on scubaVatsal Bucha
When headset is inserted and reboot device sometimes headset is not detected after reboot as host_irq from swr slave gets masked. This is because of cmd error seen after clearing all irq which results in fifo flush. Read swrslave irq before clearing so as to resolve cmd error. Also enable slave irq only after clearing enum interrupt at master which results in proper enabling of irq. Change-Id: Id66029c65c4d813391bfeb8c0c619560f298eeab Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-08-04Merge "ASoC: sdm660 audio changes"qctecmdr
2020-07-27ASoC: soc: Add pinctrl-lpi legacy driver for sdm660Soumya Managoli
Use the legacy pinctrl-lpi driver for sdm660 instead of the latest driver to avoid conflicts. Change-Id: I58b1854eecb9488227c6e378c9ac10f779259e90 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2020-07-26soc: swr-mstr: Avoid overflow during swr fifo read/writeVatsal Bucha
Avoid swr fifo overflow by checking no. of outstanding commands in fifo and comparing with fifo depth before every read/write. If no. of commands is equal to fifo depth then give some delay and retry. If no of outstanding commands are still equal to fifo depth then flush fifo and try writing/reading from fifo again. Change-Id: Ifd986c7affb70a61f8a90e4960a2779273a7d4d2 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-07-14ASoC: sdm660 audio bring up changesSoumya Managoli
Enable compilation of ipc, soc, dsp and asoc components for sdm660 target. Change-Id: I5f575fcbca4d4e2e2ef6fcb8705d6bf3d54bcf61 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2020-07-08soc: swr-mstr: Fix KW issue in swrm_removeVatsal Bucha
Irq pointer is first freed and then used in irq_set_trigger_type and set wakeup capable. This may lead to Null pointer dereference if irq is NULL. Free irq after using it. Change-Id: I86339e9995922cc8111f12593eb781226bb07a2a Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-07-03Merge "soc: swr-mstr: Add delay of 100us after last write during bulk write"qctecmdr
2020-07-02soc: swr-mstr: Add delay of 100us after last write during bulk writeVatsal Bucha
There is no delay after last write during bulk write. Add 100us delay so as to ensure that last write goes fine. Change-Id: Ifc1585f30eec639ffd6b80dde2e0365f368349d7 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-06-30Revert "soc: mstr-ctrl: Retain Audio_HM voting until suspend"Laxminath Kasam
This reverts commits ea6cbeeb1ad818c8c7907252409edb306c81d0ae and b06236e6377a48282b59410e0440b8be6d83095f. Change-Id: I0b8b44bc5cca6bef6bc18c228f08a9c585c79c1c Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-06-26Merge "soc: swr-mstr: Fix headset detection during sva clk switch"qctecmdr
2020-06-23soc: swr-mstr: Fix headset detection during sva clk switchVatsal Bucha
Headset insertion/removal is not detected sometime due to fifo read failure due to swr underflow. This is because if headset sva is enabled, during clk switch swr force stop happens and if mbhc has already taken pm vote for 3sec further mbhc reads/writes will fail. If swr is in clk switch mode then call swrm runtime_resume during reads/writes to resolve issue. Change-Id: I0d65869bd1c645bbf7ded9c0265f8d7de0dc624b Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-06-18Merge LA.UM.9.12.R2.10.00.00.685.014 via branch ↵lucaswei
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Bug: 158429902 Change-Id: I42078b87107d01790bb8341cf441ed60f9ef7a82 Signed-off-by: lucaswei <lucaswei@google.com>
2020-06-09Merge LA.UM.9.12.R2.10.00.00.685.011 via branch ↵lucaswei
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: asoc/codecs/wcd-mbhc-adc.c asoc/msm-lsm-client.c config/litoauto.conf config/litoautoconf.h dsp/codecs/audio_alac.c dsp/codecs/audio_ape.c dsp/codecs/audio_g711alaw.c dsp/codecs/audio_g711mlaw.c dsp/q6afe.c dsp/q6asm.c dsp/usf.c Bug: 157858241 Signed-off-by: lucaswei <lucaswei@google.com> Change-Id: I8aa73fb62a60d33dcd98d67ce88523fb7e42d10b
2020-06-08Revert "soc: swr-mstr: Avoid overflow during swr fifo read/write"Vatsal Bucha
This reverts commit 96c04bee538a04fa95946dec9e1c81c483643ac2. Change-Id: Icc7e33adce6cff5c284faf351351e8b9febc583f Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-06-03Soc: soundwire: Update hw_ctl on HCLK at bootupLaxminath Kasam
For soundwire version 1.6, HCLK remove HW controlled at bootup before soundwire frame generation status check. Change-Id: Idc2420d086261766ea4e79f69320f12c4d6b2259 Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-05-31soc: swr-mstr: Avoid overflow during swr fifo read/writeVatsal Bucha
Avoid swr fifo overflow by checking no. of outstanding commands in fifo and comparing with fifo depth before every read/write. If no. of commands is equal to fifo depth then give some delay and retry. If no of outstanding commands are still equal to fifo depth then flush fifo and try writing/reading from fifo again. Change-Id: I612203ce6879f5ffcffadc23650f5bba1d45856f Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-05-17soc: mstr-ctrl: Retain Audio_HM voting until suspendLaxminath Kasam
Restore change to retain audio_hm voting and ensure AOP hang issue not seen by masking interrupt wakeup of swr pinctrl pins. Change-Id: I51bf36d6d6b0999abf10a4bc94cce900d1adf1d5 Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2020-05-15Merge LA.UM.9.12.R2.10.00.00.685.004 via branch 'qcom-msm-4.19-7250' into ↵Wilson Sung
android-msm-pixel-4.19 Conflicts: asoc/kona.c asoc/msm-pcm-routing-v2.c Bug: 156322859 Change-Id: I682634a6f444fd9eb6693981d42790d5956f13f9 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-05-14soc: pinctrl-lpi: Add 100msec before resetting hw votesAditya Bavanari
Add 100msec delay before resetting hw vote counts in SSR up sequence in order to ensure AVS is up when votes are requested. Change-Id: I0f46c60555f6bf833b1cac76f86a54afdcb78ba0 Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-04-20Merge "soc: swr-mstr: Add node to disable clk switch for rx master"qctecmdr
2020-04-16Merge LA.UM.9.12.R1.10.00.00.597.042 via branch 'qcom-msm-4.19-7250' into ↵lucaswei
android-msm-pixel-4.19 Conflicts: asoc/codecs/bolero/bolero-clk-rsc.c Bug: 153823050 Signed-off-by: lucaswei <lucaswei@google.com> Change-Id: Ifcf95fdee88bb2099bb33c9521ad276c825e164f
2020-04-15Merge "soc: swr-mstr: Add delay between fifo writes to avoid overflow/underflow"qctecmdr
2020-04-13soc: swr-mstr: Add node to disable clk switch for rx masterVatsal Bucha
RX Master does not support div2 clk switching as div2_en bit for rx master is floating. Do not do clk switch for rx master. Change-Id: Iee1716fe892e792ffd17d0861a807e3711cee5d5 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-08Merge "soc: swr: Mask bus clash interrupt"qctecmdr
2020-04-08Merge "soc: swr-mstr-ctrl: Remove ssr_lock handling"qctecmdr
2020-04-07soc: swr-mstr: Add delay between fifo writes to avoid overflow/underflowVatsal Bucha
Overflow/Underflow errors are observed sometimes while doing fifo write. Add delay between writes to resolve error. Change-Id: Id460e17753001a0dd52acd01a181d91132c36048 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-04-02audio-kernel: Synchronize hw vote and unvote requestsAditya Bavanari
HW vote and unvote is currently called from multiple clients leading to synchronization issues during SSR/PDR scenarios. Synchronize all the vote requests by using digital codec resource manager. Change-Id: I7e63f69ab5d761a3bb4c7ce70bbef2e8bfd76cfb Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-03-31soc: swr: Mask bus clash interruptAditya Bavanari
Mask bus clash interrupts to avoid interrupt storm issues. Change-Id: Ie5634e65c759f0ebbd74cf104888dfbc49a289f6 Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-04-01soc: swr-mstr-ctrl: Remove ssr_lock handlingAditya Bavanari
During SSR and headset detection/removal interrupt concurrencies, ssr_lock can lead to serv reg ack timeout issues. Remove this synchronization to avoid this issue. Change-Id: I242a013a7e9d833db21d737cbdfea2d84bbd29fa Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-03-30Merge branch 'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into ↵Robin Peng
android-msm-pixel-4.19 Conflicts: asoc/codecs/bolero/va-macro.c asoc/codecs/wcd-mbhc-v2.c asoc/msm-pcm-routing-v2.c Bug: 151568484 Change-Id: I616296e1f324a64d6053625f6fb11c6c3262579c Signed-off-by: Robin Peng <robinpeng@google.com>
2020-03-11Merge "soc: Vote or unvote core and audio hw based on count"qctecmdr
2020-03-09soc: Vote or unvote core and audio hw based on countAditya Bavanari
In order to synchronize the core and audio hw votes in SSR use cases, vote or unvote for these based on clock count. Change-Id: I0047e2cc689cc96b34992e5f6f59dae84d1d4e4b Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-03-07soc: swr-mstr: Fix headset not detetcted issue on devnum 0 detachedVatsal Bucha
Headset is not detected if devnum 0 gets detached at bootup. This is because on detach being called hw will mask interrupt at slave side but will not unmask it afterwards. Also device 0 is used only for discovery purpose and interrupt shouldnt be masked if it detaches. Change-Id: I78d47243ef67ea5ee1fe3badaec94e596bc8faf3 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2020-03-06Merge LA.UM.9.12.R1.10.00.00.597.022 via branch ↵Robin Peng
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: asoc/codecs/audio-ext-clk-up.c asoc/codecs/bolero/bolero-cdc.c asoc/msm-pcm-routing-v2.c dsp/q6afe.c soc/pinctrl-lpi.c soc/swr-mstr-ctrl.c Bug: 149799837 Change-Id: Ia05814012ac22d11e68d4ea8fbe61ee78a075878 Signed-off-by: Robin Peng <robinpeng@google.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:11:08 +0000