Skip to content

Bt codec fixes - #7035

Merged
lgirdwood merged 2 commits into
thesofproject:mainfrom
juimonen:bt_codec_fixes
Feb 7, 2023
Merged

Bt codec fixes#7035
lgirdwood merged 2 commits into
thesofproject:mainfrom
juimonen:bt_codec_fixes

Conversation

@juimonen

@juimonen juimonen commented Feb 2, 2023

Copy link
Copy Markdown

These are changes needed for bt offload to work with cavs-rt5682 topologies.

@kv2019i kv2019i 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 @juimonen , a few minor notes, but nothing to stop merge.

Comment thread tools/topology/topology2/platform/intel/bt-default.conf Outdated
Comment thread tools/topology/topology2/platform/intel/bt-generic.conf Outdated
@juimonen

juimonen commented Feb 3, 2023

Copy link
Copy Markdown
Author

updated:

  • reordered signed-off lines in commit message
  • commented in commit message the route reversal
  • added BT_PCM_NAME "Bluetooth" to align with topology1
  • SSP0/SSP2 switch topology bt_index = 1 (not 8)

@kv2019i
kv2019i requested a review from udaymb February 3, 2023 11:19
@kv2019i

kv2019i commented Feb 3, 2023

Copy link
Copy Markdown
Collaborator

Looks good! @udaymb can you approve when you are good with this as well?

Jaska Uimonen added 2 commits February 3, 2023 15:33
Fixes for adding bluetooth pipeline to real codec topologies:

- change bt pipe copier indexes from 5-6 to 7-8 for not to collide with
  main level topologies. This indexing is now aligned with nocodec and
  rt5682 topologies.
- add big route indexes (50x) for not to collide with main level
  topologies.
- introduce BT_ID to separate from BT_INDEX to match machine driver.
- align bt-ssp-config-lbm.conf and bt-ssp-config.conf hw_config names.
- switch BT_PB_HOST_PIPELINE_SINK and BT_PB_DAI_PIPELINE_SRC as the route
  was defined wrong way around. This was compensated by route definition
  in cavs-nocodec-bt.

Co-developed-by: Uday M Bhat <uday.m.bhat@intel.com>
Signed-off-by: Uday M Bhat <uday.m.bhat@intel.com>
Co-developed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
Add bluetooth pipeline to rt5682 topologies.

Co-developed-by: Uday M Bhat <uday.m.bhat@intel.com>
Signed-off-by: Uday M Bhat <uday.m.bhat@intel.com>
Co-developed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
@lgirdwood

Copy link
Copy Markdown
Member

@juimonen conflicts and still RFC now ?

@juimonen

juimonen commented Feb 3, 2023

Copy link
Copy Markdown
Author

@juimonen conflicts and still RFC now ?

Rebased now. Maybe @udaymb could still approve, we tested the "basic" topology, but not sof-mtl-max98357a-rt5682-ssp2-ssp0 (in real device), where ssp indexes are switched around. Can be however fixed later if problems found....

@juimonen juimonen changed the title [RFC] Bt codec fixes Bt codec fixes Feb 3, 2023
@lgirdwood
lgirdwood merged commit f63e535 into thesofproject:main Feb 7, 2023
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.

4 participants