diff options
| author | Mark Brown <broonie@kernel.org> | 2019-06-07 00:44:24 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-07 00:44:24 +0300 |
| commit | a8e992342ce4cd173d437d0aa4eecc9e30489f72 (patch) | |
| tree | dbb45d586ed7370e32c006c506d6954d06779914 /sound/soc/sof | |
| parent | adb76b5b9c4740a11f6ad6c68764515961ae8ade (diff) | |
| parent | 04268bf2757a125616b6c2140e6250f43b7b737a (diff) | |
| download | linux-a8e992342ce4cd173d437d0aa4eecc9e30489f72.tar.xz | |
Merge branch 'asoc-5.2' into asoc-5.3
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/intel/hda.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index bb5f02f4e49a..47b508463218 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -227,7 +227,9 @@ static int hda_init(struct snd_sof_dev *sdev) /* initialise hdac bus */ bus->addr = pci_resource_start(pci, 0); +#if IS_ENABLED(CONFIG_PCI) bus->remap_addr = pci_ioremap_bar(pci, 0); +#endif if (!bus->remap_addr) { dev_err(bus->dev, "error: ioremap error\n"); return -ENXIO; @@ -454,7 +456,9 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) goto hdac_bus_unmap; /* DSP base */ +#if IS_ENABLED(CONFIG_PCI) sdev->bar[HDA_DSP_BAR] = pci_ioremap_bar(pci, HDA_DSP_BAR); +#endif if (!sdev->bar[HDA_DSP_BAR]) { dev_err(sdev->dev, "error: ioremap error\n"); ret = -ENXIO; |