Merge branch 'topic/hda' into for-next

diff --combined sound/pci/hda/hda_intel.c
index 5aa5cfa517aa383b56936355473a1b12ea72f3c0,f7cdf4d2e24ec77affc2999d9d20e41b09f7a2b2..87df90d245bc7f9725329e5552d79749dca51284
--- 1/sound/pci/hda/hda_intel.c
--- 2/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -297,9 -297,6 +297,9 @@@ enum 
         AZX_DCAPS_PM_RUNTIME | AZX_DCAPS_I915_POWERWELL |\
         AZX_DCAPS_SNOOP_TYPE(SCH))
  
 +#define AZX_DCAPS_INTEL_BAYTRAIL \
 +      (AZX_DCAPS_INTEL_PCH_NOPM | AZX_DCAPS_I915_POWERWELL)
 +
  #define AZX_DCAPS_INTEL_BRASWELL \
        (AZX_DCAPS_INTEL_PCH | AZX_DCAPS_I915_POWERWELL)
  
@@@ -1574,11 -1571,11 +1574,11 @@@ static int azx_first_init(struct azx *c
        /* allow 64bit DMA address if supported by H/W */
        if (!(gcap & AZX_GCAP_64OK))
                dma_bits = 32;
 -      if (!pci_set_dma_mask(pci, DMA_BIT_MASK(dma_bits))) {
 -              pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(dma_bits));
 +      if (!dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {
 +              dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits));
        } else {
 -              pci_set_dma_mask(pci, DMA_BIT_MASK(32));
 -              pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32));
 +              dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
 +              dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32));
        }
  
        /* read number of streams from GCAP register instead of using
@@@ -1907,8 -1904,6 +1907,6 @@@ static int azx_probe_continue(struct az
                if (pci->device != 0x0f04 && pci->device != 0x2284)
                        hda->need_i915_power = 1;
  
- 
- #ifdef CONFIG_SND_HDA_I915
                err = hda_i915_init(hda);
                if (err < 0)
                        goto i915_power_fail;
@@@ -1919,7 -1914,6 +1917,6 @@@
                                "Cannot turn on display power on i915\n");
                        goto i915_power_fail;
                }
- #endif
        }
  
        err = azx_first_init(chip);
@@@ -2053,7 -2047,7 +2050,7 @@@ static const struct pci_device_id azx_i
          .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
        /* BayTrail */
        { PCI_DEVICE(0x8086, 0x0f04),
 -        .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
 +        .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL },
        /* Braswell */
        { PCI_DEVICE(0x8086, 0x2284),
          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL },