UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Intel: Skylake: modify skl_get_dsp_ops() 

To query the ops used for a platform, we use skl_get_dsp_ops() which return
index and then we load the ops.

Rather than this return the ops, this way it cna be used later to query the
ops in rest of the driver.

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Vinod Koul 2016-07-26 18:06:41 +05:30 committed by Mark Brown
parent b7c505554c
commit 73a675816d
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/soc/intel/skylake/skl-messages.c
View File

@ -219,16 +219,16 @@ static const struct skl_dsp_ops dsp_ops[] = {
}, },
}; };
static int skl_get_dsp_ops(int pci_id) const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(dsp_ops); i++) { for (i = 0; i < ARRAY_SIZE(dsp_ops); i++) {
if (dsp_ops[i].id == pci_id) if (dsp_ops[i].id == pci_id)
return i; return &dsp_ops[i];
} }
return -EINVAL; return NULL;
} }
int skl_init_dsp(struct skl *skl) int skl_init_dsp(struct skl *skl)
@ -238,7 +238,8 @@ int skl_init_dsp(struct skl *skl)
struct hdac_bus *bus = ebus_to_hbus(ebus); struct hdac_bus *bus = ebus_to_hbus(ebus);
struct skl_dsp_loader_ops loader_ops; struct skl_dsp_loader_ops loader_ops;
int irq = bus->irq; int irq = bus->irq;
int ret, index; const struct skl_dsp_ops *ops;
int ret;
/* enable ppcap interrupt */ /* enable ppcap interrupt */
snd_hdac_ext_bus_ppcap_enable(&skl->ebus, true); snd_hdac_ext_bus_ppcap_enable(&skl->ebus, true);
@ -251,13 +252,14 @@ int skl_init_dsp(struct skl *skl)
return -ENXIO; return -ENXIO;
} }
index = skl_get_dsp_ops(skl->pci->device); ops = skl_get_dsp_ops(skl->pci->device);
if (index < 0) if (!ops)
return -EINVAL; return -EIO;
loader_ops = dsp_ops[index].loader_ops(); loader_ops = ops->loader_ops();
ret = dsp_ops[index].init(bus->dev, mmio_base, irq, ret = ops->init(bus->dev, mmio_base, irq,
skl->fw_name, loader_ops, &skl->skl_sst); skl->fw_name, loader_ops,
&skl->skl_sst);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -273,16 +275,16 @@ int skl_free_dsp(struct skl *skl)
struct hdac_ext_bus *ebus = &skl->ebus; struct hdac_ext_bus *ebus = &skl->ebus;
struct hdac_bus *bus = ebus_to_hbus(ebus); struct hdac_bus *bus = ebus_to_hbus(ebus);
struct skl_sst *ctx = skl->skl_sst; struct skl_sst *ctx = skl->skl_sst;
int index; const struct skl_dsp_ops *ops;
/* disable ppcap interrupt */ /* disable ppcap interrupt */
snd_hdac_ext_bus_ppcap_int_enable(&skl->ebus, false); snd_hdac_ext_bus_ppcap_int_enable(&skl->ebus, false);
index = skl_get_dsp_ops(skl->pci->device); ops = skl_get_dsp_ops(skl->pci->device);
if (index < 0) if (!ops)
return -EIO; return -EIO;
dsp_ops[index].cleanup(bus->dev, ctx); ops->cleanup(bus->dev, ctx);
if (ctx->dsp->addr.lpe) if (ctx->dsp->addr.lpe)
iounmap(ctx->dsp->addr.lpe); iounmap(ctx->dsp->addr.lpe);

1
sound/soc/intel/skylake/skl.h
View File

@ -123,4 +123,5 @@ int skl_free_dsp(struct skl *skl);
int skl_suspend_dsp(struct skl *skl); int skl_suspend_dsp(struct skl *skl);
int skl_resume_dsp(struct skl *skl); int skl_resume_dsp(struct skl *skl);
void skl_cleanup_resources(struct skl *skl); void skl_cleanup_resources(struct skl *skl);
const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id);
#endif /* __SOUND_SOC_SKL_H */ #endif /* __SOUND_SOC_SKL_H */