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

Commit ba40a854 authored by Dan Williams's avatar Dan Williams Committed by Mark Brown
Browse files

ASoC: Intel: switch from ioremap_cache to memremap 



In preparation for deprecating ioremap_cache() convert its usage in
skl-nhlt to memremap.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ef3e199a

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ static u8 OSC_UUID[16] = {0x6E, 0x88, 0x9F, 0xA6, 0xEB, 0x6C, 0x94, 0x45, 




#define DSDT_NHLT_PATH "\\_SB.PCI0.HDAS"

#define DSDT_NHLT_PATH "\\_SB.PCI0.HDAS"





void __iomem *skl_nhlt_init(struct device *dev)

void *skl_nhlt_init(struct device *dev)

{

{

	acpi_handle handle;

	acpi_handle handle;

	union acpi_object *obj;

	union acpi_object *obj;
@@ -40,17 +40,17 @@ void __iomem *skl_nhlt_init(struct device *dev) 
	if (obj && obj->type == ACPI_TYPE_BUFFER) {

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

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

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





		return ioremap_cache(nhlt_ptr->min_addr, nhlt_ptr->length);

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

				MEMREMAP_WB);

	}

	}





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

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

	return NULL;

	return NULL;

}

}





void skl_nhlt_free(void __iomem *addr)

void skl_nhlt_free(void *addr)

{

{

	iounmap(addr);

	memunmap(addr);

	addr = NULL;

}

}





static struct nhlt_specific_cfg *skl_get_specific_cfg(

static struct nhlt_specific_cfg *skl_get_specific_cfg(

sound/soc/intel/skylake/skl.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ struct skl { 
	unsigned int init_failed:1; /* delayed init failed */

	unsigned int init_failed:1; /* delayed init failed */

	struct platform_device *dmic_dev;

	struct platform_device *dmic_dev;





	void __iomem *nhlt; /* nhlt ptr */

	void *nhlt; /* nhlt ptr */

	struct skl_sst *skl_sst; /* sst skl ctx */

	struct skl_sst *skl_sst; /* sst skl ctx */





	struct skl_dsp_resource resource;

	struct skl_dsp_resource resource;
@@ -83,8 +83,8 @@ struct skl_dma_params { 
int skl_platform_unregister(struct device *dev);

int skl_platform_unregister(struct device *dev);

int skl_platform_register(struct device *dev);

int skl_platform_register(struct device *dev);





void __iomem *skl_nhlt_init(struct device *dev);

void *skl_nhlt_init(struct device *dev);

void skl_nhlt_free(void __iomem *addr);

void skl_nhlt_free(void *addr);

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

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 link_type, u8 s_fmt, u8 no_ch, u32 s_rate, u8 dirn);