• Cristian Ciocaltea's avatar
    ASoC: amd: vangogh: Allow probing ACP PCI when SOF is disabled · 2cef11ec
    Cristian Ciocaltea authored
    Since commit e89f45ed ("ASoC: amd: vangogh: Add check for acp config
    flags in vangogh platform"), the Vangogh ACP PCI driver could not be used
    anymore for boards which happen to have a matching entry in acp-config
    list.
    
    Commit f18818eb ("ASoC: amd: vangogh: Add condition check for acp
    config flag") slightly changed the behaviour to permit loading the
    driver if AMD_LEGACY flag is set.  However, for AMD_SOF flag the probing
    is still denied, even if SOF support is disabled in kernel
    configuration.
    
    While this helps preventing conflicts between SOF and generic ACP
    drivers, there are cases where a fallback to the generic non-SOF support
    would still be needed or useful, e.g. SOF firmware is not available or
    doesn't work properly, SOF driver is broken or doesn't provide full
    support for a particular hardware, or simply for testing/debugging the
    alternative solution.  A real-life example is Steam Deck OLED, which
    works with both drivers.
    
    Prevent returning from probe() when ACP config indicates SOF support for
    the current board *and* the Vangogh SOF driver is not enabled in kernel
    configuration.
    Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
    Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
    Link: https://msgid.link/r/20231209203229.878730-3-cristian.ciocaltea@collabora.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
    2cef11ec
pci-acp5x.c 8.07 KB