Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb04ba33 authored by Rakesh Ughreja's avatar Rakesh Ughreja Committed by Takashi Iwai
Browse files

ALSA: hdac: add extended ops in the hdac_bus 



Add extended ops in the hdac_bus to allow calling the ASoC HDAC library
ops to reuse the legacy HDA codec drivers with ASoC framework.
Extended ops are used by the legacy codec drivers to call into
hdac_hda library, in the subsequent patches..

Signed-off-by: default avatarRakesh Ughreja <rakesh.a.ughreja@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6298542f

include/sound/hdaudio.h

+9 −0
Original line number Diff line number Diff line
@@ -213,6 +213,14 @@ struct hdac_bus_ops { 
	int (*link_power)(struct hdac_bus *bus, bool enable);

};



/*

 * ops used for ASoC HDA codec drivers

 */

struct hdac_ext_bus_ops {

	int (*hdev_attach)(struct hdac_device *hdev);

	int (*hdev_detach)(struct hdac_device *hdev);

};



/*

 * Lowlevel I/O operators

 */
@@ -265,6 +273,7 @@ struct hdac_bus { 
	struct device *dev;

	const struct hdac_bus_ops *ops;

	const struct hdac_io_ops *io_ops;

	const struct hdac_ext_bus_ops *ext_ops;



	/* h/w resources */

	unsigned long addr;

include/sound/hdaudio_ext.h

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


int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,

		      const struct hdac_bus_ops *ops,

		      const struct hdac_io_ops *io_ops);

		      const struct hdac_io_ops *io_ops,

		      const struct hdac_ext_bus_ops *ext_ops);



void snd_hdac_ext_bus_exit(struct hdac_bus *bus);

int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr,

sound/hda/ext/hdac_ext_bus.c

+3 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ static const struct hdac_io_ops hdac_ext_default_io = { 
 */

int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,

			const struct hdac_bus_ops *ops,

			const struct hdac_io_ops *io_ops)

			const struct hdac_io_ops *io_ops,

			const struct hdac_ext_bus_ops *ext_ops)

{

	int ret;

	static int idx;
@@ -102,6 +103,7 @@ int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev, 
	if (ret < 0)

		return ret;



	bus->ext_ops = ext_ops;

	INIT_LIST_HEAD(&bus->hlink_list);

	bus->idx = idx++;

sound/soc/intel/skylake/skl.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static int skl_create(struct pci_dev *pci, 
	}



	bus = skl_to_bus(skl);

	snd_hdac_ext_bus_init(bus, &pci->dev, &bus_core_ops, io_ops);

	snd_hdac_ext_bus_init(bus, &pci->dev, &bus_core_ops, io_ops, NULL);

	bus->use_posbuf = 1;

	skl->pci = pci;

	INIT_WORK(&skl->probe_work, skl_probe_work);