Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ASoC:SOF Topic/remove duplicated defines #614

Closed

Conversation

zhuyingjiang
Copy link
Contributor

remove some duplicated defines

plbossart and others added 30 commits August 20, 2018 15:25
…cted

Make sure distros don't run into issues with multiple incompatible
drivers selected for the same hardware.

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Disable hard-coded routes when SOF is enabled

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Disable hard-coded routes when SOF is enabled

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Disable hard-coded routes when SOF is selected
TODO: bytcr is not yet supported

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Disable hard-coded routes when SOF is enabled

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Disable hard-coded routes when SOF is enabled
TODO: bytcr is not yet supported

Signed-off-by: Pierre-Louis Bossart <[email protected]>
HSW/BDW use hard coded IPC calls to set SSP, not needed in SOF as SSP is
configured via topology.

Signed-off-by: Liam Girdwood <[email protected]>
Both drivers rely on the same module, expose it for both configurations

Signed-off-by: Pierre-Louis Bossart <[email protected]>
SOF can only support specific machine drivers, handle dependencies

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Fix ASoC: Intel: select relevant machine drivers for SOF
s/INTEL_SKL/INTEL_SKYLAKE

Signed-off-by: Pierre-Louis Bossart <[email protected]>
This patch adds the machine driver for the Up2 board with the Hifiberry
DAC+ codec.

Signed-off-by: Ranjani Sridharan <[email protected]>
Signed-off-by: Pierre-Louis Bossart <[email protected]>
Codec may be can not use now, use the component instead.

Signed-off-by: Pan Xiuli <[email protected]>
Change cpu dai name for SSP5 and add capture capability.

Signed-off-by: Pan Xiuli <[email protected]>
Add the CNL I2S machine driver using Realtek ALC274 codec
in I2S mode.

Change-Id: Ife808f52d69e73a8156130c446a3ab0602fff63d
Signed-off-by: Guneshwor Singh <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/12406
Reviewed-by: Kale, Sanyog R <[email protected]>
Reviewed-by: Kp, Jeeja <[email protected]>
Tested-by: Avati, Santosh Kumar <[email protected]>
…machine

FE dai links now come from topology, so remove them from machine driver.
Additionally register ops to initialize dai link. Rate constraint is
not required as rates will come from topology. So remove the startup
ops as well which sets the rate constraint.

Change-Id: I0fb07c74450bf55415323539e383ef39ed3ff4c4
Signed-off-by: Guneshwor Singh <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/13924
Reviewed-by: Koul, Vinod <[email protected]>
Reviewed-by: Prusty, Subhransu S <[email protected]>
Reviewed-by: Kp, Jeeja <[email protected]>
Reviewed-by: Nc, Shreyas <[email protected]>
Reviewed-by: Diwakar, Praveen <[email protected]>
Tested-by: Sm, Bhadur A <[email protected]>
During BE-BE loop, codec clocks were not set as it was a part of dai link ops
hw_params and no sound was heard due to this reason when use cases involve
BE-BE loop.

So, move codec clock setting as a part of supply widget and define routes
appropriately. Also use macro to define BE rate fixup and use it for both
fixup as well as clock computation.

Change-Id: Id5a08d2bd6024a61b601dbbe70ad99a52149da5e
Signed-off-by: Guneshwor Singh <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/14595
Reviewed-by: Prusty, Subhransu S <[email protected]>
Reviewed-by: Kale, Sanyog R <[email protected]>
Reviewed-by: R, Dharageswari <[email protected]>
Reviewed-by: Diwakar, Praveen <[email protected]>
Tested-by: Avati, Santosh Kumar <[email protected]>
Since NHLT does not have SSP1 endpoint, remove it from the dai link
definitions

Change-Id: I7b08f43d21eeff9decb5722e3af4f142f800b3f7
Signed-off-by: Guneshwor Singh <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/15999
Reviewed-by: Prusty, Subhransu S <[email protected]>
Reviewed-by: Koul, Vinod <[email protected]>
Reviewed-by: Babu, Ramesh <[email protected]>
Reviewed-by: audio_build <[email protected]>
Reviewed-by: Diwakar, Praveen <[email protected]>
Tested-by: Sm, Bhadur A <[email protected]>
Pointer 'codec_dai' returned from call to cnl_get_codec_dai() can be
NULL.

