On Fri, 15 Dec 2017 12:30:43 +0100, Rakesh Ughreja wrote:
This patch adds ASoC based HDA codec driver that can be used with all Intel platforms.
Signed-off-by: Rakesh Ughreja rakesh.a.ughreja@intel.com
sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/hda_generic.c | 25 ++++++++++++ sound/soc/codecs/Kconfig | 6 +++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdac_hda.c | 94 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/hdac_hda.h | 22 ++++++++++ sound/soc/intel/skylake/skl.c | 10 ++++- 7 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 sound/soc/codecs/hdac_hda.c create mode 100644 sound/soc/codecs/hdac_hda.h
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index ef626cf..1525c5a 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -96,6 +96,7 @@ typedef int (*hda_codec_patch_t)(struct hda_codec *);
struct hda_codec_driver { struct hdac_driver core;
- struct hdac_driver *asocdrv; const struct hda_device_id *id;
};
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 09ab02e..e0b46a4 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -38,6 +38,7 @@ #include "hda_jack.h" #include "hda_beep.h" #include "hda_generic.h" +#include "../../sound/soc/codecs/hdac_hda.h"
/** @@ -5964,12 +5965,36 @@ static int snd_hda_parse_generic_codec(struct hda_codec *codec) int __hda_codec_driver_register(struct hda_codec_driver *drv, const char *name, struct module *owner) {
- int ret;
- /*
* Register ASoC HDA driver as well*/- if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDA)) {
drv->core.id_table = drv->id;drv->asocdrv = kmalloc(sizeof(*drv->asocdrv), GFP_KERNEL);if (!drv->asocdrv)return -ENOMEM;ret = __hdac_hda_codec_driver_register(&drv->core, name, owner);if (ret < 0)return ret;- }
Hrm, now I see why you moved the function. But this change essentially means that the code-path is always enabled when the ASoC HD-audio driver is *built*. Distros may build both but blacklist, and it would break the legacy driver.
Can we check differently? For example, we may put some difference in the driver and check it here instead of the static IS_ENABLED(). The code can be put with #if IS_ENABLED() for optimization, but the actual behavior should be runtime-dependent.
thanks,
Takashi