Skip to content

Fix sdw machine drivers - #1794

Merged
plbossart merged 4 commits into
thesofproject:topic/sof-devfrom
plbossart:fix/sdw_machine_drivers
Feb 18, 2020
Merged

Fix sdw machine drivers#1794
plbossart merged 4 commits into
thesofproject:topic/sof-devfrom
plbossart:fix/sdw_machine_drivers

Conversation

@plbossart

Copy link
Copy Markdown
Member

The SoundWire machine drivers still have references to old stuff, remove.

Note for HDMI support: we may need to pass the codec_mask to make sure the iDISP codec is indeed enabled, instead of just a compilation option.

This is no longer supported

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This is no longer supported

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
…DMI support

CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC was removed, so use
CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC instead.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Now that we have dynamic handling of I2S/SoundWire in
sdw_rt711_rt1308_rt715, we have no longer a need for this machine
driver.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Comment thread sound/soc/intel/boards/sdw_rt711_rt1308_rt715.c

@bardliao bardliao 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.

LGTM

@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.

This looks good to go and is pretty urgent now given HDMI support is now broken due to removal of the COMMON_HDMI kconfig option in sof-dev.

@kv2019i

kv2019i commented Feb 17, 2020

Copy link
Copy Markdown
Collaborator

@RanderWang @lyakh Can you review this as well? If all looks good, we could merge this already today to fix the regression with sdw driver due to common-hdmi kconfig option removal.

@lyakh lyakh 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.

@RanderWang @lyakh Can you review this as well? If all looks good, we could merge this already today to fix the regression with sdw driver due to common-hdmi kconfig option removal.

@kv2019i I already commented to this PR, is that my comment wrong?

depends on SND_HDA_CODEC_HDMI
select SND_SOC_RT700_SDW
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_LINK

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.

I still see #if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI) in sound/soc/intel/boards/sdw_rt700.c - shouldn't all that code be converted or removed too?

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.

Ack @lyakh you are right, sdw_rt700.c needs further update with this patch.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

we'll do this later in a follow-up patch. sdw_rt700 is only for Intel reference boards, there's no product based on it.

@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.

Looks good, but sdw_rt700.c needs to drop the HDAC_HDMI ifdefs as well.

depends on SND_HDA_CODEC_HDMI
select SND_SOC_RT700_SDW
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_LINK

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.

Ack @lyakh you are right, sdw_rt700.c needs further update with this patch.

@plbossart
plbossart merged commit e280ec2 into thesofproject:topic/sof-dev Feb 18, 2020
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.

5 participants