Check for the valid pointer before dereferencing.

Change-Id: I783b6220e32a9b8bf7655b92df7a4b034175a509
Signed-off-by: Pankaj Bharadiya <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/18681
Reviewed-by: Prusty, Subhransu S <[email protected]>
Reviewed-by: audio_build <[email protected]>
Reviewed-by: Koul, Vinod <[email protected]>
Tested-by: Sm, Bhadur A <[email protected]>
As the framework is changed in kernel 4.17 version,
replace codec variable with component and use component specific
function to set jack.

Change-Id: Id6d1cda7968a5d524a3210f1b38221214c2bb67d
Signed-off-by: Shahina Shaik <[email protected]>
Needs to be squashed with component model update, kept separate to avoid
merge issues with SST code

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Use 24MHz instead of 19.2 (Mandatory rework) and use helper to find the
dai

Signed-off-by: Pierre-Louis Bossart <[email protected]>
(1)refine machine driver to make it work with sof
(2)disable DMIC for it is not ready now

Signed-off-by: Rander Wang <[email protected]>
Signed-off-by: Pierre-Louis Bossart <[email protected]>
Add SOF platform name

Signed-off-by: Rander Wang <[email protected]>
This is a basic driver to register the codec, expose the
codec DAI and control the power mode of the amplifier.

Change-Id: Ie6ab037cd4d6c87e8e139b6d8af6cd4295445bf2
Signed-off-by: Mohit Sinha <[email protected]>
Signed-off-by: Steffen Wagner <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/15296
Reviewed-by: B, Jayachandran <[email protected]>
Reviewed-by: Shaik, Kareem M <[email protected]>
Reviewed-by: Koul, Vinod <[email protected]>
Tested-by: Sm, Bhadur A <[email protected]>
Initialized the reported variables, listed below

warning: 'ret' may be used uninitialized in this
function
warning: 'status_repl' may be used uninitialized in this
function

Change-Id: I6ca5a6e017402a582239d75959c122ffaa9f7298
Signed-off-by: Gogineni, GiribabuX <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/17572
Reviewed-by: Singh, Guneshwor O <[email protected]>
Reviewed-by: Sinha, Mohit <[email protected]>
Reviewed-by: Shaik, Kareem M <[email protected]>
Reviewed-by: Koul, Vinod <[email protected]>
Tested-by: Sm, Bhadur A <[email protected]>
While doing the continuous play and stop, the codec
may not be ready for I2C reading after successive writes.
This triggers BE failure, because I2C reading value is incorrect.
Fix this by adding 10ms delay to ensure the smooth I2C read and write.

Change-Id: If918e263bc799fecc2c807229f5b4b165e011fa6
Signed-off-by: Gogineni, GiribabuX <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/20404
Reviewed-by: Shaik, Kareem M <[email protected]>
Reviewed-by: Sinha, Mohit <[email protected]>
Reviewed-by: Nc, Shreyas <[email protected]>
Reviewed-by: Periyasamy, SriramX <[email protected]>
Reviewed-by: Kale, Sanyog R <[email protected]>
Tested-by: Sm, Bhadur A <[email protected]>
Fix kmemleak issue in tdf8532_wait_state function by releasing
the memory getting allocated continuosly in instance of get_dev_status_repl
i.e. status_repl  before exiting the function.

kernel memory leakage in audio stack/kmemleak backtrace:

