Unverified Commit 49a24e9d authored by Mark Brown's avatar Mark Brown
Browse files

Make the SOF control, PCM and PM code IPC agnostic 

Merge series from Ranjani Sridharan <ranjani.sridharan@linux.intel.com>:

This series is a continuation to the SOF IPC abstraction work to support
the new IPC version introduced in the SOF firmware. It makes the top-level
control IO, PCM and PM code IPC-agnostic. Other than the first patch,
the rest are purely for abstraction and include no changes in
functionality.
parents c639e85e 85f7a8b6

sound/soc/sof/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\

		control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o\

		ipc3-topology.o

		ipc3-topology.o ipc3.o ipc3-control.o ipc3-pcm.o

ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),)

snd-sof-objs += sof-client.o

endif

sound/soc/sof/control.c

+64 −481

File changed.

Preview size limit exceeded, changes collapsed.

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

+13 −84

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/sof/intel/hda.c

+44 −125

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/sof/intel/hda.h

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <sound/hda_codec.h>

#include <sound/hdaudio_ext.h>

#include "../sof-client-probes.h"

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

#include "shim.h"



/* PCI registers */
@@ -730,8 +731,10 @@ int hda_pci_intel_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) 


struct snd_sof_dai;

struct sof_ipc_dai_config;

int hda_ctrl_dai_widget_setup(struct snd_soc_dapm_widget *w, unsigned int quirk_flags);

int hda_ctrl_dai_widget_free(struct snd_soc_dapm_widget *w, unsigned int quirk_flags);

int hda_ctrl_dai_widget_setup(struct snd_soc_dapm_widget *w, unsigned int quirk_flags,

			      struct snd_sof_dai_config_data *data);

int hda_ctrl_dai_widget_free(struct snd_soc_dapm_widget *w, unsigned int quirk_flags,

			     struct snd_sof_dai_config_data *data);



#define SOF_HDA_POSITION_QUIRK_USE_SKYLAKE_LEGACY	(0) /* previous implementation */

#define SOF_HDA_POSITION_QUIRK_USE_DPIB_REGISTERS	(1) /* recommended if VC0 only */