Unverified Commit 18227585 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-mlink: move to a dedicated module 



Some of the functions will be used for SoundWire enumeration and power
management, to avoid cycles in module dependencies and simplify
integration all the HDaudio multi-link needs to move to a dedicated
module.

Drop no longer needed headers at the same time.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20230404104127.5629-6-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 68376a3e

include/sound/hda-mlink.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */

/*

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * Copyright(c) 2022-2023 Intel Corporation. All rights reserved.

 */



struct hdac_bus;



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_MLINK)



int hda_bus_ml_get_capabilities(struct hdac_bus *bus);

void hda_bus_ml_free(struct hdac_bus *bus);

void hda_bus_ml_put_all(struct hdac_bus *bus);

void hda_bus_ml_reset_losidv(struct hdac_bus *bus);

int hda_bus_ml_resume(struct hdac_bus *bus);

int hda_bus_ml_suspend(struct hdac_bus *bus);



#else



static inline int

hda_bus_ml_get_capabilities(struct hdac_bus *bus) { return 0; }



static inline void hda_bus_ml_free(struct hdac_bus *bus) { }

static inline void hda_bus_ml_put_all(struct hdac_bus *bus) { }

static inline void hda_bus_ml_reset_losidv(struct hdac_bus *bus) { }

static inline int hda_bus_ml_resume(struct hdac_bus *bus) { return 0; }

static inline int hda_bus_ml_suspend(struct hdac_bus *bus) { return 0; }



#endif /* CONFIG_SND_SOC_SOF_HDA */

sound/soc/sof/intel/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -269,6 +269,13 @@ config SND_SOC_SOF_HDA_COMMON 
	select SND_INTEL_DSP_CONFIG

	select SND_SOC_SOF_HDA_LINK_BASELINE

	select SND_SOC_SOF_HDA_PROBES

	select SND_SOC_SOF_HDA_MLINK if SND_SOC_SOF_HDA_LINK

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.



config SND_SOC_SOF_HDA_MLINK

	tristate

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.

sound/soc/sof/intel/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ snd-sof-acpi-intel-bdw-objs := bdw.o 


snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \

				 hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \

				 hda-dai.o hda-dai-ops.o hda-bus.o hda-mlink.o \

				 hda-dai.o hda-dai-ops.o hda-bus.o \

				 skl.o hda-loader-skl.o \

				 apl.o cnl.o tgl.o icl.o mtl.o hda-common-ops.o



snd-sof-intel-hda-mlink-objs := hda-mlink.o



snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-probes.o



snd-sof-intel-hda-objs := hda-codec.o
@@ -19,6 +21,7 @@ obj-$(CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP) += snd-sof-intel-atom.o 
obj-$(CONFIG_SND_SOC_SOF_BAYTRAIL) += snd-sof-acpi-intel-byt.o

obj-$(CONFIG_SND_SOC_SOF_BROADWELL) += snd-sof-acpi-intel-bdw.o

obj-$(CONFIG_SND_SOC_SOF_HDA_COMMON) += snd-sof-intel-hda-common.o

obj-$(CONFIG_SND_SOC_SOF_HDA_MLINK) += snd-sof-intel-hda-mlink.o

obj-$(CONFIG_SND_SOC_SOF_HDA) += snd-sof-intel-hda.o



snd-sof-pci-intel-tng-objs := pci-tng.o

sound/soc/sof/intel/hda-ctrl.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <sound/hdaudio_ext.h>

#include <sound/hda_register.h>

#include <sound/hda_component.h>

#include <sound/hda-mlink.h>

#include "../ops.h"

#include "hda.h"

sound/soc/sof/intel/hda-dsp.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/module.h>

#include <sound/hdaudio_ext.h>

#include <sound/hda_register.h>

#include <sound/hda-mlink.h>

#include <trace/events/sof_intel.h>

#include "../sof-audio.h"

#include "../ops.h"