unreferenced object 0xffff88006227cc20 (size 32):
  comm "irq/25-snd_soc_", pid 2302, jiffies 4294679082 (age 5506.010s)
  hex dump (first 32 bytes):
    02 00 03 80 80 02 00 00 00 00 00 00 00 00 00 00  ................
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
  backtrace:
    [<ffffffff81afb06a>] kmemleak_alloc+0x4a/0xa0
    [<ffffffff81201108>] __kmalloc+0x128/0x210
    [<ffffffffa01b3426>] tdf8532_wait_state.constprop.5+0x116/0x260 [snd_soc_tdf8532]
    [<ffffffffa01b361b>] tdf8532_dai_trigger+0xab/0x15a [snd_soc_tdf8532]
    [<ffffffff819181e5>] soc_pcm_trigger+0x75/0x130
    [<ffffffff81919339>] dpcm_do_trigger.isra.6+0x29/0x90
    [<ffffffff8191952d>] dpcm_be_dai_trigger+0x18d/0x350

Change-Id: I550897d6b1efbd5ebbe15ab47038adf99581a82f
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-62665
Signed-off-by: Liu Changcheng <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/23270
Reviewed-by: Shaik, ShahinaX <[email protected]>
Reviewed-by: Singh, Guneshwor O <[email protected]>
Reviewed-by: Gogineni, GiribabuX <[email protected]>
Reviewed-by: Tewani, Pradeep D <[email protected]>
Reviewed-by: Kesapragada, Pardha Saradhi <[email protected]>
Reviewed-by: Kp, Jeeja <[email protected]>
Tested-by: Madiwalar, MadiwalappaX <[email protected]>
1. Check allocated space before using it.
2. The repl_buff parameter in tdf8523_single_read is used to store
the read data from i2c interface. When the data isn't right read,
the pre-allocate space should be freed and the content of repl_buff
should be set as NULL in case of being wrong used by the caller.
3. In the wrong case i.e. ret != len, return -EINVAL

Change-Id: I3d0e12a9fcb6516716efc92eb734a0248ab3fb28
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-62665
Signed-off-by: Liu Changcheng <[email protected]>
Reviewed-on: https://git-gar-1.devtools.intel.com/gerrit/23266
Reviewed-by: Shaik, ShahinaX <[email protected]>
Reviewed-by: Kesapragada, Pardha Saradhi <[email protected]>
Reviewed-by: Gogineni, GiribabuX <[email protected]>
Reviewed-by: Singh, Guneshwor O <[email protected]>
Reviewed-by: Tewani, Pradeep D <[email protected]>
Reviewed-by: Kp, Jeeja <[email protected]>
Tested-by: Madiwalar, MadiwalappaX <[email protected]>
Based on the TDF8532 manual:
If the wait_state result is ok, we should send CLK_DISCONNECT
command to force codec from STANDBY(2) to IDLE(1).
If the wait_state result is timeout, the codec state should be
at Clockfail(7), we still should send CLK_DISCONNECT command
force the codec from Clockfail(7) to Idle(1).

Signed-off-by: Wu Zhigang <[email protected]>
Reviewed-by: Keyon Jie <[email protected]>
Needs to be squashed for 4.18+

Signed-off-by: Pierre-Louis Bossart <[email protected]>
plbossart and others added 23 commits October 24, 2018 11:08
no new code, just add definitions

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Clock controls is now a single field. This change impacts topology files
due to a renumbering of the tokens.

Signed-off-by: Pierre-Louis Bossart <[email protected]>
EQ ipc was using int as size, so change it to
unsigned as it won't ever be negative. Also fix
effect enum type none.

Signed-off-by: Jaska Uimonen <[email protected]>
Signed-off-by: Pierre-Louis Bossart <[email protected]>
s/timer/timer_delay

Signed-off-by: Pierre-Louis Bossart <[email protected]>
reclaim padding for abi_version

Signed-off-by: Pierre-Louis Bossart <[email protected]>
This reverts commit f677a1a.

Signed-off-by: Pierre-Louis Bossart <[email protected]>
This reverts commit 481973c.

Signed-off-by: Pierre-Louis Bossart <[email protected]>
Patch adds Geminilake I2S machine driver which uses following codecs:
RT5682 and MAX98357A.

Signed-off-by: Naveen Manohar <[email protected]>
Signed-off-by: Harsha Priya <[email protected]>
Acked-by: Pierre-Louis Bossart <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 8452112)
This patch adds da7219_max98357a machine driver entry into
machine table

Signed-off-by: Naveen Manohar <[email protected]>
Signed-off-by: Pierre-Louis Bossart <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 65a3388)
Align with upstream code

