Skip to content

RT5682 sdw unified mach - #1912

Merged
kv2019i merged 2 commits into
thesofproject:topic/sof-devfrom
naveen-manohar:rt5682-sdw_unified_mach
Mar 20, 2020
Merged

RT5682 sdw unified mach#1912
kv2019i merged 2 commits into
thesofproject:topic/sof-devfrom
naveen-manohar:rt5682-sdw_unified_mach

Conversation

@naveen-manohar

@naveen-manoharnaveen-manohar commented Mar 19, 2020

Copy link
Copy Markdown

Patch for Debug_Purposes..
Based on #1889

@naveen-manohar

naveen-manohar commented Mar 19, 2020

Copy link
Copy Markdown
Author

Apologize for posting RT5682 machine driver patches before PR:1889 Merge.

Wanted to discuss and get guidance about the following error that I observe with the patch-rebased to PR:1889, the same issue was not observed with PR:1885

  1. Jack Detection works fine
  2. Observe following error during playback
    LOG
    [ 94.622100] intel-sdw sdw-master-0: failed to set stream pointer on codec dai rt5682-aif1
    [ 94.622108] intel-sdw sdw-master-0: ASoC: can't open interface SDW0 Pin2: -524
    [ 94.622116] SDW0-Playback: ASoC: BE open failed -524
    [ 94.622121] SDW0-headphone: ASoC: failed to start some BEs -524
    [ 94.622128] SDW0-headphone: ASoC: BE playback disconnect check for SDW0-Playback
    [ 94.622130] SDW0-headphone: freed DSP playback path SDW0-headphone -> SDW0-Playback
    [ 94.622258] rt5682 sdw:0:25d:5682:0: Parity error detected
    [ 94.622519] intel-sdw sdw-master-0: Slave status change
    [ 112.360613] SDW0-headphone: ASoC: found 0 audio playback paths
    [ 112.360619] SDW0-headphone: ASoC: SDW0-headphone no valid playback route
    [ 112.360623] sof_sdw sof_sdw: ASoC: find BE for widget ALH2.OUT
    [ 112.360625] sof_sdw sof_sdw: ASoC: try BE : ALH2.OUT
    [ 112.360628] SDW0-headphone: connected new DPCM playback path SDW0-headphone -> SDW0-Playback
    [ 112.360651] SDW0-headphone: ASoC: found 1 new BE paths
    [ 112.360653] SDW0-Playback: ASoC: open playback BE SDW0-Playback

lyakh
lyakh requested changes Mar 19, 2020
View reviewed changes
Comment threadsound/soc/intel/boards/sof_sdw_rt5682.c
@naveen-manohar
naveen-manoharforce-pushed the rt5682-sdw_unified_mach branch from 0c92b28 to dd3d31bCompareMarch 19, 2020 14:03
@naveen-manoharnaveen-manohar changed the title [WIP] RT5682 sdw unified machRT5682 sdw unified machMar 19, 2020
@naveen-manohar
naveen-manoharforce-pushed the rt5682-sdw_unified_mach branch from dd3d31b to 73fe6e2CompareMarch 19, 2020 14:14
plbossart
plbossart requested changes Mar 19, 2020
View reviewed changes

@plbossartplbossart left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @naveen-manohar really pleased with this code. Minor comments below but that's really the direction we should follow.

Comment threadsound/soc/intel/boards/sof_sdw_rt5682.c Outdated
Comment threadsound/soc/intel/common/soc-acpi-intel-tgl-match.c Outdated
@plbossartplbossart mentioned this pull request Mar 19, 2020
Closed
@naveen-manohar
naveen-manoharforce-pushed the rt5682-sdw_unified_mach branch from 73fe6e2 to 3c95545CompareMarch 19, 2020 18:11
@plbossart

plbossart commented Mar 19, 2020

Copy link
Copy Markdown
Member

@naveen-manohar please rebase on top of topic/sof-dev, thanks

plbossart
plbossart requested changes Mar 19, 2020
View reviewed changes

@plbossartplbossart left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor change in the Kconfig, otherwise ok once it's rebased

Comment threadsound/soc/intel/boards/Kconfig Outdated
@naveen-manohar
naveen-manoharforce-pushed the rt5682-sdw_unified_mach branch from 3c95545 to 1621191CompareMarch 19, 2020 23:09
@naveen-manohar

naveen-manohar commented Mar 19, 2020

Copy link
Copy Markdown
Author

@naveen-manohar please rebase on top of topic/sof-dev, thanks

Done.. Thanks

plbossart
plbossart previously approved these changes Mar 19, 2020
View reviewed changes

@plbossartplbossart left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @naveen-manohar, nice work.

