Commit 1169cbf6 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Takashi Iwai
Browse files

ASoC: Intel: Skylake: use common NHLT module 



No functionality change, only use common functions now.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7a33ea70

sound/soc/intel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ config SND_SOC_INTEL_SKYLAKE_COMMON 
	select SND_SOC_INTEL_SST

	select SND_SOC_HDAC_HDA if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC

	select SND_SOC_ACPI_INTEL_MATCH

	select SND_INTEL_NHLT

	help

	  If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/

	  GeminiLake or CannonLake platform with the DSP enabled in the BIOS

sound/soc/intel/skylake/skl-nhlt.c

+0 −90
Original line number Diff line number Diff line
@@ -13,54 +13,6 @@ 
#include "skl.h"

#include "skl-i2s.h"



#define NHLT_ACPI_HEADER_SIG	"NHLT"



/* Unique identification for getting NHLT blobs */

static guid_t osc_guid =

	GUID_INIT(0xA69F886E, 0x6CEB, 0x4594,

		  0xA4, 0x1F, 0x7B, 0x5D, 0xCE, 0x24, 0xC5, 0x53);





struct nhlt_acpi_table *skl_nhlt_init(struct device *dev)

{

	acpi_handle handle;

	union acpi_object *obj;

	struct nhlt_resource_desc  *nhlt_ptr = NULL;

	struct nhlt_acpi_table *nhlt_table = NULL;



	handle = ACPI_HANDLE(dev);

	if (!handle) {

		dev_err(dev, "Didn't find ACPI_HANDLE\n");

		return NULL;

	}



	obj = acpi_evaluate_dsm(handle, &osc_guid, 1, 1, NULL);

	if (obj && obj->type == ACPI_TYPE_BUFFER) {

		nhlt_ptr = (struct nhlt_resource_desc  *)obj->buffer.pointer;

		if (nhlt_ptr->length)

			nhlt_table = (struct nhlt_acpi_table *)

				memremap(nhlt_ptr->min_addr, nhlt_ptr->length,

				MEMREMAP_WB);

		ACPI_FREE(obj);

		if (nhlt_table && (strncmp(nhlt_table->header.signature,

					NHLT_ACPI_HEADER_SIG,

					strlen(NHLT_ACPI_HEADER_SIG)) != 0)) {

			memunmap(nhlt_table);

			dev_err(dev, "NHLT ACPI header signature incorrect\n");

			return NULL;

		}

		return nhlt_table;

	}



	dev_err(dev, "device specific method to extract NHLT blob failed\n");

	return NULL;

}



void skl_nhlt_free(struct nhlt_acpi_table *nhlt)

{

	memunmap((void *) nhlt);

}



static struct nhlt_specific_cfg *skl_get_specific_cfg(

		struct device *dev, struct nhlt_fmt *fmt,

		u8 no_ch, u32 rate, u16 bps, u8 linktype)
@@ -163,48 +115,6 @@ struct nhlt_specific_cfg 
	return NULL;

}



int skl_get_dmic_geo(struct skl *skl)

{

	struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt;

	struct nhlt_endpoint *epnt;

	struct nhlt_dmic_array_config *cfg;

	struct device *dev = &skl->pci->dev;

	unsigned int dmic_geo = 0;

	u8 j;



	if (!nhlt)

		return 0;



	epnt = (struct nhlt_endpoint *)nhlt->desc;



	for (j = 0; j < nhlt->endpoint_count; j++) {

		if (epnt->linktype == NHLT_LINK_DMIC) {

			cfg = (struct nhlt_dmic_array_config  *)

					(epnt->config.caps);

			switch (cfg->array_type) {

			case NHLT_MIC_ARRAY_2CH_SMALL:

			case NHLT_MIC_ARRAY_2CH_BIG:

				dmic_geo |= MIC_ARRAY_2CH;

				break;



			case NHLT_MIC_ARRAY_4CH_1ST_GEOM:

			case NHLT_MIC_ARRAY_4CH_L_SHAPED:

			case NHLT_MIC_ARRAY_4CH_2ND_GEOM:

				dmic_geo |= MIC_ARRAY_4CH;

				break;



			default:

				dev_warn(dev, "undefined DMIC array_type 0x%0x\n",

						cfg->array_type);



			}

		}

		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length);

	}



	return dmic_geo;

}



static void skl_nhlt_trim_space(char *trim)

{

	char *s = trim;

sound/soc/intel/skylake/skl.c

+8 −4
Original line number Diff line number Diff line
@@ -26,9 +26,11 @@ 
#include <sound/hdaudio.h>

#include <sound/hda_i915.h>

#include <sound/hda_codec.h>

#include <sound/intel-nhlt.h>

#include "skl.h"

#include "skl-sst-dsp.h"

#include "skl-sst-ipc.h"



#if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC)

#include "../../../soc/codecs/hdac_hda.h"

#endif
@@ -516,7 +518,9 @@ static int skl_find_machine(struct skl *skl, void *driver_data) 


	if (pdata) {

		skl->use_tplg_pcm = pdata->use_tplg_pcm;

		mach->mach_params.dmic_num = skl_get_dmic_geo(skl);

		mach->mach_params.dmic_num =

			intel_nhlt_get_dmic_geo(&skl->pci->dev,

						skl->nhlt);

	}



	return 0;
@@ -1029,7 +1033,7 @@ static int skl_probe(struct pci_dev *pci, 


	device_disable_async_suspend(bus->dev);



	skl->nhlt = skl_nhlt_init(bus->dev);

	skl->nhlt = intel_nhlt_init(bus->dev);



	if (skl->nhlt == NULL) {

#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC)
@@ -1095,7 +1099,7 @@ static int skl_probe(struct pci_dev *pci, 
out_clk_free:

	skl_clock_device_unregister(skl);

out_nhlt_free:

	skl_nhlt_free(skl->nhlt);

	intel_nhlt_free(skl->nhlt);

out_free:

	skl_free(bus);
@@ -1144,7 +1148,7 @@ static void skl_remove(struct pci_dev *pci) 
	skl_dmic_device_unregister(skl);

	skl_clock_device_unregister(skl);

	skl_nhlt_remove_sysfs(skl);

	skl_nhlt_free(skl->nhlt);

	intel_nhlt_free(skl->nhlt);

	skl_free(bus);

	dev_set_drvdata(&pci->dev, NULL);

}

sound/soc/intel/skylake/skl.h

+0 −3
Original line number Diff line number Diff line
@@ -128,13 +128,10 @@ struct skl_dsp_ops { 
int skl_platform_unregister(struct device *dev);

int skl_platform_register(struct device *dev);



struct nhlt_acpi_table *skl_nhlt_init(struct device *dev);

void skl_nhlt_free(struct nhlt_acpi_table *addr);

struct nhlt_specific_cfg *skl_get_ep_blob(struct skl *skl, u32 instance,

					u8 link_type, u8 s_fmt, u8 no_ch,

					u32 s_rate, u8 dirn, u8 dev_type);



int skl_get_dmic_geo(struct skl *skl);

int skl_nhlt_update_topology_bin(struct skl *skl);

int skl_init_dsp(struct skl *skl);

int skl_free_dsp(struct skl *skl);