Signed-off-by: Pierre-Louis Bossart <[email protected]>
This is the initial codec driver for rt5682.

Signed-off-by: Bard Liao <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 0ddce71)
Using devm_snd_soc_register_component() and drop all of the code
related to .remove hook.

Signed-off-by: Wei Yongjun <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit a98ec93)
We are currently using power saving mode for button detection.
However, it will impact the headset recording performance.
This patch will switch button detection to normal mode in capture
and switch to power saving mode in the end of capture.

Signed-off-by: Bard Liao <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 2daf3d9)
New calibration sequence allows rt5682 do calibration without
MCLK.

Signed-off-by: Shuming Fan <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 513792c)
The step of DAC/ADC volume scale changes from 0.375dB to 0.75dB

Signed-off-by: Shuming Fan <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
Cc: [email protected]
(cherry picked from commit 7509487)
We change the settings while HP power-up for better performance.

Signed-off-by: Shuming Fan <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit bf0fa00)
This patch removed Headphone Playback Volume control.
Due to codec settings, we don't want the user to change HP analog gain.
The user could use DAC1 Playback Volume control to
change playback volume.

Signed-off-by: Shuming Fan <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 3f24f37)
The ADC/DAC path should open while calibration process.

Signed-off-by: Shuming Fan <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit afd603e)
This patch fixed the boost volume at the begining of playback
while DAC volume set to lower level.

Signed-off-by: Shuming Fan <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 28b20dd)
Minor code changes are:
 - improve the readability in patch list
 - add i2c remove function
 - regmap_register_patch changes to regmap_multi_reg_write

Signed-off-by: Shuming Fan <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
(cherry picked from commit 37efe23)
Add firmware/topology information for APL RVP

Signed-off-by: Bard liao <[email protected]>
there are duplicated defines HDA_DSP_ADSPIS_CL_DMA HDA_DSP_ADSPIC_CL_DMA
the defines HDA_SKL_ADSP_FW_STATUS and HDA_DSP_SRAM_REG_ROM_STATUS_SKL
are the same

Signed-off-by: Zhu Yingjiang <[email protected]>
@plbossart plbossart deleted the topic/remove-duplicated-defines branch February 12, 2019 18:41
fengguang pushed a commit to 0day-ci/linux that referenced this pull request Apr 5, 2021
Fix the following checkpatch error:
 torvalds#614: FILE: drivers/i2c/i2c-core-base.c:614:
 +	len = acpi_device_modalias(dev, buf, PAGE_SIZE -1);
 	                                               ^
No functional changes.

Signed-off-by: Tian Tao <[email protected]>
fengguang pushed a commit to 0day-ci/linux that referenced this pull request Apr 17, 2021
Fix the following checkpatch error:
 torvalds#614: FILE: drivers/i2c/i2c-core-base.c:614:
 +	len = acpi_device_modalias(dev, buf, PAGE_SIZE -1);
 	                                               ^
No functional changes.

Signed-off-by: Tian Tao <[email protected]>
Signed-off-by: Wolfram Sang <[email protected]>
ojeda pushed a commit to ojeda/linux that referenced this pull request Jan 13, 2022
rust: only require context when registering a `miscdev` device
akiernan pushed a commit to zuma-array/linux that referenced this pull request Nov 3, 2022
driver defect clean up:
torvalds#40
torvalds#41
torvalds#99
torvalds#100
torvalds#395
torvalds#396
torvalds#475
torvalds#614
torvalds#669

Change-Id: I581aaa8a1b950278bbf74d0c94aa647de89e07a9
Signed-off-by: Evoke Zhang <[email protected]>
akiernan pushed a commit to zuma-array/linux that referenced this pull request Nov 4, 2022
driver defect clean up:
torvalds#40
torvalds#41
torvalds#99
torvalds#100
torvalds#395
torvalds#396
torvalds#475
torvalds#614
torvalds#669

Change-Id: I581aaa8a1b950278bbf74d0c94aa647de89e07a9
Signed-off-by: Evoke Zhang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.