RanderWang
RanderWang previously approved these changes Mar 20, 2020
View reviewed changes
lyakh
lyakh reviewed Mar 20, 2020
View reviewed changes
Comment threadsound/soc/intel/boards/sof_sdw_rt5682.c
lyakh
lyakh reviewed Mar 20, 2020
View reviewed changes
Comment threadsound/soc/intel/boards/sof_sdw_rt5682.c

ret = snd_soc_dapm_add_routes(&card->dapm, rt5682_map,
ARRAY_SIZE(rt5682_map));

@lyakhlyakhMar 20, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comment below

lyakh
lyakh previously approved these changes Mar 20, 2020
View reviewed changes
kv2019i
kv2019i requested changes Mar 20, 2020
View reviewed changes

@kv2019ikv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, code looks good. I do have a question about the first patch.. there's seems to be a disconnect between commit message and the changes. Please see inline.

Comment threadsound/soc/intel/boards/sof_sdw_rt5682.c
Comment threadsound/soc/intel/boards/sof_sdw.c
@naveen-manohar
naveen-manoharforce-pushed the rt5682-sdw_unified_mach branch from 1621191 to abc6b03CompareMarch 20, 2020 09:38
kv2019i
kv2019i previously approved these changes Mar 20, 2020
View reviewed changes

@kv2019ikv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @naveen-manohar

@plbossart We ended up just updating the commit message and not splitting the patch. Please check again and if ok, let's merge.

@naveen-manohar
naveen-manoharforce-pushed the rt5682-sdw_unified_mach branch from abc6b03 to 65b7046CompareMarch 20, 2020 10:02
kv2019i
kv2019i previously approved these changes Mar 20, 2020
View reviewed changes
@naveen-manohar
ASoC: Intel: sof_sdw: Add Volteer support with RT5682 SNDW helper fun…
ce85c39
…ction
Add support for Google Volteer device. As per new unified soundwire machine
driver, add rt5682-sdw helper function, which configures codec to Link0.
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
@naveen-manohar
ASoC: Intel: common: add match table for TGL RT5682 SoundWire driver
50956f0
RT5682 is in SoundWire mode on link0.
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
plbossart
plbossart requested changes Mar 20, 2020
View reviewed changes

@plbossartplbossart left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the newline change is not good IMHO. We want the VOLUME keys handled as a separate block, and btw we should have the same style in different files, so if we change here for rt5682 we also change for RT711 and RT700

Comment threadsound/soc/intel/boards/sof_sdw_rt5682.c
@naveen-manohar
naveen-manoharforce-pushed the rt5682-sdw_unified_mach branch from 65b7046 to 50956f0CompareMarch 20, 2020 12:14
plbossart
plbossart approved these changes Mar 20, 2020
View reviewed changes

@plbossartplbossart left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can do the newline removal in a followup PR for all jack codecs, for now this is good enough. Thanks @naveen-manohar

@kv2019i

kv2019i commented Mar 20, 2020

Copy link
Copy Markdown
Collaborator

Ok, if the newlines are ok, let's go ahead and merged. Only known CI failures in the report.

@kv2019i
kv2019i merged commit 9b5b6c2 into thesofproject:topic/sof-devMar 20, 2020
oder-chiou pushed a commit to oder-chiou/linux-soundwire that referenced this pull request May 5, 2026
@pseiderer@kuba-moo
net: pktgen: fix code style (ERROR: "foo * bar" should be "foo *bar")
81e92f4
Fix checkpatch code style errors:
ERROR: "foo * bar" should be "foo *bar"
thesofproject#977: FILE: net/core/pktgen.c:977:
+ const char __user * user_buffer, size_t count,
ERROR: "foo * bar" should be "foo *bar"
thesofproject#978: FILE: net/core/pktgen.c:978:
+ loff_t * offset)
ERROR: "foo * bar" should be "foo *bar"
thesofproject#1912: FILE: net/core/pktgen.c:1912:
+ const char __user * user_buffer,
ERROR: "foo * bar" should be "foo *bar"
thesofproject#1913: FILE: net/core/pktgen.c:1913:
+ size_t count, loff_t * offset)
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@plbossartplbossartplbossart approved these changes
@kv2019ikv2019ikv2019i approved these changes
@dbalutadbalutaAwaiting requested review from dbalutadbaluta is a code owner
@lgirdwoodlgirdwoodAwaiting requested review from lgirdwoodlgirdwood is a code owner
@ranj063ranj063Awaiting requested review from ranj063ranj063 is a code owner
@lyakhlyakhAwaiting requested review from lyakh
@RanderWangRanderWangAwaiting requested review from RanderWang

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@naveen-manohar@plbossart@kv2019i@lyakh@RanderWang