84 files changed, 4229 insertions, 3076 deletions

diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 5a3163cac6c3..ec099d4343f2 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -11,7 +11,10 @@ ALC880
 
 ALC260
 ======
-  N/A
+  gpio1         Enable GPIO1
+  coef          Enable EAPD via COEF table
+  fujitsu       Quirk for FSC S7020
+  fujitsu-jwse  Quirk for FSC S7020 with jack modes and HP mic support
 
 ALC262
 ======
@@ -20,8 +23,9 @@ ALC262
 ALC267/268
 ==========
   inv-dmic      Inverted internal mic workaround
+  hp-eapd       Disable HP EAPD on NID 0x15
 
-ALC269/270/275/276/28x/29x
+ALC22x/23x/25x/269/27x/28x/29x (and vendor-specific ALC3xxx models)
 ======
   laptop-amic           Laptops with analog-mic input
   laptop-dmic           Laptops with digital-mic input
@@ -29,9 +33,15 @@ ALC269/270/275/276/28x/29x
   alc271-dmic           Enable ALC271X digital mic workaround
   inv-dmic              Inverted internal mic workaround
   headset-mic           Indicates a combined headset (headphone+mic) jack
+  headset-mode          More comprehensive headset support for ALC269 & co
+  headset-mode-no-hp-mic Headset mode support without headphone mic
   lenovo-dock           Enables docking station I/O for some Lenovos
+  hp-gpio-led           GPIO LED support on HP laptops
   dell-headset-multi    Headset jack, which can also be used as mic-in
   dell-headset-dock     Headset jack (without mic-in), and also dock I/O
+  alc283-dac-wcaps      Fixups for Chromebook with ALC283
+  alc283-sense-combo    Combo jack sensing on ALC283
+  tpt440-dock           Pin configs for Lenovo Thinkpad Dock support
 
 ALC66x/67x/892
 ==============
diff --git a/Documentation/sound/alsa/Jack-Controls.txt b/Documentation/sound/alsa/Jack-Controls.txt
new file mode 100644
index 000000000000..fe1c5e0c8555
--- /dev/null
+++ b/Documentation/sound/alsa/Jack-Controls.txt
@@ -0,0 +1,43 @@
+Why we need Jack kcontrols
+==========================
+
+ALSA uses kcontrols to export audio controls(switch, volume, Mux, ...)
+to user space. This means userspace applications like pulseaudio can
+switch off headphones and switch on speakers when no headphones are
+pluged in.
+
+The old ALSA jack code only created input devices for each registered
+jack. These jack input devices are not readable by userspace devices
+that run as non root.
+
+The new jack code creates embedded jack kcontrols for each jack that
+can be read by any process.
+
+This can be combined with UCM to allow userspace to route audio more
+intelligently based on jack insertion or removal events.
+
+Jack Kcontrol Internals
+=======================
+
+Each jack will have a kcontrol list, so that we can create a kcontrol
+and attach it to the jack, at jack creation stage. We can also add a
+kcontrol to an existing jack, at anytime when required.
+
+Those kcontrols will be freed automatically when the Jack is freed.
+
+How to use jack kcontrols
+=========================
+
+In order to keep compatibility, snd_jack_new() has been modified by
+adding two params :-
+
+ - @initial_kctl: if true, create a kcontrol and add it to the jack
+        list.
+ - @phantom_jack: Don't create a input device for phantom jacks.
+
+HDA jacks can set phantom_jack to true in order to create a phantom
+jack and set initial_kctl to true to create an initial kcontrol with
+the correct id.
+
+ASoC jacks should set initial_kctl as false. The pin name will be
+assigned as the jack kcontrol name.
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 3da1af46625c..7d88f4f51594 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6477,6 +6477,9 @@ enum skl_disp_power_wells {
 #define   AUDIO_CP_READY(trans)         ((1 << 1) << ((trans) * 4))
 #define   AUDIO_ELD_VALID(trans)        ((1 << 0) << ((trans) * 4))
 
+#define HSW_AUD_CHICKENBIT                      0x65f10
+#define   SKL_AUD_CODEC_WAKE_SIGNAL             (1 << 15)
+
 /* HSW Power Wells */
 #define HSW_PWR_WELL_BIOS                       0x45400 /* CTL1 */
 #define HSW_PWR_WELL_DRIVER                     0x45404 /* CTL2 */
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 2396cc702d18..ef342571ae6a 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -475,6 +475,32 @@ static void i915_audio_component_put_power(struct device *dev)
         intel_display_power_put(dev_to_i915(dev), POWER_DOMAIN_AUDIO);
 }
 
+static void i915_audio_component_codec_wake_override(struct device *dev,
+                                                     bool enable)
+{
+        struct drm_i915_private *dev_priv = dev_to_i915(dev);
+        u32 tmp;
+
+        if (!IS_SKYLAKE(dev_priv))
+                return;
+
+        /*
+         * Enable/disable generating the codec wake signal, overriding the
+         * internal logic to generate the codec wake to controller.
+         */
+        tmp = I915_READ(HSW_AUD_CHICKENBIT);
+        tmp &= ~SKL_AUD_CODEC_WAKE_SIGNAL;
+        I915_WRITE(HSW_AUD_CHICKENBIT, tmp);
+        usleep_range(1000, 1500);
+
+        if (enable) {
+                tmp = I915_READ(HSW_AUD_CHICKENBIT);
+                tmp |= SKL_AUD_CODEC_WAKE_SIGNAL;
+                I915_WRITE(HSW_AUD_CHICKENBIT, tmp);
+                usleep_range(1000, 1500);
+        }
+}
+
 /* Get CDCLK in kHz  */
 static int i915_audio_component_get_cdclk_freq(struct device *dev)
 {
@@ -495,6 +521,7 @@ static const struct i915_audio_component_ops i915_audio_component_ops = {
         .owner          = THIS_MODULE,
         .get_power      = i915_audio_component_get_power,
         .put_power      = i915_audio_component_put_power,
+        .codec_wake_override = i915_audio_component_codec_wake_override,
         .get_cdclk_freq = i915_audio_component_get_cdclk_freq,
 };
 
diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
index 3e2f22e5bf3c..c9a8b64aa33b 100644
--- a/include/drm/i915_component.h
+++ b/include/drm/i915_component.h
@@ -31,6 +31,7 @@ struct i915_audio_component {
                 struct module *owner;
                 void (*get_power)(struct device *);
                 void (*put_power)(struct device *);
+                void (*codec_wake_override)(struct device *, bool enable);
                 int (*get_cdclk_freq)(struct device *);
         } *ops;
 };
diff --git a/include/sound/control.h b/include/sound/control.h
index 95aad6d3fd1a..21d047f229a1 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -252,7 +252,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only);
  * Helper functions for jack-detection controls
  */
 struct snd_kcontrol *
-snd_kctl_jack_new(const char *name, int idx, void *private_data);
+snd_kctl_jack_new(const char *name, struct snd_card *card);
 void snd_kctl_jack_report(struct snd_card *card,
                           struct snd_kcontrol *kctl, bool status);
 
diff --git a/include/sound/core.h b/include/sound/core.h
index b12931f513f4..cdfecafff0f4 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -224,16 +224,13 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type);
 #endif
 
 int snd_minor_info_init(void);
-int snd_minor_info_done(void);
 
 /* sound_oss.c */
 
 #ifdef CONFIG_SND_OSSEMUL
 int snd_minor_info_oss_init(void);
-int snd_minor_info_oss_done(void);
 #else
 static inline int snd_minor_info_oss_init(void) { return 0; }
-static inline int snd_minor_info_oss_done(void) { return 0; }
 #endif
 
 /* memory.c */
@@ -262,7 +259,6 @@ int snd_card_free_when_closed(struct snd_card *card);
 void snd_card_set_id(struct snd_card *card, const char *id);
 int snd_card_register(struct snd_card *card);
 int snd_card_info_init(void);
-int snd_card_info_done(void);
 int snd_card_add_dev_attr(struct snd_card *card,
                           const struct attribute_group *group);
 int snd_component_add(struct snd_card *card, const char *component);
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 0de95ccb92cf..5bd134651f5e 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -41,7 +41,8 @@
 
 #define EMUPAGESIZE     4096
 #define MAXREQVOICES    8
-#define MAXPAGES        8192
+#define MAXPAGES0       4096    /* 32 bit mode */
+#define MAXPAGES1       8192    /* 31 bit mode */
 #define RESERVED        0
 #define NUM_MIDI        16
 #define NUM_G           64              /* use all channels */
@@ -50,8 +51,7 @@
 
 /* FIXME? - according to the OSS driver the EMU10K1 needs a 29 bit DMA mask */
 #define EMU10K1_DMA_MASK        0x7fffffffUL    /* 31bit */
-#define AUDIGY_DMA_MASK         0x7fffffffUL    /* 31bit FIXME - 32 should work? */
-                                                /* See ALSA bug #1276 - rlrevell */
+#define AUDIGY_DMA_MASK         0xffffffffUL    /* 32bit mode */
 
 #define TMEMSIZE        256*1024
 #define TMEMSIZEREG     4
@@ -466,8 +466,11 @@
 
 #define MAPB                    0x0d            /* Cache map B                                          */
 
-#define MAP_PTE_MASK            0xffffe000      /* The 19 MSBs of the PTE indexed by the PTI            */
-#define MAP_PTI_MASK            0x00001fff      /* The 13 bit index to one of the 8192 PTE dwords       */
+#define MAP_PTE_MASK0           0xfffff000      /* The 20 MSBs of the PTE indexed by the PTI            */
+#define MAP_PTI_MASK0           0x00000fff      /* The 12 bit index to one of the 4096 PTE dwords       */
+
+#define MAP_PTE_MASK1           0xffffe000      /* The 19 MSBs of the PTE indexed by the PTI            */
+#define MAP_PTI_MASK1           0x00001fff      /* The 13 bit index to one of the 8192 PTE dwords       */
 
 /* 0x0e, 0x0f: Not used */
 
@@ -1704,6 +1707,7 @@ struct snd_emu10k1 {
         unsigned short model;                   /* subsystem id */
         unsigned int card_type;                 /* EMU10K1_CARD_* */
         unsigned int ecard_ctrl;                /* ecard control bits */
+        unsigned int address_mode;              /* address mode */
         unsigned long dma_mask;                 /* PCI DMA mask */
         unsigned int delay_pcm_irq;             /* in samples */
         int max_cache_pages;                    /* max memory size / PAGE_SIZE */
diff --git a/include/sound/hda_i915.h b/include/sound/hda_i915.h
new file mode 100644
index 000000000000..adb5ba5cbd9d
--- /dev/null
+++ b/include/sound/hda_i915.h
@@ -0,0 +1,36 @@
+/*
+ * HD-Audio helpers to sync with i915 driver
+ */
+#ifndef __SOUND_HDA_I915_H
+#define __SOUND_HDA_I915_H
+
+#ifdef CONFIG_SND_HDA_I915
+int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable);
+int snd_hdac_display_power(struct hdac_bus *bus, bool enable);
+int snd_hdac_get_display_clk(struct hdac_bus *bus);
+int snd_hdac_i915_init(struct hdac_bus *bus);
+int snd_hdac_i915_exit(struct hdac_bus *bus);
+#else
+static int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable)
+{
+        return 0;
+}
+static inline int snd_hdac_display_power(struct hdac_bus *bus, bool enable)
+{
+        return 0;
+}
+static inline int snd_hdac_get_display_clk(struct hdac_bus *bus)
+{
+        return 0;
+}
+static inline int snd_hdac_i915_init(struct hdac_bus *bus)
+{
+        return -ENODEV;
+}
+static inline int snd_hdac_i915_exit(struct hdac_bus *bus)
+{
+        return 0;
+}
+#endif
+
+#endif /* __SOUND_HDA_I915_H */
diff --git a/include/sound/hda_register.h b/include/sound/hda_register.h
new file mode 100644
index 000000000000..0c7536e30fa4
--- /dev/null
+++ b/include/sound/hda_register.h
@@ -0,0 +1,156 @@
+/*
+ * HD-audio controller (Azalia) registers and helpers
+ *
+ * For traditional reasons, we still use azx_ prefix here
+ */
+
+#ifndef __SOUND_HDA_REGISTER_H
+#define __SOUND_HDA_REGISTER_H
+
+#include <linux/io.h>
+#include <sound/hdaudio.h>
+
+#define AZX_REG_GCAP                    0x00
+#define   AZX_GCAP_64OK         (1 << 0)   /* 64bit address support */
+#define   AZX_GCAP_NSDO         (3 << 1)   /* # of serial data out signals */
+#define   AZX_GCAP_BSS          (31 << 3)  /* # of bidirectional streams */
+#define   AZX_GCAP_ISS          (15 << 8)  /* # of input streams */
+#define   AZX_GCAP_OSS          (15 << 12) /* # of output streams */
+#define AZX_REG_VMIN                    0x02
+#define AZX_REG_VMAJ                    0x03
+#define AZX_REG_OUTPAY                  0x04
+#define AZX_REG_INPAY                   0x06
+#define AZX_REG_GCTL                    0x08
+#define   AZX_GCTL_RESET        (1 << 0)   /* controller reset */
+#define   AZX_GCTL_FCNTRL       (1 << 1)   /* flush control */
+#define   AZX_GCTL_UNSOL        (1 << 8)   /* accept unsol. response enable */
+#define AZX_REG_WAKEEN                  0x0c
+#define AZX_REG_STATESTS                0x0e
+#define AZX_REG_GSTS                    0x10
+#define   AZX_GSTS_FSTS         (1 << 1)   /* flush status */
+#define AZX_REG_INTCTL                  0x20
+#define AZX_REG_INTSTS                  0x24
+#define AZX_REG_WALLCLK                 0x30    /* 24Mhz source */
+#define AZX_REG_OLD_SSYNC               0x34    /* SSYNC for old ICH */
+#define AZX_REG_SSYNC                   0x38
+#define AZX_REG_CORBLBASE               0x40
+#define AZX_REG_CORBUBASE               0x44
+#define AZX_REG_CORBWP                  0x48
+#define AZX_REG_CORBRP                  0x4a
+#define   AZX_CORBRP_RST        (1 << 15)  /* read pointer reset */
+#define AZX_REG_CORBCTL                 0x4c
+#define   AZX_CORBCTL_RUN       (1 << 1)   /* enable DMA */
+#define   AZX_CORBCTL_CMEIE     (1 << 0)   /* enable memory error irq */
+#define AZX_REG_CORBSTS                 0x4d
+#define   AZX_CORBSTS_CMEI      (1 << 0)   /* memory error indication */
+#define AZX_REG_CORBSIZE                0x4e
+
+#define AZX_REG_RIRBLBASE               0x50
+#define AZX_REG_RIRBUBASE               0x54
+#define AZX_REG_RIRBWP                  0x58
+#define   AZX_RIRBWP_RST        (1 << 15)  /* write pointer reset */
+#define AZX_REG_RINTCNT                 0x5a
+#define AZX_REG_RIRBCTL                 0x5c
+#define   AZX_RBCTL_IRQ_EN      (1 << 0)   /* enable IRQ */
+#define   AZX_RBCTL_DMA_EN      (1 << 1)   /* enable DMA */
+#define   AZX_RBCTL_OVERRUN_EN  (1 << 2)   /* enable overrun irq */
+#define AZX_REG_RIRBSTS                 0x5d
+#define   AZX_RBSTS_IRQ         (1 << 0)   /* response irq */
+#define   AZX_RBSTS_OVERRUN     (1 << 2)   /* overrun irq */
+#define AZX_REG_RIRBSIZE                0x5e
+
+#define AZX_REG_IC                      0x60
+#define AZX_REG_IR                      0x64
+#define AZX_REG_IRS                     0x68
+#define   AZX_IRS_VALID         (1<<1)
+#define   AZX_IRS_BUSY          (1<<0)
+
+#define AZX_REG_DPLBASE                 0x70
+#define AZX_REG_DPUBASE                 0x74
+#define   AZX_DPLBASE_ENABLE    0x1     /* Enable position buffer */
+
+/* SD offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */
+enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
+
+/* stream register offsets from stream base */
+#define AZX_REG_SD_CTL                  0x00
+#define AZX_REG_SD_STS                  0x03
+#define AZX_REG_SD_LPIB                 0x04
+#define AZX_REG_SD_CBL                  0x08
+#define AZX_REG_SD_LVI                  0x0c
+#define AZX_REG_SD_FIFOW                0x0e
+#define AZX_REG_SD_FIFOSIZE             0x10
+#define AZX_REG_SD_FORMAT               0x12
+#define AZX_REG_SD_BDLPL                0x18
+#define AZX_REG_SD_BDLPU                0x1c
+
+/* Haswell/Broadwell display HD-A controller Extended Mode registers */
+#define AZX_REG_HSW_EM4                 0x100c
+#define AZX_REG_HSW_EM5                 0x1010
+
+/* PCI space */
+#define AZX_PCIREG_TCSEL                0x44
+
+/*
+ * other constants
+ */
+
+/* max number of fragments - we may use more if allocating more pages for BDL */
+#define BDL_SIZE                4096
+#define AZX_MAX_BDL_ENTRIES     (BDL_SIZE / 16)
+#define AZX_MAX_FRAG            32
+/* max buffer size - no h/w limit, you can increase as you like */
+#define AZX_MAX_BUF_SIZE        (1024*1024*1024)
+
+/* RIRB int mask: overrun[2], response[0] */
+#define RIRB_INT_RESPONSE       0x01
+#define RIRB_INT_OVERRUN        0x04
+#define RIRB_INT_MASK           0x05
+
+/* STATESTS int mask: S3,SD2,SD1,SD0 */
+#define STATESTS_INT_MASK       ((1 << HDA_MAX_CODECS) - 1)
+
+/* SD_CTL bits */
+#define SD_CTL_STREAM_RESET     0x01    /* stream reset bit */
+#define SD_CTL_DMA_START        0x02    /* stream DMA start bit */
+#define SD_CTL_STRIPE           (3 << 16)       /* stripe control */
+#define SD_CTL_TRAFFIC_PRIO     (1 << 18)       /* traffic priority */
+#define SD_CTL_DIR              (1 << 19)       /* bi-directional stream */
+#define SD_CTL_STREAM_TAG_MASK  (0xf << 20)
+#define SD_CTL_STREAM_TAG_SHIFT 20
+
+/* SD_CTL and SD_STS */
+#define SD_INT_DESC_ERR         0x10    /* descriptor error interrupt */
+#define SD_INT_FIFO_ERR         0x08    /* FIFO error interrupt */
+#define SD_INT_COMPLETE         0x04    /* completion interrupt */
+#define SD_INT_MASK             (SD_INT_DESC_ERR|SD_INT_FIFO_ERR|\
+                                 SD_INT_COMPLETE)
+
+/* SD_STS */
+#define SD_STS_FIFO_READY       0x20    /* FIFO ready */
+
+/* INTCTL and INTSTS */
+#define AZX_INT_ALL_STREAM      0xff       /* all stream interrupts */
+#define AZX_INT_CTRL_EN 0x40000000 /* controller interrupt enable bit */
+#define AZX_INT_GLOBAL_EN       0x80000000 /* global interrupt enable bit */
+
+/* below are so far hardcoded - should read registers in future */
+#define AZX_MAX_CORB_ENTRIES    256
+#define AZX_MAX_RIRB_ENTRIES    256
+
+/*
+ * helpers to read the stream position
+ */
+static inline unsigned int
+snd_hdac_stream_get_pos_lpib(struct hdac_stream *stream)
+{
+        return snd_hdac_stream_readl(stream, SD_LPIB);
+}
+
+static inline unsigned int
+snd_hdac_stream_get_pos_posbuf(struct hdac_stream *stream)
+{
+        return le32_to_cpu(*stream->posbuf);
+}
+
+#endif /* __SOUND_HDA_REGISTER_H */
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 2a8aa9dfb83d..64fff4db81bb 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -6,12 +6,18 @@
 #define __SOUND_HDAUDIO_H
 
 #include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/timecounter.h>
+#include <sound/core.h>
+#include <sound/memalloc.h>
 #include <sound/hda_verbs.h>
+#include <drm/i915_component.h>
 
 /* codec node id */
 typedef u16 hda_nid_t;
 
 struct hdac_bus;
+struct hdac_stream;
 struct hdac_device;
 struct hdac_driver;
 struct hdac_widget_tree;
@@ -69,6 +75,7 @@ struct hdac_device {
 
         /* misc flags */
         atomic_t in_pm;         /* suspend/resume being performed */
+        bool  link_power_control:1;
 
         /* sysfs */
         struct hdac_widget_tree *widgets;
@@ -85,6 +92,7 @@ struct hdac_device {
 enum {
         HDA_DEV_CORE,
         HDA_DEV_LEGACY,
+        HDA_DEV_ASOC,
 };
 
 /* direction */
@@ -118,6 +126,15 @@ int snd_hdac_get_connections(struct hdac_device *codec, hda_nid_t nid,
                              hda_nid_t *conn_list, int max_conns);
 int snd_hdac_get_sub_nodes(struct hdac_device *codec, hda_nid_t nid,
                            hda_nid_t *start_id);
+unsigned int snd_hdac_calc_stream_format(unsigned int rate,
+                                         unsigned int channels,
+                                         unsigned int format,
+                                         unsigned int maxbps,
+                                         unsigned short spdif_ctls);
+int snd_hdac_query_supported_pcm(struct hdac_device *codec, hda_nid_t nid,
+                                u32 *ratesp, u64 *formatsp, unsigned int *bpsp);
+bool snd_hdac_is_supported_format(struct hdac_device *codec, hda_nid_t nid,
+                                  unsigned int format);
 
 /**
  * snd_hdac_read_parm - read a codec parameter
@@ -161,7 +178,7 @@ struct hdac_driver {
 #define drv_to_hdac_driver(_drv) container_of(_drv, struct hdac_driver, driver)
 
 /*
- * HD-audio bus base driver
+ * Bus verb operators
  */
 struct hdac_bus_ops {
         /* send a single command */
@@ -169,13 +186,59 @@ struct hdac_bus_ops {
         /* get a response from the last command */
         int (*get_response)(struct hdac_bus *bus, unsigned int addr,
                             unsigned int *res);
+        /* control the link power  */
+        int (*link_power)(struct hdac_bus *bus, bool enable);
+};
+
+/*
+ * Lowlevel I/O operators
+ */
+struct hdac_io_ops {
+        /* mapped register accesses */
+        void (*reg_writel)(u32 value, u32 __iomem *addr);
+        u32 (*reg_readl)(u32 __iomem *addr);
+        void (*reg_writew)(u16 value, u16 __iomem *addr);
+        u16 (*reg_readw)(u16 __iomem *addr);
+        void (*reg_writeb)(u8 value, u8 __iomem *addr);
+        u8 (*reg_readb)(u8 __iomem *addr);
+        /* Allocation ops */
+        int (*dma_alloc_pages)(struct hdac_bus *bus, int type, size_t size,
+                               struct snd_dma_buffer *buf);
+        void (*dma_free_pages)(struct hdac_bus *bus,
+                               struct snd_dma_buffer *buf);
 };
 
 #define HDA_UNSOL_QUEUE_SIZE    64
+#define HDA_MAX_CODECS          8       /* limit by controller side */
+
+/* HD Audio class code */
+#define PCI_CLASS_MULTIMEDIA_HD_AUDIO   0x0403
 
+/*
+ * CORB/RIRB
+ *
+ * Each CORB entry is 4byte, RIRB is 8byte
+ */
+struct hdac_rb {
+        __le32 *buf;            /* virtual address of CORB/RIRB buffer */
+        dma_addr_t addr;        /* physical address of CORB/RIRB buffer */
+        unsigned short rp, wp;  /* RIRB read/write pointers */
+        int cmds[HDA_MAX_CODECS];       /* number of pending requests */
+        u32 res[HDA_MAX_CODECS];        /* last read value */
+};
+
+/*
+ * HD-audio bus base driver
+ */
 struct hdac_bus {
         struct device *dev;
         const struct hdac_bus_ops *ops;
+        const struct hdac_io_ops *io_ops;
+
+        /* h/w resources */
+        unsigned long addr;
+        void __iomem *remap_addr;
+        int irq;
 
         /* codec linked list */
         struct list_head codec_list;
@@ -189,18 +252,49 @@ struct hdac_bus {
         unsigned int unsol_rp, unsol_wp;
         struct work_struct unsol_work;
 
+        /* bit flags of detected codecs */
+        unsigned long codec_mask;
+
         /* bit flags of powered codecs */
         unsigned long codec_powered;
 
-        /* flags */
+        /* CORB/RIRB */
+        struct hdac_rb corb;
+        struct hdac_rb rirb;
+        unsigned int last_cmd[HDA_MAX_CODECS];  /* last sent command */
+
+        /* CORB/RIRB and position buffers */
+        struct snd_dma_buffer rb;
+        struct snd_dma_buffer posbuf;
+
+        /* hdac_stream linked list */
+        struct list_head stream_list;
+
+        /* operation state */
+        bool chip_init:1;               /* h/w initialized */
+
+        /* behavior flags */
         bool sync_write:1;              /* sync after verb write */
+        bool use_posbuf:1;              /* use position buffer */
+        bool snoop:1;                   /* enable snooping */
+        bool align_bdle_4k:1;           /* BDLE align 4K boundary */
+        bool reverse_assign:1;          /* assign devices in reverse order */
+        bool corbrp_self_clear:1;       /* CORBRP clears itself after reset */
+
+        int bdl_pos_adj;                /* BDL position adjustment */
 
         /* locks */
+        spinlock_t reg_lock;
         struct mutex cmd_mutex;
+
+        /* i915 component interface */
+        struct i915_audio_component *audio_component;
+        int i915_power_refcount;
 };
 
 int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,
-                      const struct hdac_bus_ops *ops);
+                      const struct hdac_bus_ops *ops,
+                      const struct hdac_io_ops *io_ops);
 void snd_hdac_bus_exit(struct hdac_bus *bus);
 int snd_hdac_bus_exec_verb(struct hdac_bus *bus, unsigned int addr,
                            unsigned int cmd, unsigned int *res);
@@ -222,6 +316,201 @@ static inline void snd_hdac_codec_link_down(struct hdac_device *codec)
         clear_bit(codec->addr, &codec->bus->codec_powered);
 }
 
+int snd_hdac_bus_send_cmd(struct hdac_bus *bus, unsigned int val);
+int snd_hdac_bus_get_response(struct hdac_bus *bus, unsigned int addr,
+                              unsigned int *res);
+int snd_hdac_link_power(struct hdac_device *codec, bool enable);
+
+bool snd_hdac_bus_init_chip(struct hdac_bus *bus, bool full_reset);
+void snd_hdac_bus_stop_chip(struct hdac_bus *bus);
+void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus);
+void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus);
+void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus);
+void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus);
+
+void snd_hdac_bus_update_rirb(struct hdac_bus *bus);
+void snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,
+                                    void (*ack)(struct hdac_bus *,
+                                                struct hdac_stream *));
+
+int snd_hdac_bus_alloc_stream_pages(struct hdac_bus *bus);
+void snd_hdac_bus_free_stream_pages(struct hdac_bus *bus);
+
+/*
+ * macros for easy use
+ */
+#define _snd_hdac_chip_write(type, chip, reg, value) \
+        ((chip)->io_ops->reg_write ## type(value, (chip)->remap_addr + (reg)))
+#define _snd_hdac_chip_read(type, chip, reg) \
+        ((chip)->io_ops->reg_read ## type((chip)->remap_addr + (reg)))
+
+/* read/write a register, pass without AZX_REG_ prefix */
+#define snd_hdac_chip_writel(chip, reg, value) \
+        _snd_hdac_chip_write(l, chip, AZX_REG_ ## reg, value)
+#define snd_hdac_chip_writew(chip, reg, value) \
+        _snd_hdac_chip_write(w, chip, AZX_REG_ ## reg, value)
+#define snd_hdac_chip_writeb(chip, reg, value) \
+        _snd_hdac_chip_write(b, chip, AZX_REG_ ## reg, value)
+#define snd_hdac_chip_readl(chip, reg) \
+        _snd_hdac_chip_read(l, chip, AZX_REG_ ## reg)
+#define snd_hdac_chip_readw(chip, reg) \
+        _snd_hdac_chip_read(w, chip, AZX_REG_ ## reg)
+#define snd_hdac_chip_readb(chip, reg) \
+        _snd_hdac_chip_read(b, chip, AZX_REG_ ## reg)
+
+/* update a register, pass without AZX_REG_ prefix */
+#define snd_hdac_chip_updatel(chip, reg, mask, val) \
+        snd_hdac_chip_writel(chip, reg, \
+                             (snd_hdac_chip_readl(chip, reg) & ~(mask)) | (val))
+#define snd_hdac_chip_updatew(chip, reg, mask, val) \
+        snd_hdac_chip_writew(chip, reg, \
+                             (snd_hdac_chip_readw(chip, reg) & ~(mask)) | (val))
+#define snd_hdac_chip_updateb(chip, reg, mask, val) \
+        snd_hdac_chip_writeb(chip, reg, \
+                             (snd_hdac_chip_readb(chip, reg) & ~(mask)) | (val))
+
+/*
+ * HD-audio stream
+ */
+struct hdac_stream {
+        struct hdac_bus *bus;
+        struct snd_dma_buffer bdl; /* BDL buffer */
+        __le32 *posbuf;         /* position buffer pointer */
+        int direction;          /* playback / capture (SNDRV_PCM_STREAM_*) */
+
+        unsigned int bufsize;   /* size of the play buffer in bytes */
+        unsigned int period_bytes; /* size of the period in bytes */
+        unsigned int frags;     /* number for period in the play buffer */
+        unsigned int fifo_size; /* FIFO size */
+
+        void __iomem *sd_addr;  /* stream descriptor pointer */
+
+        u32 sd_int_sta_mask;    /* stream int status mask */
+
+        /* pcm support */
+        struct snd_pcm_substream *substream;    /* assigned substream,
+                                                 * set in PCM open
+                                                 */
+        unsigned int format_val;        /* format value to be set in the
+                                         * controller and the codec
+                                         */
+        unsigned char stream_tag;       /* assigned stream */
+        unsigned char index;            /* stream index */
+        int assigned_key;               /* last device# key assigned to */
+
+        bool opened:1;
+        bool running:1;
+        bool prepared:1;
+        bool no_period_wakeup:1;
+        bool locked:1;
+
+        /* timestamp */
+        unsigned long start_wallclk;    /* start + minimum wallclk */
+        unsigned long period_wallclk;   /* wallclk for period */
+        struct timecounter  tc;
+        struct cyclecounter cc;
+        int delay_negative_threshold;
+
+        struct list_head list;
+#ifdef CONFIG_SND_HDA_DSP_LOADER
+        /* DSP access mutex */
+        struct mutex dsp_mutex;
+#endif
+};
+
+void snd_hdac_stream_init(struct hdac_bus *bus, struct hdac_stream *azx_dev,
+                          int idx, int direction, int tag);
+struct hdac_stream *snd_hdac_stream_assign(struct hdac_bus *bus,
+                                           struct snd_pcm_substream *substream);
+void snd_hdac_stream_release(struct hdac_stream *azx_dev);
+
+int snd_hdac_stream_setup(struct hdac_stream *azx_dev);
+void snd_hdac_stream_cleanup(struct hdac_stream *azx_dev);
+int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev);
+int snd_hdac_stream_set_params(struct hdac_stream *azx_dev,
+                                unsigned int format_val);
+void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start);
+void snd_hdac_stream_clear(struct hdac_stream *azx_dev);
+void snd_hdac_stream_stop(struct hdac_stream *azx_dev);
+void snd_hdac_stream_reset(struct hdac_stream *azx_dev);
+void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set,
+                                  unsigned int streams, unsigned int reg);
+void snd_hdac_stream_sync(struct hdac_stream *azx_dev, bool start,
+                          unsigned int streams);
+void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
+                                      unsigned int streams);
+/*
+ * macros for easy use
+ */
+#define _snd_hdac_stream_write(type, dev, reg, value)                   \
+        ((dev)->bus->io_ops->reg_write ## type(value, (dev)->sd_addr + (reg)))
+#define _snd_hdac_stream_read(type, dev, reg)                           \
+        ((dev)->bus->io_ops->reg_read ## type((dev)->sd_addr + (reg)))
+
+/* read/write a register, pass without AZX_REG_ prefix */
+#define snd_hdac_stream_writel(dev, reg, value) \
+        _snd_hdac_stream_write(l, dev, AZX_REG_ ## reg, value)
+#define snd_hdac_stream_writew(dev, reg, value) \
+        _snd_hdac_stream_write(w, dev, AZX_REG_ ## reg, value)
+#define snd_hdac_stream_writeb(dev, reg, value) \
+        _snd_hdac_stream_write(b, dev, AZX_REG_ ## reg, value)
+#define snd_hdac_stream_readl(dev, reg) \
+        _snd_hdac_stream_read(l, dev, AZX_REG_ ## reg)
+#define snd_hdac_stream_readw(dev, reg) \
+        _snd_hdac_stream_read(w, dev, AZX_REG_ ## reg)
+#define snd_hdac_stream_readb(dev, reg) \
+        _snd_hdac_stream_read(b, dev, AZX_REG_ ## reg)
+
+/* update a register, pass without AZX_REG_ prefix */
+#define snd_hdac_stream_updatel(dev, reg, mask, val) \
+        snd_hdac_stream_writel(dev, reg, \
+                               (snd_hdac_stream_readl(dev, reg) & \
+                                ~(mask)) | (val))
+#define snd_hdac_stream_updatew(dev, reg, mask, val) \
+        snd_hdac_stream_writew(dev, reg, \
+                               (snd_hdac_stream_readw(dev, reg) & \
+                                ~(mask)) | (val))
+#define snd_hdac_stream_updateb(dev, reg, mask, val) \
+        snd_hdac_stream_writeb(dev, reg, \
+                               (snd_hdac_stream_readb(dev, reg) & \
+                                ~(mask)) | (val))
+
+#ifdef CONFIG_SND_HDA_DSP_LOADER
+/* DSP lock helpers */
+#define snd_hdac_dsp_lock_init(dev)     mutex_init(&(dev)->dsp_mutex)
+#define snd_hdac_dsp_lock(dev)          mutex_lock(&(dev)->dsp_mutex)
+#define snd_hdac_dsp_unlock(dev)        mutex_unlock(&(dev)->dsp_mutex)
+#define snd_hdac_stream_is_locked(dev)  ((dev)->locked)
+/* DSP loader helpers */
+int snd_hdac_dsp_prepare(struct hdac_stream *azx_dev, unsigned int format,
+                         unsigned int byte_size, struct snd_dma_buffer *bufp);
+void snd_hdac_dsp_trigger(struct hdac_stream *azx_dev, bool start);
+void snd_hdac_dsp_cleanup(struct hdac_stream *azx_dev,
+                          struct snd_dma_buffer *dmab);
+#else /* CONFIG_SND_HDA_DSP_LOADER */
+#define snd_hdac_dsp_lock_init(dev)     do {} while (0)
+#define snd_hdac_dsp_lock(dev)          do {} while (0)
+#define snd_hdac_dsp_unlock(dev)        do {} while (0)
+#define snd_hdac_stream_is_locked(dev)  0
+
+static inline int
+snd_hdac_dsp_prepare(struct hdac_stream *azx_dev, unsigned int format,
+                     unsigned int byte_size, struct snd_dma_buffer *bufp)
+{
+        return 0;
+}
+
+static inline void snd_hdac_dsp_trigger(struct hdac_stream *azx_dev, bool start)
+{
+}
+
+static inline void snd_hdac_dsp_cleanup(struct hdac_stream *azx_dev,
+                                        struct snd_dma_buffer *dmab)
+{
+}
+#endif /* CONFIG_SND_HDA_DSP_LOADER */
+
+
 /*
  * generic array helpers
  */
diff --git a/include/sound/info.h b/include/sound/info.h
index 9ca1a493d370..16269951bafc 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -23,6 +23,8 @@
  */
 
 #include <linux/poll.h>
+#include <linux/seq_file.h>
+#include <sound/core.h>
 
 /* buffer for information */
 struct snd_info_buffer {
@@ -92,10 +94,8 @@ struct snd_info_entry {
 
 #if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
 int snd_info_minor_register(void);
-int snd_info_minor_unregister(void);
 #else
-#define snd_info_minor_register() /* NOP */
-#define snd_info_minor_unregister() /* NOP */
+#define snd_info_minor_register()       0
 #endif
 
 
@@ -110,8 +110,18 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer);
 static inline void snd_card_info_read_oss(struct snd_info_buffer *buffer) {}
 #endif
 
-__printf(2, 3)
-int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...);
+/**
+ * snd_iprintf - printf on the procfs buffer
+ * @buf: the procfs buffer
+ * @fmt: the printf format
+ *
+ * Outputs the string on the procfs buffer just like printf().
+ *
+ * Return: zero for success, or a negative error code.
+ */
+#define snd_iprintf(buf, fmt, args...) \
+        seq_printf((struct seq_file *)(buf)->buffer, fmt, ##args)
+
 int snd_info_init(void);
 int snd_info_done(void);
 
@@ -135,8 +145,12 @@ void snd_info_card_id_change(struct snd_card *card);
 int snd_info_register(struct snd_info_entry *entry);
 
 /* for card drivers */
-int snd_card_proc_new(struct snd_card *card, const char *name,
-                      struct snd_info_entry **entryp);
+static inline int snd_card_proc_new(struct snd_card *card, const char *name,
+                                    struct snd_info_entry **entryp)
+{
+        *entryp = snd_info_create_card_entry(card, name, card->proc_root);
+        return *entryp ? 0 : -ENOMEM;
+}
 
 static inline void snd_info_set_text_ops(struct snd_info_entry *entry, 
         void *private_data,
@@ -175,7 +189,6 @@ static inline int snd_card_proc_new(struct snd_card *card, const char *name,
 static inline void snd_info_set_text_ops(struct snd_info_entry *entry __attribute__((unused)),
                                          void *private_data,
                                          void (*read)(struct snd_info_entry *, struct snd_info_buffer *)) {}
-
 static inline int snd_info_check_reserved_words(const char *str) { return 1; }
 
 #endif
diff --git a/include/sound/jack.h b/include/sound/jack.h
index 218235030ebc..23bede121c78 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -73,6 +73,8 @@ enum snd_jack_types {
 
 struct snd_jack {
         struct input_dev *input_dev;
+        struct list_head kctl_list;
+        struct snd_card *card;
         int registered;
         int type;
         const char *id;
@@ -85,7 +87,8 @@ struct snd_jack {
 #ifdef CONFIG_SND_JACK
 
 int snd_jack_new(struct snd_card *card, const char *id, int type,
-                 struct snd_jack **jack);
+                 struct snd_jack **jack, bool initial_kctl, bool phantom_jack);
+int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask);
 void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);
 int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
                      int keytype);
@@ -93,9 +96,13 @@ int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
 void snd_jack_report(struct snd_jack *jack, int status);
 
 #else
-
 static inline int snd_jack_new(struct snd_card *card, const char *id, int type,
-                               struct snd_jack **jack)
+                               struct snd_jack **jack, bool initial_kctl, bool phantom_jack)
+{
+        return 0;
+}
+
+static inline int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask)
 {
         return 0;
 }
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 0cb7f3f5df7b..691e7ee0a510 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -224,9 +224,10 @@ typedef int (*snd_pcm_hw_rule_func_t)(struct snd_pcm_hw_params *params,
 
 struct snd_pcm_hw_rule {
         unsigned int cond;
-        snd_pcm_hw_rule_func_t func;
         int var;
         int deps[4];
+
+        snd_pcm_hw_rule_func_t func;
         void *private;
 };
 
@@ -273,8 +274,8 @@ struct snd_pcm_hw_constraint_ratdens {
 };
 
 struct snd_pcm_hw_constraint_list {
-        unsigned int count;
         const unsigned int *list;
+        unsigned int count;
         unsigned int mask;
 };
 
diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 1507469425ec..937f5c763899 100644
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -227,9 +227,6 @@ config SND_PCM_XRUN_DEBUG
 config SND_VMASTER
         bool
 
-config SND_KCTL_JACK
-        bool
-
 config SND_DMA_SGBUF
         def_bool y
         depends on X86
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 2b925fcc95ea..73871b63a092 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -3,12 +3,15 @@
 # Copyright (c) 1999,2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-y     := sound.o init.o memory.o info.o control.o misc.o device.o
+snd-y     := sound.o init.o memory.o control.o misc.o device.o
+ifneq ($(CONFIG_PROC_FS),)
+snd-y += info.o
+snd-$(CONFIG_SND_OSSEMUL) += info_oss.o
+endif
 snd-$(CONFIG_ISA_DMA_API) += isadma.o
-snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o
+snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o
 snd-$(CONFIG_SND_VMASTER) += vmaster.o
-snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o
-snd-$(CONFIG_SND_JACK)    += jack.o
+snd-$(CONFIG_SND_JACK)    += ctljack.o jack.o
 
 snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
                 pcm_memory.o memalloc.o
diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c
index e4b38fbe51da..8f8d1033425c 100644
--- a/sound/core/ctljack.c
+++ b/sound/core/ctljack.c
@@ -31,19 +31,49 @@ static struct snd_kcontrol_new jack_detect_kctl = {
         .get = jack_detect_kctl_get,
 };
 
+static int get_available_index(struct snd_card *card, const char *name)
+{
+        struct snd_ctl_elem_id sid;
+
+        memset(&sid, 0, sizeof(sid));
+
+        sid.index = 0;
+        sid.iface = SNDRV_CTL_ELEM_IFACE_CARD;
+        strlcpy(sid.name, name, sizeof(sid.name));
+
+        while (snd_ctl_find_id(card, &sid))
+                sid.index++;
+
+        return sid.index;
+}
+
+static void jack_kctl_name_gen(char *name, const char *src_name, int size)
+{
+        size_t count = strlen(src_name);
+        bool need_cat = true;
+
+        /* remove redundant " Jack" from src_name */
+        if (count >= 5)
+                need_cat = strncmp(&src_name[count - 5], " Jack", 5) ? true : false;
+
+        snprintf(name, size, need_cat ? "%s Jack" : "%s", src_name);
+
+}
+
 struct snd_kcontrol *
-snd_kctl_jack_new(const char *name, int idx, void *private_data)
+snd_kctl_jack_new(const char *name, struct snd_card *card)
 {
         struct snd_kcontrol *kctl;
-        kctl = snd_ctl_new1(&jack_detect_kctl, private_data);
+
+        kctl = snd_ctl_new1(&jack_detect_kctl, NULL);
         if (!kctl)
                 return NULL;
-        snprintf(kctl->id.name, sizeof(kctl->id.name), "%s Jack", name);
-        kctl->id.index = idx;
+
+        jack_kctl_name_gen(kctl->id.name, name, sizeof(kctl->id.name));
+        kctl->id.index = get_available_index(card, name);
         kctl->private_value = 0;
         return kctl;
 }
-EXPORT_SYMBOL_GPL(snd_kctl_jack_new);
 
 void snd_kctl_jack_report(struct snd_card *card,
                           struct snd_kcontrol *kctl, bool status)
@@ -53,4 +83,3 @@ void snd_kctl_jack_report(struct snd_card *card,
         kctl->private_value = status;
         snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
 }
-EXPORT_SYMBOL_GPL(snd_kctl_jack_report);
diff --git a/sound/core/info.c b/sound/core/info.c
index 9f404e965ea2..895362a696c9 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -33,12 +33,6 @@
 #include <linux/mutex.h>
 #include <stdarg.h>
 
-/*
- *
- */
-
-#ifdef CONFIG_PROC_FS
-
 int snd_info_check_reserved_words(const char *str)
 {
         static char *reserved[] =
@@ -78,81 +72,51 @@ struct snd_info_private_data {
 };
 
 static int snd_info_version_init(void);
-static int snd_info_version_done(void);
 static void snd_info_disconnect(struct snd_info_entry *entry);
 
+/*
 
-/* resize the proc r/w buffer */
-static int resize_info_buffer(struct snd_info_buffer *buffer,
-                              unsigned int nsize)
-{
-        char *nbuf;
+ */
 
-        nsize = PAGE_ALIGN(nsize);
-        nbuf = krealloc(buffer->buffer, nsize, GFP_KERNEL | __GFP_ZERO);
-        if (! nbuf)
-                return -ENOMEM;
+static struct snd_info_entry *snd_proc_root;
+struct snd_info_entry *snd_seq_root;
+EXPORT_SYMBOL(snd_seq_root);
 
-        buffer->buffer = nbuf;
-        buffer->len = nsize;
-        return 0;
-}
+#ifdef CONFIG_SND_OSSEMUL
+struct snd_info_entry *snd_oss_root;
+#endif
 
-/**
- * snd_iprintf - printf on the procfs buffer
- * @buffer: the procfs buffer
- * @fmt: the printf format
- *
- * Outputs the string on the procfs buffer just like printf().
- *
- * Return: The size of output string, or a negative error code.
- */
-int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...)
+static int alloc_info_private(struct snd_info_entry *entry,
+                              struct snd_info_private_data **ret)
 {
-        va_list args;
-        int len, res;
-        int err = 0;
+        struct snd_info_private_data *data;
 
-        might_sleep();
-        if (buffer->stop || buffer->error)
-                return 0;
-        len = buffer->len - buffer->size;
-        va_start(args, fmt);
-        for (;;) {
-                va_list ap;
-                va_copy(ap, args);
-                res = vsnprintf(buffer->buffer + buffer->curr, len, fmt, ap);
-                va_end(ap);
-                if (res < len)
-                        break;
-                err = resize_info_buffer(buffer, buffer->len + PAGE_SIZE);
-                if (err < 0)
-                        break;
-                len = buffer->len - buffer->size;
+        if (!entry || !entry->p)
+                return -ENODEV;
+        if (!try_module_get(entry->module))
+                return -EFAULT;
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data) {
+                module_put(entry->module);
+                return -ENOMEM;
         }
-        va_end(args);
-
-        if (err < 0)
-                return err;
-        buffer->curr += res;
-        buffer->size += res;
-        return res;
+        data->entry = entry;
+        *ret = data;
+        return 0;
 }
 
-EXPORT_SYMBOL(snd_iprintf);
+static bool valid_pos(loff_t pos, size_t count)
+{
+        if (pos < 0 || (long) pos != pos || (ssize_t) count < 0)
+                return false;
+        if ((unsigned long) pos + (unsigned long) count < (unsigned long) pos)
+                return false;
+        return true;
+}
 
 /*
-
+ * file ops for binary proc files
  */
-
-static struct proc_dir_entry *snd_proc_root;
-struct snd_info_entry *snd_seq_root;
-EXPORT_SYMBOL(snd_seq_root);
-
-#ifdef CONFIG_SND_OSSEMUL
-struct snd_info_entry *snd_oss_root;
-#endif
-
 static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
 {
         struct snd_info_private_data *data;
@@ -162,17 +126,14 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
         data = file->private_data;
         entry = data->entry;
         mutex_lock(&entry->access);
-        if (entry->content == SNDRV_INFO_CONTENT_DATA &&
-            entry->c.ops->llseek) {
+        if (entry->c.ops->llseek) {
                 offset = entry->c.ops->llseek(entry,
                                               data->file_private_data,
                                               file, offset, orig);
                 goto out;
         }
-        if (entry->content == SNDRV_INFO_CONTENT_DATA)
-                size = entry->size;
-        else
-                size = 0;
+
+        size = entry->size;
         switch (orig) {
         case SEEK_SET:
                 break;
@@ -201,45 +162,20 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
 static ssize_t snd_info_entry_read(struct file *file, char __user *buffer,
                                    size_t count, loff_t * offset)
 {
-        struct snd_info_private_data *data;
-        struct snd_info_entry *entry;
-        struct snd_info_buffer *buf;
-        size_t size = 0;
+        struct snd_info_private_data *data = file->private_data;
+        struct snd_info_entry *entry = data->entry;
+        size_t size;
         loff_t pos;
 
-        data = file->private_data;
-        if (snd_BUG_ON(!data))
-                return -ENXIO;
         pos = *offset;
-        if (pos < 0 || (long) pos != pos || (ssize_t) count < 0)
-                return -EIO;
-        if ((unsigned long) pos + (unsigned long) count < (unsigned long) pos)
+        if (!valid_pos(pos, count))
                 return -EIO;
-        entry = data->entry;
-        switch (entry->content) {
-        case SNDRV_INFO_CONTENT_TEXT:
-                buf = data->rbuffer;
-                if (buf == NULL)
-                        return -EIO;
-                if (pos >= buf->size)
-                        return 0;
-                size = buf->size - pos;
-                size = min(count, size);
-                if (copy_to_user(buffer, buf->buffer + pos, size))
-                        return -EFAULT;
-                break;
-        case SNDRV_INFO_CONTENT_DATA:
-                if (pos >= entry->size)
-                        return 0;
-                if (entry->c.ops->read) {
-                        size = entry->size - pos;
-                        size = min(count, size);
-                        size = entry->c.ops->read(entry,
-                                                  data->file_private_data,
-                                                  file, buffer, size, pos);
-                }
-                break;
-        }
+        if (pos >= entry->size)
+                return 0;
+        size = entry->size - pos;
+        size = min(count, size);
+        size = entry->c.ops->read(entry, data->file_private_data,
+                                  file, buffer, size, pos);
         if ((ssize_t) size > 0)
                 *offset = pos + size;
         return size;
@@ -248,347 +184,319 @@ static ssize_t snd_info_entry_read(struct file *file, char __user *buffer,
 static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer,
                                     size_t count, loff_t * offset)
 {
-        struct snd_info_private_data *data;
-        struct snd_info_entry *entry;
-        struct snd_info_buffer *buf;
+        struct snd_info_private_data *data = file->private_data;
+        struct snd_info_entry *entry = data->entry;
         ssize_t size = 0;
         loff_t pos;
 
-        data = file->private_data;
-        if (snd_BUG_ON(!data))
-                return -ENXIO;
-        entry = data->entry;
         pos = *offset;
-        if (pos < 0 || (long) pos != pos || (ssize_t) count < 0)
-                return -EIO;
-        if ((unsigned long) pos + (unsigned long) count < (unsigned long) pos)
+        if (!valid_pos(pos, count))
                 return -EIO;
-        switch (entry->content) {
-        case SNDRV_INFO_CONTENT_TEXT:
-                buf = data->wbuffer;
-                if (buf == NULL)
-                        return -EIO;
-                mutex_lock(&entry->access);
-                if (pos + count >= buf->len) {
-                        if (resize_info_buffer(buf, pos + count)) {
-                                mutex_unlock(&entry->access);
-                                return -ENOMEM;
-                        }
-                }
-                if (copy_from_user(buf->buffer + pos, buffer, count)) {
-                        mutex_unlock(&entry->access);
-                        return -EFAULT;
-                }
-                buf->size = pos + count;
-                mutex_unlock(&entry->access);
-                size = count;
-                break;
-        case SNDRV_INFO_CONTENT_DATA:
-                if (entry->c.ops->write && count > 0) {
-                        size_t maxsize = entry->size - pos;
-                        count = min(count, maxsize);
-                        size = entry->c.ops->write(entry,
-                                                   data->file_private_data,
-                                                   file, buffer, count, pos);
-                }
-                break;
+        if (count > 0) {
+                size_t maxsize = entry->size - pos;
+                count = min(count, maxsize);
+                size = entry->c.ops->write(entry, data->file_private_data,
+                                           file, buffer, count, pos);
         }
-        if ((ssize_t) size > 0)
+        if (size > 0)
                 *offset = pos + size;
         return size;
 }
 
-static int snd_info_entry_open(struct inode *inode, struct file *file)
+static unsigned int snd_info_entry_poll(struct file *file, poll_table *wait)
 {
+        struct snd_info_private_data *data = file->private_data;
+        struct snd_info_entry *entry = data->entry;
+        unsigned int mask = 0;
+
+        if (entry->c.ops->poll)
+                return entry->c.ops->poll(entry,
+                                          data->file_private_data,
+                                          file, wait);
+        if (entry->c.ops->read)
+                mask |= POLLIN | POLLRDNORM;
+        if (entry->c.ops->write)
+                mask |= POLLOUT | POLLWRNORM;
+        return mask;
+}
+
+static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,
+                                unsigned long arg)
+{
+        struct snd_info_private_data *data = file->private_data;
+        struct snd_info_entry *entry = data->entry;
+
+        if (!entry->c.ops->ioctl)
+                return -ENOTTY;
+        return entry->c.ops->ioctl(entry, data->file_private_data,
+                                   file, cmd, arg);
+}
+
+static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        struct inode *inode = file_inode(file);
+        struct snd_info_private_data *data;
         struct snd_info_entry *entry;
+
+        data = file->private_data;
+        if (data == NULL)
+                return 0;
+        entry = data->entry;
+        if (!entry->c.ops->mmap)
+                return -ENXIO;
+        return entry->c.ops->mmap(entry, data->file_private_data,
+                                  inode, file, vma);
+}
+
+static int snd_info_entry_open(struct inode *inode, struct file *file)
+{
+        struct snd_info_entry *entry = PDE_DATA(inode);
         struct snd_info_private_data *data;
-        struct snd_info_buffer *buffer;
         int mode, err;
 
         mutex_lock(&info_mutex);
-        entry = PDE_DATA(inode);
-        if (entry == NULL || ! entry->p) {
-                mutex_unlock(&info_mutex);
-                return -ENODEV;
-        }
-        if (!try_module_get(entry->module)) {
-                err = -EFAULT;
-                goto __error1;
-        }
+        err = alloc_info_private(entry, &data);
+        if (err < 0)
+                goto unlock;
+
         mode = file->f_flags & O_ACCMODE;
-        if (mode == O_RDONLY || mode == O_RDWR) {
-                if ((entry->content == SNDRV_INFO_CONTENT_DATA &&
-                     entry->c.ops->read == NULL)) {
-                        err = -ENODEV;
-                        goto __error;
-                }
+        if (((mode == O_RDONLY || mode == O_RDWR) && !entry->c.ops->read) ||
+            ((mode == O_WRONLY || mode == O_RDWR) && !entry->c.ops->write)) {
+                err = -ENODEV;
+                goto error;
         }
-        if (mode == O_WRONLY || mode == O_RDWR) {
-                if ((entry->content == SNDRV_INFO_CONTENT_DATA &&
-                     entry->c.ops->write == NULL)) {
-                        err = -ENODEV;
-                        goto __error;
-                }
-        }
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (data == NULL) {
-                err = -ENOMEM;
-                goto __error;
-        }
-        data->entry = entry;
-        switch (entry->content) {
-        case SNDRV_INFO_CONTENT_TEXT:
-                if (mode == O_RDONLY || mode == O_RDWR) {
-                        buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
-                        if (buffer == NULL)
-                                goto __nomem;
-                        data->rbuffer = buffer;
-                        buffer->len = PAGE_SIZE;
-                        buffer->buffer = kzalloc(buffer->len, GFP_KERNEL);
-                        if (buffer->buffer == NULL)
-                                goto __nomem;
-                }
-                if (mode == O_WRONLY || mode == O_RDWR) {
-                        buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
-                        if (buffer == NULL)
-                                goto __nomem;
-                        data->wbuffer = buffer;
-                        buffer->len = PAGE_SIZE;
-                        buffer->buffer = kmalloc(buffer->len, GFP_KERNEL);
-                        if (buffer->buffer == NULL)
-                                goto __nomem;
-                }
-                break;
-        case SNDRV_INFO_CONTENT_DATA:   /* data */
-                if (entry->c.ops->open) {
-                        if ((err = entry->c.ops->open(entry, mode,
-                                                      &data->file_private_data)) < 0) {
-                                kfree(data);
-                                goto __error;
-                        }
-                }
-                break;
+
+        if (entry->c.ops->open) {
+                err = entry->c.ops->open(entry, mode, &data->file_private_data);
+                if (err < 0)
+                        goto error;
         }
+
         file->private_data = data;
         mutex_unlock(&info_mutex);
-        if (entry->content == SNDRV_INFO_CONTENT_TEXT &&
-            (mode == O_RDONLY || mode == O_RDWR)) {
-                if (entry->c.text.read) {
-                        mutex_lock(&entry->access);
-                        entry->c.text.read(entry, data->rbuffer);
-                        mutex_unlock(&entry->access);
-                }
-        }
         return 0;
 
- __nomem:
-        if (data->rbuffer) {
-                kfree(data->rbuffer->buffer);
-                kfree(data->rbuffer);
-        }
-        if (data->wbuffer) {
-                kfree(data->wbuffer->buffer);
-                kfree(data->wbuffer);
-        }
+ error:
         kfree(data);
-        err = -ENOMEM;
-      __error:
         module_put(entry->module);
-      __error1:
+ unlock:
         mutex_unlock(&info_mutex);
         return err;
 }
 
 static int snd_info_entry_release(struct inode *inode, struct file *file)
 {
-        struct snd_info_entry *entry;
-        struct snd_info_private_data *data;
-        int mode;
+        struct snd_info_private_data *data = file->private_data;
+        struct snd_info_entry *entry = data->entry;
 
-        mode = file->f_flags & O_ACCMODE;
-        data = file->private_data;
-        entry = data->entry;
-        switch (entry->content) {
-        case SNDRV_INFO_CONTENT_TEXT:
-                if (data->rbuffer) {
-                        kfree(data->rbuffer->buffer);
-                        kfree(data->rbuffer);
-                }
-                if (data->wbuffer) {
-                        if (entry->c.text.write) {
-                                entry->c.text.write(entry, data->wbuffer);
-                                if (data->wbuffer->error) {
-                                        if (entry->card)
-                                                dev_warn(entry->card->dev, "info: data write error to %s (%i)\n",
-                                                         entry->name,
-                                                         data->wbuffer->error);
-                                        else
-                                                pr_warn("ALSA: info: data write error to %s (%i)\n",
-                                                        entry->name,
-                                                        data->wbuffer->error);
-                                }
-                        }
-                        kfree(data->wbuffer->buffer);
-                        kfree(data->wbuffer);
-                }
-                break;
-        case SNDRV_INFO_CONTENT_DATA:
-                if (entry->c.ops->release)
-                        entry->c.ops->release(entry, mode,
-                                              data->file_private_data);
-                break;
-        }
+        if (entry->c.ops->release)
+                entry->c.ops->release(entry, file->f_flags & O_ACCMODE,
+                                      data->file_private_data);
         module_put(entry->module);
         kfree(data);
         return 0;
 }
 
-static unsigned int snd_info_entry_poll(struct file *file, poll_table * wait)
+static const struct file_operations snd_info_entry_operations =
 {
-        struct snd_info_private_data *data;
-        struct snd_info_entry *entry;
-        unsigned int mask;
+        .owner =                THIS_MODULE,
+        .llseek =               snd_info_entry_llseek,
+        .read =                 snd_info_entry_read,
+        .write =                snd_info_entry_write,
+        .poll =                 snd_info_entry_poll,
+        .unlocked_ioctl =       snd_info_entry_ioctl,
+        .mmap =                 snd_info_entry_mmap,
+        .open =                 snd_info_entry_open,
+        .release =              snd_info_entry_release,
+};
 
-        data = file->private_data;
-        if (data == NULL)
-                return 0;
-        entry = data->entry;
-        mask = 0;
-        switch (entry->content) {
-        case SNDRV_INFO_CONTENT_DATA:
-                if (entry->c.ops->poll)
-                        return entry->c.ops->poll(entry,
-                                                  data->file_private_data,
-                                                  file, wait);
-                if (entry->c.ops->read)
-                        mask |= POLLIN | POLLRDNORM;
-                if (entry->c.ops->write)
-                        mask |= POLLOUT | POLLWRNORM;
-                break;
+/*
+ * file ops for text proc files
+ */
+static ssize_t snd_info_text_entry_write(struct file *file,
+                                         const char __user *buffer,
+                                         size_t count, loff_t *offset)
+{
+        struct seq_file *m = file->private_data;
+        struct snd_info_private_data *data = m->private;
+        struct snd_info_entry *entry = data->entry;
+        struct snd_info_buffer *buf;
+        loff_t pos;
+        size_t next;
+        int err = 0;
+
+        pos = *offset;
+        if (!valid_pos(pos, count))
+                return -EIO;
+        next = pos + count;
+        mutex_lock(&entry->access);
+        buf = data->wbuffer;
+        if (!buf) {
+                data->wbuffer = buf = kzalloc(sizeof(*buf), GFP_KERNEL);
+                if (!buf) {
+                        err = -ENOMEM;
+                        goto error;
+                }
         }
-        return mask;
+        if (next > buf->len) {
+                char *nbuf = krealloc(buf->buffer, PAGE_ALIGN(next),
+                                      GFP_KERNEL | __GFP_ZERO);
+                if (!nbuf) {
+                        err = -ENOMEM;
+                        goto error;
+                }
+                buf->buffer = nbuf;
+                buf->len = PAGE_ALIGN(next);
+        }
+        if (copy_from_user(buf->buffer + pos, buffer, count)) {
+                err = -EFAULT;
+                goto error;
+        }
+        buf->size = next;
+ error:
+        mutex_unlock(&entry->access);
+        if (err < 0)
+                return err;
+        *offset = next;
+        return count;
 }
 
-static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,
-                                unsigned long arg)
+static int snd_info_seq_show(struct seq_file *seq, void *p)
 {
-        struct snd_info_private_data *data;
-        struct snd_info_entry *entry;
+        struct snd_info_private_data *data = seq->private;
+        struct snd_info_entry *entry = data->entry;
 
-        data = file->private_data;
-        if (data == NULL)
-                return 0;
-        entry = data->entry;
-        switch (entry->content) {
-        case SNDRV_INFO_CONTENT_DATA:
-                if (entry->c.ops->ioctl)
-                        return entry->c.ops->ioctl(entry,
-                                                   data->file_private_data,
-                                                   file, cmd, arg);
-                break;
+        if (entry->c.text.read) {
+                data->rbuffer->buffer = (char *)seq; /* XXX hack! */
+                entry->c.text.read(entry, data->rbuffer);
         }
-        return -ENOTTY;
+        return 0;
 }
 
-static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
+static int snd_info_text_entry_open(struct inode *inode, struct file *file)
 {
-        struct inode *inode = file_inode(file);
+        struct snd_info_entry *entry = PDE_DATA(inode);
         struct snd_info_private_data *data;
-        struct snd_info_entry *entry;
+        int err;
 
-        data = file->private_data;
-        if (data == NULL)
-                return 0;
-        entry = data->entry;
-        switch (entry->content) {
-        case SNDRV_INFO_CONTENT_DATA:
-                if (entry->c.ops->mmap)
-                        return entry->c.ops->mmap(entry,
-                                                  data->file_private_data,
-                                                  inode, file, vma);
-                break;
+        mutex_lock(&info_mutex);
+        err = alloc_info_private(entry, &data);
+        if (err < 0)
+                goto unlock;
+
+        data->rbuffer = kzalloc(sizeof(*data->rbuffer), GFP_KERNEL);
+        if (!data->rbuffer) {
+                err = -ENOMEM;
+                goto error;
         }
-        return -ENXIO;
+        if (entry->size)
+                err = single_open_size(file, snd_info_seq_show, data,
+                                       entry->size);
+        else
+                err = single_open(file, snd_info_seq_show, data);
+        if (err < 0)
+                goto error;
+        mutex_unlock(&info_mutex);
+        return 0;
+
+ error:
+        kfree(data->rbuffer);
+        kfree(data);
+        module_put(entry->module);
+ unlock:
+        mutex_unlock(&info_mutex);
+        return err;
 }
 
-static const struct file_operations snd_info_entry_operations =
+static int snd_info_text_entry_release(struct inode *inode, struct file *file)
+{
+        struct seq_file *m = file->private_data;
+        struct snd_info_private_data *data = m->private;
+        struct snd_info_entry *entry = data->entry;
+
+        if (data->wbuffer && entry->c.text.write)
+                entry->c.text.write(entry, data->wbuffer);
+
+        single_release(inode, file);
+        kfree(data->rbuffer);
+        if (data->wbuffer) {
+                kfree(data->wbuffer->buffer);
+                kfree(data->wbuffer);
+        }
+
+        module_put(entry->module);
+        kfree(data);
+        return 0;
+}
+
+static const struct file_operations snd_info_text_entry_ops =
 {
         .owner =                THIS_MODULE,
-        .llseek =               snd_info_entry_llseek,
-        .read =                 snd_info_entry_read,
-        .write =                snd_info_entry_write,
-        .poll =                 snd_info_entry_poll,
-        .unlocked_ioctl =       snd_info_entry_ioctl,
-        .mmap =                 snd_info_entry_mmap,
-        .open =                 snd_info_entry_open,
-        .release =              snd_info_entry_release,
+        .open =                 snd_info_text_entry_open,
+        .release =              snd_info_text_entry_release,
+        .write =                snd_info_text_entry_write,
+        .llseek =               seq_lseek,
+        .read =                 seq_read,
 };
 
-int __init snd_info_init(void)
+static struct snd_info_entry *create_subdir(struct module *mod,
+                                            const char *name)
 {
-        struct proc_dir_entry *p;
+        struct snd_info_entry *entry;
 
-        p = proc_mkdir("asound", NULL);
-        if (p == NULL)
+        entry = snd_info_create_module_entry(mod, name, NULL);
+        if (!entry)
+                return NULL;
+        entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
+        if (snd_info_register(entry) < 0) {
+                snd_info_free_entry(entry);
+                return NULL;
+        }
+        return entry;
+}
+
+static struct snd_info_entry *
+snd_info_create_entry(const char *name, struct snd_info_entry *parent);
+
+int __init snd_info_init(void)
+{
+        snd_proc_root = snd_info_create_entry("asound", NULL);
+        if (!snd_proc_root)
                 return -ENOMEM;
-        snd_proc_root = p;
+        snd_proc_root->mode = S_IFDIR | S_IRUGO | S_IXUGO;
+        snd_proc_root->p = proc_mkdir("asound", NULL);
+        if (!snd_proc_root->p)
+                goto error;
 #ifdef CONFIG_SND_OSSEMUL
-        {
-                struct snd_info_entry *entry;
-                if ((entry = snd_info_create_module_entry(THIS_MODULE, "oss", NULL)) == NULL)
-                        return -ENOMEM;
-                entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
-                if (snd_info_register(entry) < 0) {
-                        snd_info_free_entry(entry);
-                        return -ENOMEM;
-                }
-                snd_oss_root = entry;
-        }
+        snd_oss_root = create_subdir(THIS_MODULE, "oss");
+        if (!snd_oss_root)
+                goto error;
 #endif
 #if IS_ENABLED(CONFIG_SND_SEQUENCER)
-        {
-                struct snd_info_entry *entry;
-                if ((entry = snd_info_create_module_entry(THIS_MODULE, "seq", NULL)) == NULL)
-                        return -ENOMEM;
-                entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
-                if (snd_info_register(entry) < 0) {
-                        snd_info_free_entry(entry);
-                        return -ENOMEM;
-                }
-                snd_seq_root = entry;
-        }
+        snd_seq_root = create_subdir(THIS_MODULE, "seq");
+        if (!snd_seq_root)
+                goto error;
 #endif
-        snd_info_version_init();
-        snd_minor_info_init();
-        snd_minor_info_oss_init();
-        snd_card_info_init();
+        if (snd_info_version_init() < 0 ||
+            snd_minor_info_init() < 0 ||
+            snd_minor_info_oss_init() < 0 ||
+            snd_card_info_init() < 0 ||
+            snd_info_minor_register() < 0)
+                goto error;
         return 0;
+
+ error:
+        snd_info_free_entry(snd_proc_root);
+        return -ENOMEM;
 }
 
 int __exit snd_info_done(void)
 {
-        snd_card_info_done();
-        snd_minor_info_oss_done();
-        snd_minor_info_done();
-        snd_info_version_done();
-        if (snd_proc_root) {
-#if IS_ENABLED(CONFIG_SND_SEQUENCER)
-                snd_info_free_entry(snd_seq_root);
-#endif
-#ifdef CONFIG_SND_OSSEMUL
-                snd_info_free_entry(snd_oss_root);
-#endif
-                proc_remove(snd_proc_root);
-        }
+        snd_info_free_entry(snd_proc_root);
         return 0;
 }
 
 /*
-
- */
-
-
-/*
  * create a card proc file
  * called from init.c
  */
@@ -601,33 +509,58 @@ int snd_info_card_create(struct snd_card *card)
                 return -ENXIO;
 
         sprintf(str, "card%i", card->number);
-        if ((entry = snd_info_create_module_entry(card->module, str, NULL)) == NULL)
-                return -ENOMEM;
-        entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
-        if (snd_info_register(entry) < 0) {
-                snd_info_free_entry(entry);
+        entry = create_subdir(card->module, str);
+        if (!entry)
                 return -ENOMEM;
-        }
         card->proc_root = entry;
         return 0;
 }
 
+/* register all pending info entries */
+static int snd_info_register_recursive(struct snd_info_entry *entry)
+{
+        struct snd_info_entry *p;
+        int err;
+
+        if (!entry->p) {
+                err = snd_info_register(entry);
+                if (err < 0)
+                        return err;
+        }
+
+        list_for_each_entry(p, &entry->children, list) {
+                err = snd_info_register_recursive(p);
+                if (err < 0)
+                        return err;
+        }
+
+        return 0;
+}
+
 /*
  * register the card proc file
  * called from init.c
+ * can be called multiple times for reinitialization
  */
 int snd_info_card_register(struct snd_card *card)
 {
         struct proc_dir_entry *p;
+        int err;
 
         if (snd_BUG_ON(!card))
                 return -ENXIO;
 
+        err = snd_info_register_recursive(card->proc_root);
+        if (err < 0)
+                return err;
+
         if (!strcmp(card->id, card->proc_root->name))
                 return 0;
 
-        p = proc_symlink(card->id, snd_proc_root, card->proc_root->name);
-        if (p == NULL)
+        if (card->proc_root_link)
+                return 0;
+        p = proc_symlink(card->id, snd_proc_root->p, card->proc_root->name);
+        if (!p)
                 return -ENOMEM;
         card->proc_root_link = p;
         return 0;
@@ -645,7 +578,7 @@ void snd_info_card_id_change(struct snd_card *card)
         }
         if (strcmp(card->id, card->proc_root->name))
                 card->proc_root_link = proc_symlink(card->id,
-                                                    snd_proc_root,
+                                                    snd_proc_root->p,
                                                     card->proc_root->name);
         mutex_unlock(&info_mutex);
 }
@@ -753,9 +686,10 @@ const char *snd_info_get_str(char *dest, const char *src, int len)
 
 EXPORT_SYMBOL(snd_info_get_str);
 
-/**
+/*
  * snd_info_create_entry - create an info entry
  * @name: the proc file name
+ * @parent: the parent directory
  *
  * Creates an info entry with the given file name and initializes as
  * the default state.
@@ -765,7 +699,8 @@ EXPORT_SYMBOL(snd_info_get_str);
  *
  * Return: The pointer of the new instance, or %NULL on failure.
  */
-static struct snd_info_entry *snd_info_create_entry(const char *name)
+static struct snd_info_entry *
+snd_info_create_entry(const char *name, struct snd_info_entry *parent)
 {
         struct snd_info_entry *entry;
         entry = kzalloc(sizeof(*entry), GFP_KERNEL);
@@ -781,6 +716,9 @@ static struct snd_info_entry *snd_info_create_entry(const char *name)
         mutex_init(&entry->access);
         INIT_LIST_HEAD(&entry->children);
         INIT_LIST_HEAD(&entry->list);
+        entry->parent = parent;
+        if (parent)
+                list_add_tail(&entry->list, &parent->children);
         return entry;
 }
 
@@ -798,11 +736,9 @@ struct snd_info_entry *snd_info_create_module_entry(struct module * module,
                                                const char *name,
                                                struct snd_info_entry *parent)
 {
-        struct snd_info_entry *entry = snd_info_create_entry(name);
-        if (entry) {
+        struct snd_info_entry *entry = snd_info_create_entry(name, parent);
+        if (entry)
                 entry->module = module;
-                entry->parent = parent;
-        }
         return entry;
 }
 
@@ -822,11 +758,10 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,
                                              const char *name,
                                              struct snd_info_entry * parent)
 {
-        struct snd_info_entry *entry = snd_info_create_entry(name);
+        struct snd_info_entry *entry = snd_info_create_entry(name, parent);
         if (entry) {
                 entry->module = card->module;
                 entry->card = card;
-                entry->parent = parent;
         }
         return entry;
 }
@@ -835,95 +770,39 @@ EXPORT_SYMBOL(snd_info_create_card_entry);
 
 static void snd_info_disconnect(struct snd_info_entry *entry)
 {
-        struct list_head *p, *n;
-        struct proc_dir_entry *root;
-
-        list_for_each_safe(p, n, &entry->children) {
-                snd_info_disconnect(list_entry(p, struct snd_info_entry, list));
-        }
+        struct snd_info_entry *p;
 
-        if (! entry->p)
+        if (!entry->p)
                 return;
-        list_del_init(&entry->list);
-        root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
-        snd_BUG_ON(!root);
+        list_for_each_entry(p, &entry->children, list)
+                snd_info_disconnect(p);
         proc_remove(entry->p);
         entry->p = NULL;
 }
 
-static int snd_info_dev_free_entry(struct snd_device *device)
-{
-        struct snd_info_entry *entry = device->device_data;
-        snd_info_free_entry(entry);
-        return 0;
-}
-
-static int snd_info_dev_register_entry(struct snd_device *device)
-{
-        struct snd_info_entry *entry = device->device_data;
-        return snd_info_register(entry);
-}
-
-/**
- * snd_card_proc_new - create an info entry for the given card
- * @card: the card instance
- * @name: the file name
- * @entryp: the pointer to store the new info entry
- *
- * Creates a new info entry and assigns it to the given card.
- * Unlike snd_info_create_card_entry(), this function registers the
- * info entry as an ALSA device component, so that it can be
- * unregistered/released without explicit call.
- * Also, you don't have to register this entry via snd_info_register(),
- * since this will be registered by snd_card_register() automatically.
- *
- * The parent is assumed as card->proc_root.
- *
- * For releasing this entry, use snd_device_free() instead of
- * snd_info_free_entry(). 
- *
- * Return: Zero if successful, or a negative error code on failure.
- */
-int snd_card_proc_new(struct snd_card *card, const char *name,
-                      struct snd_info_entry **entryp)
-{
-        static struct snd_device_ops ops = {
-                .dev_free = snd_info_dev_free_entry,
-                .dev_register = snd_info_dev_register_entry,
-                /* disconnect is done via snd_info_card_disconnect() */
-        };
-        struct snd_info_entry *entry;
-        int err;
-
-        entry = snd_info_create_card_entry(card, name, card->proc_root);
-        if (! entry)
-                return -ENOMEM;
-        if ((err = snd_device_new(card, SNDRV_DEV_INFO, entry, &ops)) < 0) {
-                snd_info_free_entry(entry);
-                return err;
-        }
-        if (entryp)
-                *entryp = entry;
-        return 0;
-}
-
-EXPORT_SYMBOL(snd_card_proc_new);
-
 /**
  * snd_info_free_entry - release the info entry
  * @entry: the info entry
  *
- * Releases the info entry.  Don't call this after registered.
+ * Releases the info entry.
  */
 void snd_info_free_entry(struct snd_info_entry * entry)
 {
-        if (entry == NULL)
+        struct snd_info_entry *p, *n;
+
+        if (!entry)
                 return;
         if (entry->p) {
                 mutex_lock(&info_mutex);
                 snd_info_disconnect(entry);
                 mutex_unlock(&info_mutex);
         }
+
+        /* free all children at first */
+        list_for_each_entry_safe(p, n, &entry->children, list)
+                snd_info_free_entry(p);
+
+        list_del(&entry->list);
         kfree(entry->name);
         if (entry->private_free)
                 entry->private_free(entry);
@@ -946,7 +825,7 @@ int snd_info_register(struct snd_info_entry * entry)
 
         if (snd_BUG_ON(!entry))
                 return -ENXIO;
-        root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
+        root = entry->parent == NULL ? snd_proc_root->p : entry->parent->p;
         mutex_lock(&info_mutex);
         if (S_ISDIR(entry->mode)) {
                 p = proc_mkdir_mode(entry->name, entry->mode, root);
@@ -955,8 +834,13 @@ int snd_info_register(struct snd_info_entry * entry)
                         return -ENOMEM;
                 }
         } else {
+                const struct file_operations *ops;
+                if (entry->content == SNDRV_INFO_CONTENT_DATA)
+                        ops = &snd_info_entry_operations;
+                else
+                        ops = &snd_info_text_entry_ops;
                 p = proc_create_data(entry->name, entry->mode, root,
-                                        &snd_info_entry_operations, entry);
+                                     ops, entry);
                 if (!p) {
                         mutex_unlock(&info_mutex);
                         return -ENOMEM;
@@ -964,8 +848,6 @@ int snd_info_register(struct snd_info_entry * entry)
                 proc_set_size(p, entry->size);
         }
         entry->p = p;
-        if (entry->parent)
-                list_add_tail(&entry->list, &entry->parent->children);
         mutex_unlock(&info_mutex);
         return 0;
 }
@@ -976,8 +858,6 @@ EXPORT_SYMBOL(snd_info_register);
 
  */
 
-static struct snd_info_entry *snd_info_version_entry;
-
 static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
         snd_iprintf(buffer,
@@ -993,18 +873,5 @@ static int __init snd_info_version_init(void)
         if (entry == NULL)
                 return -ENOMEM;
         entry->c.text.read = snd_info_version_read;
-        if (snd_info_register(entry) < 0) {
-                snd_info_free_entry(entry);
-                return -ENOMEM;
-        }
-        snd_info_version_entry = entry;
-        return 0;
+        return snd_info_register(entry); /* freed in error path */
 }
-
-static int __exit snd_info_version_done(void)
-{
-        snd_info_free_entry(snd_info_version_entry);
-        return 0;
-}
-
-#endif /* CONFIG_PROC_FS */
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index 83c29dbff9c0..1478c8dfd473 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -29,15 +29,12 @@
 #include <linux/utsname.h>
 #include <linux/mutex.h>
 
-#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
-
 /*
  *  OSS compatible part
  */
 
 static DEFINE_MUTEX(strings);
 static char *snd_sndstat_strings[SNDRV_CARDS][SNDRV_OSS_INFO_DEV_COUNT];
-static struct snd_info_entry *snd_sndstat_proc_entry;
 
 int snd_oss_info_register(int dev, int num, char *string)
 {
@@ -112,27 +109,15 @@ static void snd_sndstat_proc_read(struct snd_info_entry *entry,
         snd_sndstat_show_strings(buffer, "Mixers", SNDRV_OSS_INFO_DEV_MIXERS);
 }
 
-int snd_info_minor_register(void)
+int __init snd_info_minor_register(void)
 {
         struct snd_info_entry *entry;
 
         memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings));
-        if ((entry = snd_info_create_module_entry(THIS_MODULE, "sndstat", snd_oss_root)) != NULL) {
-                entry->c.text.read = snd_sndstat_proc_read;
-                if (snd_info_register(entry) < 0) {
-                        snd_info_free_entry(entry);
-                        entry = NULL;
-                }
-        }
-        snd_sndstat_proc_entry = entry;
-        return 0;
+        entry = snd_info_create_module_entry(THIS_MODULE, "sndstat",
+                                             snd_oss_root);
+        if (!entry)
+                return -ENOMEM;
+        entry->c.text.read = snd_sndstat_proc_read;
+        return snd_info_register(entry); /* freed in error path */
 }
-
-int snd_info_minor_unregister(void)
-{
-        snd_info_free_entry(snd_sndstat_proc_entry);
-        snd_sndstat_proc_entry = NULL;
-        return 0;
-}
-
-#endif /* CONFIG_SND_OSSEMUL */
diff --git a/sound/core/init.c b/sound/core/init.c
index 04734e047bfe..f8abd2d8144e 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -107,26 +107,20 @@ static void snd_card_id_read(struct snd_info_entry *entry,
         snd_iprintf(buffer, "%s\n", entry->card->id);
 }
 
-static inline int init_info_for_card(struct snd_card *card)
+static int init_info_for_card(struct snd_card *card)
 {
         int err;
         struct snd_info_entry *entry;
 
-        if ((err = snd_info_card_register(card)) < 0) {
-                dev_dbg(card->dev, "unable to create card info\n");
-                return err;
-        }
-        if ((entry = snd_info_create_card_entry(card, "id", card->proc_root)) == NULL) {
+        entry = snd_info_create_card_entry(card, "id", card->proc_root);
+        if (!entry) {
                 dev_dbg(card->dev, "unable to create card entry\n");
                 return err;
         }
         entry->c.text.read = snd_card_id_read;
-        if (snd_info_register(entry) < 0) {
-                snd_info_free_entry(entry);
-                entry = NULL;
-        }
         card->proc_id = entry;
-        return 0;
+
+        return snd_info_card_register(card);
 }
 #else /* !CONFIG_PROC_FS */
 #define init_info_for_card(card)
@@ -756,7 +750,7 @@ int snd_card_register(struct snd_card *card)
         if (snd_cards[card->number]) {
                 /* already registered */
                 mutex_unlock(&snd_card_mutex);
-                return 0;
+                return snd_info_card_register(card); /* register pending info */
         }
         if (*card->id) {
                 /* make a unique id name from the given string */
@@ -783,8 +777,6 @@ int snd_card_register(struct snd_card *card)
 EXPORT_SYMBOL(snd_card_register);
 
 #ifdef CONFIG_PROC_FS
-static struct snd_info_entry *snd_card_info_entry;
-
 static void snd_card_info_read(struct snd_info_entry *entry,
                                struct snd_info_buffer *buffer)
 {
@@ -810,7 +802,6 @@ static void snd_card_info_read(struct snd_info_entry *entry,
 }
 
 #ifdef CONFIG_SND_OSSEMUL
-
 void snd_card_info_read_oss(struct snd_info_buffer *buffer)
 {
         int idx, count;
@@ -832,7 +823,6 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer)
 #endif
 
 #ifdef MODULE
-static struct snd_info_entry *snd_card_module_info_entry;
 static void snd_card_module_info_read(struct snd_info_entry *entry,
                                       struct snd_info_buffer *buffer)
 {
@@ -857,35 +847,20 @@ int __init snd_card_info_init(void)
         if (! entry)
                 return -ENOMEM;
         entry->c.text.read = snd_card_info_read;
-        if (snd_info_register(entry) < 0) {
-                snd_info_free_entry(entry);
-                return -ENOMEM;
-        }
-        snd_card_info_entry = entry;
+        if (snd_info_register(entry) < 0)
+                return -ENOMEM; /* freed in error path */
 
 #ifdef MODULE
         entry = snd_info_create_module_entry(THIS_MODULE, "modules", NULL);
-        if (entry) {
-                entry->c.text.read = snd_card_module_info_read;
-                if (snd_info_register(entry) < 0)
-                        snd_info_free_entry(entry);
-                else
-                        snd_card_module_info_entry = entry;
-        }
+        if (!entry)
+                return -ENOMEM;
+        entry->c.text.read = snd_card_module_info_read;
+        if (snd_info_register(entry) < 0)
+                return -ENOMEM; /* freed in error path */
 #endif
 
         return 0;
 }
-
-int __exit snd_card_info_done(void)
-{
-        snd_info_free_entry(snd_card_info_entry);
-#ifdef MODULE
-        snd_info_free_entry(snd_card_module_info_entry);
-#endif
-        return 0;
-}
-
 #endif /* CONFIG_PROC_FS */
 
 /**
diff --git a/sound/core/jack.c b/sound/core/jack.c
index 8658578eb584..7237acbdcbbc 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -24,6 +24,13 @@
 #include <linux/module.h>
 #include <sound/jack.h>
 #include <sound/core.h>
+#include <sound/control.h>
+
+struct snd_jack_kctl {
+        struct snd_kcontrol *kctl;
+        struct list_head list;  /* list of controls belong to the same jack */
+        unsigned int mask_bits; /* only masked status bits are reported via kctl */
+};
 
 static int jack_switch_types[SND_JACK_SWITCH_TYPES] = {
         SW_HEADPHONE_INSERT,
@@ -54,7 +61,13 @@ static int snd_jack_dev_disconnect(struct snd_device *device)
 static int snd_jack_dev_free(struct snd_device *device)
 {
         struct snd_jack *jack = device->device_data;
+        struct snd_card *card = device->card;
+        struct snd_jack_kctl *jack_kctl, *tmp_jack_kctl;
 
+        list_for_each_entry_safe(jack_kctl, tmp_jack_kctl, &jack->kctl_list, list) {
+                list_del_init(&jack_kctl->list);
+                snd_ctl_remove(card, jack_kctl->kctl);
+        }
         if (jack->private_free)
                 jack->private_free(jack);
 
@@ -74,6 +87,10 @@ static int snd_jack_dev_register(struct snd_device *device)
 
         snprintf(jack->name, sizeof(jack->name), "%s %s",
                  card->shortname, jack->id);
+
+        if (!jack->input_dev)
+                return 0;
+
         jack->input_dev->name = jack->name;
 
         /* Default to the sound card device. */
@@ -100,6 +117,77 @@ static int snd_jack_dev_register(struct snd_device *device)
         return err;
 }
 
+static void snd_jack_kctl_private_free(struct snd_kcontrol *kctl)
+{
+        struct snd_jack_kctl *jack_kctl;
+
+        jack_kctl = kctl->private_data;
+        if (jack_kctl) {
+                list_del(&jack_kctl->list);
+                kfree(jack_kctl);
+        }
+}
+
+static void snd_jack_kctl_add(struct snd_jack *jack, struct snd_jack_kctl *jack_kctl)
+{
+        list_add_tail(&jack_kctl->list, &jack->kctl_list);
+}
+
+static struct snd_jack_kctl * snd_jack_kctl_new(struct snd_card *card, const char *name, unsigned int mask)
+{
+        struct snd_kcontrol *kctl;
+        struct snd_jack_kctl *jack_kctl;
+        int err;
+
+        kctl = snd_kctl_jack_new(name, card);
+        if (!kctl)
+                return NULL;
+
+        err = snd_ctl_add(card, kctl);
+        if (err < 0)
+                return NULL;
+
+        jack_kctl = kzalloc(sizeof(*jack_kctl), GFP_KERNEL);
+
+        if (!jack_kctl)
+                goto error;
+
+        jack_kctl->kctl = kctl;
+        jack_kctl->mask_bits = mask;
+
+        kctl->private_data = jack_kctl;
+        kctl->private_free = snd_jack_kctl_private_free;
+
+        return jack_kctl;
+error:
+        snd_ctl_free_one(kctl);
+        return NULL;
+}
+
+/**
+ * snd_jack_add_new_kctl - Create a new snd_jack_kctl and add it to jack
+ * @jack:  the jack instance which the kctl will attaching to
+ * @name:  the name for the snd_kcontrol object
+ * @mask:  a bitmask of enum snd_jack_type values that can be detected
+ *         by this snd_jack_kctl object.
+ *
+ * Creates a new snd_kcontrol object and adds it to the jack kctl_list.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
+ */
+int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask)
+{
+        struct snd_jack_kctl *jack_kctl;
+
+        jack_kctl = snd_jack_kctl_new(jack->card, name, mask);
+        if (!jack_kctl)
+                return -ENOMEM;
+
+        snd_jack_kctl_add(jack, jack_kctl);
+        return 0;
+}
+EXPORT_SYMBOL(snd_jack_add_new_kctl);
+
 /**
  * snd_jack_new - Create a new jack
  * @card:  the card instance
@@ -107,6 +195,8 @@ static int snd_jack_dev_register(struct snd_device *device)
  * @type:  a bitmask of enum snd_jack_type values that can be detected by
  *         this jack
  * @jjack: Used to provide the allocated jack object to the caller.
+ * @initial_kctl: if true, create a kcontrol and add it to the jack list.
+ * @phantom_jack: Don't create a input device for phantom jacks.
  *
  * Creates a new jack object.
  *
@@ -114,9 +204,10 @@ static int snd_jack_dev_register(struct snd_device *device)
  * On success @jjack will be initialised.
  */
 int snd_jack_new(struct snd_card *card, const char *id, int type,
-                 struct snd_jack **jjack)
+                 struct snd_jack **jjack, bool initial_kctl, bool phantom_jack)
 {
         struct snd_jack *jack;
+        struct snd_jack_kctl *jack_kctl = NULL;
         int err;
         int i;
         static struct snd_device_ops ops = {
@@ -125,31 +216,47 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
                 .dev_disconnect = snd_jack_dev_disconnect,
         };
 
+        if (initial_kctl) {
+                jack_kctl = snd_jack_kctl_new(card, id, type);
+                if (!jack_kctl)
+                        return -ENOMEM;
+        }
+
         jack = kzalloc(sizeof(struct snd_jack), GFP_KERNEL);
         if (jack == NULL)
                 return -ENOMEM;
 
         jack->id = kstrdup(id, GFP_KERNEL);
 
-        jack->input_dev = input_allocate_device();
-        if (jack->input_dev == NULL) {
-                err = -ENOMEM;
-                goto fail_input;
-        }
+        /* don't creat input device for phantom jack */
+        if (!phantom_jack) {
+                jack->input_dev = input_allocate_device();
+                if (jack->input_dev == NULL) {
+                        err = -ENOMEM;
+                        goto fail_input;
+                }
 
-        jack->input_dev->phys = "ALSA";
+                jack->input_dev->phys = "ALSA";
 
-        jack->type = type;
+                jack->type = type;
 
-        for (i = 0; i < SND_JACK_SWITCH_TYPES; i++)
-                if (type & (1 << i))
-                        input_set_capability(jack->input_dev, EV_SW,
-                                             jack_switch_types[i]);
+                for (i = 0; i < SND_JACK_SWITCH_TYPES; i++)
+                        if (type & (1 << i))
+                                input_set_capability(jack->input_dev, EV_SW,
+                                                     jack_switch_types[i]);
+
+        }
 
         err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);
         if (err < 0)
                 goto fail_input;
 
+        jack->card = card;
+        INIT_LIST_HEAD(&jack->kctl_list);
+
+        if (initial_kctl)
+                snd_jack_kctl_add(jack, jack_kctl);
+
         *jjack = jack;
 
         return 0;
@@ -175,6 +282,8 @@ EXPORT_SYMBOL(snd_jack_new);
 void snd_jack_set_parent(struct snd_jack *jack, struct device *parent)
 {
         WARN_ON(jack->registered);
+        if (!jack->input_dev)
+                return;
 
         jack->input_dev->dev.parent = parent;
 }
@@ -230,11 +339,19 @@ EXPORT_SYMBOL(snd_jack_set_key);
  */
 void snd_jack_report(struct snd_jack *jack, int status)
 {
+        struct snd_jack_kctl *jack_kctl;
         int i;
 
         if (!jack)
                 return;
 
+        list_for_each_entry(jack_kctl, &jack->kctl_list, list)
+                snd_kctl_jack_report(jack->card, jack_kctl->kctl,
+                                            status & jack_kctl->mask_bits);
+
+        if (!jack->input_dev)
+                return;
+
         for (i = 0; i < ARRAY_SIZE(jack->key); i++) {
                 int testbit = SND_JACK_BTN_0 >> i;
 
@@ -252,9 +369,6 @@ void snd_jack_report(struct snd_jack *jack, int status)
         }
 
         input_sync(jack->input_dev);
+
 }
 EXPORT_SYMBOL(snd_jack_report);
-
-MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
-MODULE_DESCRIPTION("Jack detection support for ALSA");
-MODULE_LICENSE("GPL");
diff --git a/sound/core/seq/Makefile b/sound/core/seq/Makefile
index 941f64a853eb..b29ffe835205 100644
--- a/sound/core/seq/Makefile
+++ b/sound/core/seq/Makefile
@@ -6,7 +6,8 @@
 snd-seq-device-objs := seq_device.o
 snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \
                 seq_fifo.o seq_prioq.o seq_timer.o \
-                seq_system.o seq_ports.o seq_info.o
+                seq_system.o seq_ports.o
+snd-seq-$(CONFIG_PROC_FS) += seq_info.o
 snd-seq-midi-objs := seq_midi.o
 snd-seq-midi-emul-objs := seq_midi_emul.o
 snd-seq-midi-event-objs := seq_midi_event.o
diff --git a/sound/core/seq/seq_info.c b/sound/core/seq/seq_info.c
index acf7769419f0..97015447b9b3 100644
--- a/sound/core/seq/seq_info.c
+++ b/sound/core/seq/seq_info.c
@@ -27,7 +27,6 @@
 #include "seq_clientmgr.h"
 #include "seq_timer.h"
 
-#ifdef CONFIG_PROC_FS
 static struct snd_info_entry *queues_entry;
 static struct snd_info_entry *clients_entry;
 static struct snd_info_entry *timer_entry;
@@ -51,6 +50,13 @@ create_info_entry(char *name, void (*read)(struct snd_info_entry *,
         return entry;
 }
 
+static void free_info_entries(void)
+{
+        snd_info_free_entry(queues_entry);
+        snd_info_free_entry(clients_entry);
+        snd_info_free_entry(timer_entry);
+}
+
 /* create all our /proc entries */
 int __init snd_seq_info_init(void)
 {
@@ -59,14 +65,17 @@ int __init snd_seq_info_init(void)
         clients_entry = create_info_entry("clients",
                                           snd_seq_info_clients_read);
         timer_entry = create_info_entry("timer", snd_seq_info_timer_read);
+        if (!queues_entry || !clients_entry || !timer_entry)
+                goto error;
         return 0;
+
+ error:
+        free_info_entries();
+        return -ENOMEM;
 }
 
 int __exit snd_seq_info_done(void)
 {
-        snd_info_free_entry(queues_entry);
-        snd_info_free_entry(clients_entry);
-        snd_info_free_entry(timer_entry);
+        free_info_entries();
         return 0;
 }
-#endif
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 5fc93d00572a..e5d37bd7c226 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -334,9 +334,6 @@ EXPORT_SYMBOL(snd_unregister_device);
 /*
  *  INFO PART
  */
-
-static struct snd_info_entry *snd_minor_info_entry;
-
 static const char *snd_device_type_name(int type)
 {
         switch (type) {
@@ -389,21 +386,10 @@ int __init snd_minor_info_init(void)
         struct snd_info_entry *entry;
 
         entry = snd_info_create_module_entry(THIS_MODULE, "devices", NULL);
-        if (entry) {
-                entry->c.text.read = snd_minor_info_read;
-                if (snd_info_register(entry) < 0) {
-                        snd_info_free_entry(entry);
-                        entry = NULL;
-                }
-        }
-        snd_minor_info_entry = entry;
-        return 0;
-}
-
-int __exit snd_minor_info_done(void)
-{
-        snd_info_free_entry(snd_minor_info_entry);
-        return 0;
+        if (!entry)
+                return -ENOMEM;
+        entry->c.text.read = snd_minor_info_read;
+        return snd_info_register(entry); /* freed in error path */
 }
 #endif /* CONFIG_PROC_FS */
 
@@ -423,7 +409,6 @@ static int __init alsa_sound_init(void)
                 unregister_chrdev(major, "alsa");
                 return -ENOMEM;
         }
-        snd_info_minor_register();
 #ifndef MODULE
         pr_info("Advanced Linux Sound Architecture Driver Initialized.\n");
 #endif
@@ -432,7 +417,6 @@ static int __init alsa_sound_init(void)
 
 static void __exit alsa_sound_exit(void)
 {
-        snd_info_minor_unregister();
         snd_info_done();
         unregister_chrdev(major, "alsa");
 }
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index 573a65eb2b79..86e2d91dd375 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -19,12 +19,6 @@
  *
  */
 
-#ifdef CONFIG_SND_OSSEMUL
-
-#if !IS_ENABLED(CONFIG_SOUND)
-#error "Enable the OSS soundcore multiplexer (CONFIG_SOUND) in the kernel."
-#endif
-
 #include <linux/init.h>
 #include <linux/export.h>
 #include <linux/slab.h>
@@ -214,9 +208,6 @@ EXPORT_SYMBOL(snd_unregister_oss_device);
  */
 
 #ifdef CONFIG_PROC_FS
-
-static struct snd_info_entry *snd_minor_info_oss_entry;
-
 static const char *snd_oss_device_type_name(int type)
 {
         switch (type) {
@@ -263,22 +254,9 @@ int __init snd_minor_info_oss_init(void)
         struct snd_info_entry *entry;
 
         entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root);
-        if (entry) {
-                entry->c.text.read = snd_minor_info_oss_read;
-                if (snd_info_register(entry) < 0) {
-                        snd_info_free_entry(entry);
-                        entry = NULL;
-                }
-        }
-        snd_minor_info_oss_entry = entry;
-        return 0;
-}
-
-int __exit snd_minor_info_oss_done(void)
-{
-        snd_info_free_entry(snd_minor_info_oss_entry);
-        return 0;
+        if (!entry)
+                return -ENOMEM;
+        entry->c.text.read = snd_minor_info_oss_read;
+        return snd_info_register(entry); /* freed in error path */
 }
 #endif /* CONFIG_PROC_FS */
-
-#endif /* CONFIG_SND_OSSEMUL */
diff --git a/sound/hda/Kconfig b/sound/hda/Kconfig
index 001c6588a5ff..ac5ffac2a272 100644
--- a/sound/hda/Kconfig
+++ b/sound/hda/Kconfig
@@ -1,3 +1,12 @@
 config SND_HDA_CORE
         tristate
         select REGMAP
+
+config SND_HDA_DSP_LOADER
+        bool
+
+config SND_HDA_I915
+        bool
+        default y
+        depends on DRM_I915
+        depends on SND_HDA_CORE
diff --git a/sound/hda/Makefile b/sound/hda/Makefile
index 7a359f5b7e25..55dd465c7042 100644
--- a/sound/hda/Makefile
+++ b/sound/hda/Makefile
@@ -1,7 +1,10 @@
 snd-hda-core-objs := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o \
-        hdac_regmap.o array.o
+        hdac_regmap.o hdac_controller.o hdac_stream.o array.o
 
 snd-hda-core-objs += trace.o
 CFLAGS_trace.o := -I$(src)
 
+# for sync with i915 gfx driver
+snd-hda-core-$(CONFIG_SND_HDA_I915) += hdac_i915.o
+
 obj-$(CONFIG_SND_HDA_CORE) += snd-hda-core.o
diff --git a/sound/hda/hdac_bus.c b/sound/hda/hdac_bus.c
index 8e262da74f6a..27c447e4fe5c 100644
--- a/sound/hda/hdac_bus.c
+++ b/sound/hda/hdac_bus.c
@@ -11,21 +11,36 @@
 
 static void process_unsol_events(struct work_struct *work);
 
+static const struct hdac_bus_ops default_ops = {
+        .command = snd_hdac_bus_send_cmd,
+        .get_response = snd_hdac_bus_get_response,
+};
+
 /**
  * snd_hdac_bus_init - initialize a HD-audio bas bus
  * @bus: the pointer to bus object
+ * @ops: bus verb operators
+ * @io_ops: lowlevel I/O operators
  *
  * Returns 0 if successful, or a negative error code.
  */
 int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,
-                      const struct hdac_bus_ops *ops)
+                      const struct hdac_bus_ops *ops,
+                      const struct hdac_io_ops *io_ops)
 {
         memset(bus, 0, sizeof(*bus));
         bus->dev = dev;
-        bus->ops = ops;
+        if (ops)
+                bus->ops = ops;
+        else
+                bus->ops = &default_ops;
+        bus->io_ops = io_ops;
+        INIT_LIST_HEAD(&bus->stream_list);
         INIT_LIST_HEAD(&bus->codec_list);
         INIT_WORK(&bus->unsol_work, process_unsol_events);
+        spin_lock_init(&bus->reg_lock);
         mutex_init(&bus->cmd_mutex);
+        bus->irq = -1;
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hdac_bus_init);
@@ -36,6 +51,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_bus_init);
  */
 void snd_hdac_bus_exit(struct hdac_bus *bus)
 {
+        WARN_ON(!list_empty(&bus->stream_list));
         WARN_ON(!list_empty(&bus->codec_list));
         cancel_work_sync(&bus->unsol_work);
 }
diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c
new file mode 100644
index 000000000000..b5a17cb510a0
--- /dev/null
+++ b/sound/hda/hdac_controller.c
@@ -0,0 +1,507 @@
+/*
+ * HD-audio controller helpers
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/export.h>
+#include <sound/core.h>
+#include <sound/hdaudio.h>
+#include <sound/hda_register.h>
+
+/* clear CORB read pointer properly */
+static void azx_clear_corbrp(struct hdac_bus *bus)
+{
+        int timeout;
+
+        for (timeout = 1000; timeout > 0; timeout--) {
+                if (snd_hdac_chip_readw(bus, CORBRP) & AZX_CORBRP_RST)
+                        break;
+                udelay(1);
+        }
+        if (timeout <= 0)
+                dev_err(bus->dev, "CORB reset timeout#1, CORBRP = %d\n",
+                        snd_hdac_chip_readw(bus, CORBRP));
+
+        snd_hdac_chip_writew(bus, CORBRP, 0);
+        for (timeout = 1000; timeout > 0; timeout--) {
+                if (snd_hdac_chip_readw(bus, CORBRP) == 0)
+                        break;
+                udelay(1);
+        }
+        if (timeout <= 0)
+                dev_err(bus->dev, "CORB reset timeout#2, CORBRP = %d\n",
+                        snd_hdac_chip_readw(bus, CORBRP));
+}
+
+/**
+ * snd_hdac_bus_init_cmd_io - set up CORB/RIRB buffers
+ * @bus: HD-audio core bus
+ */
+void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus)
+{
+        spin_lock_irq(&bus->reg_lock);
+        /* CORB set up */
+        bus->corb.addr = bus->rb.addr;
+        bus->corb.buf = (__le32 *)bus->rb.area;
+        snd_hdac_chip_writel(bus, CORBLBASE, (u32)bus->corb.addr);
+        snd_hdac_chip_writel(bus, CORBUBASE, upper_32_bits(bus->corb.addr));
+
+        /* set the corb size to 256 entries (ULI requires explicitly) */
+        snd_hdac_chip_writeb(bus, CORBSIZE, 0x02);
+        /* set the corb write pointer to 0 */
+        snd_hdac_chip_writew(bus, CORBWP, 0);
+
+        /* reset the corb hw read pointer */
+        snd_hdac_chip_writew(bus, CORBRP, AZX_CORBRP_RST);
+        if (!bus->corbrp_self_clear)
+                azx_clear_corbrp(bus);
+
+        /* enable corb dma */
+        snd_hdac_chip_writeb(bus, CORBCTL, AZX_CORBCTL_RUN);
+
+        /* RIRB set up */
+        bus->rirb.addr = bus->rb.addr + 2048;
+        bus->rirb.buf = (__le32 *)(bus->rb.area + 2048);
+        bus->rirb.wp = bus->rirb.rp = 0;
+        memset(bus->rirb.cmds, 0, sizeof(bus->rirb.cmds));
+        snd_hdac_chip_writel(bus, RIRBLBASE, (u32)bus->rirb.addr);
+        snd_hdac_chip_writel(bus, RIRBUBASE, upper_32_bits(bus->rirb.addr));
+
+        /* set the rirb size to 256 entries (ULI requires explicitly) */
+        snd_hdac_chip_writeb(bus, RIRBSIZE, 0x02);
+        /* reset the rirb hw write pointer */
+        snd_hdac_chip_writew(bus, RIRBWP, AZX_RIRBWP_RST);
+        /* set N=1, get RIRB response interrupt for new entry */
+        snd_hdac_chip_writew(bus, RINTCNT, 1);
+        /* enable rirb dma and response irq */
+        snd_hdac_chip_writeb(bus, RIRBCTL, AZX_RBCTL_DMA_EN | AZX_RBCTL_IRQ_EN);
+        spin_unlock_irq(&bus->reg_lock);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_init_cmd_io);
+
+/**
+ * snd_hdac_bus_stop_cmd_io - clean up CORB/RIRB buffers
+ * @bus: HD-audio core bus
+ */
+void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus)
+{
+        spin_lock_irq(&bus->reg_lock);
+        /* disable ringbuffer DMAs */
+        snd_hdac_chip_writeb(bus, RIRBCTL, 0);
+        snd_hdac_chip_writeb(bus, CORBCTL, 0);
+        /* disable unsolicited responses */
+        snd_hdac_chip_updatel(bus, GCTL, AZX_GCTL_UNSOL, 0);
+        spin_unlock_irq(&bus->reg_lock);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_stop_cmd_io);
+
+static unsigned int azx_command_addr(u32 cmd)
+{
+        unsigned int addr = cmd >> 28;
+
+        if (snd_BUG_ON(addr >= HDA_MAX_CODECS))
+                addr = 0;
+        return addr;
+}
+
+/**
+ * snd_hdac_bus_send_cmd - send a command verb via CORB
+ * @bus: HD-audio core bus
+ * @val: encoded verb value to send
+ *
+ * Returns zero for success or a negative error code.
+ */
+int snd_hdac_bus_send_cmd(struct hdac_bus *bus, unsigned int val)
+{
+        unsigned int addr = azx_command_addr(val);
+        unsigned int wp, rp;
+
+        spin_lock_irq(&bus->reg_lock);
+
+        bus->last_cmd[azx_command_addr(val)] = val;
+
+        /* add command to corb */
+        wp = snd_hdac_chip_readw(bus, CORBWP);
+        if (wp == 0xffff) {
+                /* something wrong, controller likely turned to D3 */
+                spin_unlock_irq(&bus->reg_lock);
+                return -EIO;
+        }
+        wp++;
+        wp %= AZX_MAX_CORB_ENTRIES;
+
+        rp = snd_hdac_chip_readw(bus, CORBRP);
+        if (wp == rp) {
+                /* oops, it's full */
+                spin_unlock_irq(&bus->reg_lock);
+                return -EAGAIN;
+        }
+
+        bus->rirb.cmds[addr]++;
+        bus->corb.buf[wp] = cpu_to_le32(val);
+        snd_hdac_chip_writew(bus, CORBWP, wp);
+
+        spin_unlock_irq(&bus->reg_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_send_cmd);
+
+#define AZX_RIRB_EX_UNSOL_EV    (1<<4)
+
+/**
+ * snd_hdac_bus_update_rirb - retrieve RIRB entries
+ * @bus: HD-audio core bus
+ *
+ * Usually called from interrupt handler.
+ */
+void snd_hdac_bus_update_rirb(struct hdac_bus *bus)
+{
+        unsigned int rp, wp;
+        unsigned int addr;
+        u32 res, res_ex;
+
+        wp = snd_hdac_chip_readw(bus, RIRBWP);
+        if (wp == 0xffff) {
+                /* something wrong, controller likely turned to D3 */
+                return;
+        }
+
+        if (wp == bus->rirb.wp)
+                return;
+        bus->rirb.wp = wp;
+
+        while (bus->rirb.rp != wp) {
+                bus->rirb.rp++;
+                bus->rirb.rp %= AZX_MAX_RIRB_ENTRIES;
+
+                rp = bus->rirb.rp << 1; /* an RIRB entry is 8-bytes */
+                res_ex = le32_to_cpu(bus->rirb.buf[rp + 1]);
+                res = le32_to_cpu(bus->rirb.buf[rp]);
+                addr = res_ex & 0xf;
+                if (addr >= HDA_MAX_CODECS) {
+                        dev_err(bus->dev,
+                                "spurious response %#x:%#x, rp = %d, wp = %d",
+                                res, res_ex, bus->rirb.rp, wp);
+                        snd_BUG();
+                } else if (res_ex & AZX_RIRB_EX_UNSOL_EV)
+                        snd_hdac_bus_queue_event(bus, res, res_ex);
+                else if (bus->rirb.cmds[addr]) {
+                        bus->rirb.res[addr] = res;
+                        bus->rirb.cmds[addr]--;
+                } else {
+                        dev_err_ratelimited(bus->dev,
+                                "spurious response %#x:%#x, last cmd=%#08x\n",
+                                res, res_ex, bus->last_cmd[addr]);
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_update_rirb);
+
+/**
+ * snd_hdac_bus_get_response - receive a response via RIRB
+ * @bus: HD-audio core bus
+ * @addr: codec address
+ * @res: pointer to store the value, NULL when not needed
+ *
+ * Returns zero if a value is read, or a negative error code.
+ */
+int snd_hdac_bus_get_response(struct hdac_bus *bus, unsigned int addr,
+                              unsigned int *res)
+{
+        unsigned long timeout;
+        unsigned long loopcounter;
+
+        timeout = jiffies + msecs_to_jiffies(1000);
+
+        for (loopcounter = 0;; loopcounter++) {
+                spin_lock_irq(&bus->reg_lock);
+                if (!bus->rirb.cmds[addr]) {
+                        if (res)
+                                *res = bus->rirb.res[addr]; /* the last value */
+                        spin_unlock_irq(&bus->reg_lock);
+                        return 0;
+                }
+                spin_unlock_irq(&bus->reg_lock);
+                if (time_after(jiffies, timeout))
+                        break;
+                if (loopcounter > 3000)
+                        msleep(2); /* temporary workaround */
+                else {
+                        udelay(10);
+                        cond_resched();
+                }
+        }
+
+        return -EIO;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_get_response);
+
+/*
+ * Lowlevel interface
+ */
+
+/**
+ * snd_hdac_bus_enter_link_reset - enter link reset
+ * @bus: HD-audio core bus
+ *
+ * Enter to the link reset state.
+ */
+void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus)
+{
+        unsigned long timeout;
+
+        /* reset controller */
+        snd_hdac_chip_updatel(bus, GCTL, AZX_GCTL_RESET, 0);
+
+        timeout = jiffies + msecs_to_jiffies(100);
+        while ((snd_hdac_chip_readb(bus, GCTL) & AZX_GCTL_RESET) &&
+               time_before(jiffies, timeout))
+                usleep_range(500, 1000);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_enter_link_reset);
+
+/**
+ * snd_hdac_bus_exit_link_reset - exit link reset
+ * @bus: HD-audio core bus
+ *
+ * Exit from the link reset state.
+ */
+void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus)
+{
+        unsigned long timeout;
+
+        snd_hdac_chip_updateb(bus, GCTL, 0, AZX_GCTL_RESET);
+
+        timeout = jiffies + msecs_to_jiffies(100);
+        while (!snd_hdac_chip_readb(bus, GCTL) && time_before(jiffies, timeout))
+                usleep_range(500, 1000);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_exit_link_reset);
+
+/* reset codec link */
+static int azx_reset(struct hdac_bus *bus, bool full_reset)
+{
+        if (!full_reset)
+                goto skip_reset;
+
+        /* clear STATESTS */
+        snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);
+
+        /* reset controller */
+        snd_hdac_bus_enter_link_reset(bus);
+
+        /* delay for >= 100us for codec PLL to settle per spec
+         * Rev 0.9 section 5.5.1
+         */
+        usleep_range(500, 1000);
+
+        /* Bring controller out of reset */
+        snd_hdac_bus_exit_link_reset(bus);
+
+        /* Brent Chartrand said to wait >= 540us for codecs to initialize */
+        usleep_range(1000, 1200);
+
+ skip_reset:
+        /* check to see if controller is ready */
+        if (!snd_hdac_chip_readb(bus, GCTL)) {
+                dev_dbg(bus->dev, "azx_reset: controller not ready!\n");
+                return -EBUSY;
+        }
+
+        /* Accept unsolicited responses */
+        snd_hdac_chip_updatel(bus, GCTL, 0, AZX_GCTL_UNSOL);
+
+        /* detect codecs */
+        if (!bus->codec_mask) {
+                bus->codec_mask = snd_hdac_chip_readw(bus, STATESTS);
+                dev_dbg(bus->dev, "codec_mask = 0x%lx\n", bus->codec_mask);
+        }
+
+        return 0;
+}
+
+/* enable interrupts */
+static void azx_int_enable(struct hdac_bus *bus)
+{
+        /* enable controller CIE and GIE */
+        snd_hdac_chip_updatel(bus, INTCTL, 0, AZX_INT_CTRL_EN | AZX_INT_GLOBAL_EN);
+}
+
+/* disable interrupts */
+static void azx_int_disable(struct hdac_bus *bus)
+{
+        struct hdac_stream *azx_dev;
+
+        /* disable interrupts in stream descriptor */
+        list_for_each_entry(azx_dev, &bus->stream_list, list)
+                snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_INT_MASK, 0);
+
+        /* disable SIE for all streams */
+        snd_hdac_chip_writeb(bus, INTCTL, 0);
+
+        /* disable controller CIE and GIE */
+        snd_hdac_chip_updatel(bus, INTCTL, AZX_INT_CTRL_EN | AZX_INT_GLOBAL_EN, 0);
+}
+
+/* clear interrupts */
+static void azx_int_clear(struct hdac_bus *bus)
+{
+        struct hdac_stream *azx_dev;
+
+        /* clear stream status */
+        list_for_each_entry(azx_dev, &bus->stream_list, list)
+                snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK);
+
+        /* clear STATESTS */
+        snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);
+
+        /* clear rirb status */
+        snd_hdac_chip_writeb(bus, RIRBSTS, RIRB_INT_MASK);
+
+        /* clear int status */
+        snd_hdac_chip_writel(bus, INTSTS, AZX_INT_CTRL_EN | AZX_INT_ALL_STREAM);
+}
+
+/**
+ * snd_hdac_bus_init_chip - reset and start the controller registers
+ * @bus: HD-audio core bus
+ * @full_reset: Do full reset
+ */
+bool snd_hdac_bus_init_chip(struct hdac_bus *bus, bool full_reset)
+{
+        if (bus->chip_init)
+                return false;
+
+        /* reset controller */
+        azx_reset(bus, full_reset);
+
+        /* initialize interrupts */
+        azx_int_clear(bus);
+        azx_int_enable(bus);
+
+        /* initialize the codec command I/O */
+        snd_hdac_bus_init_cmd_io(bus);
+
+        /* program the position buffer */
+        if (bus->use_posbuf && bus->posbuf.addr) {
+                snd_hdac_chip_writel(bus, DPLBASE, (u32)bus->posbuf.addr);
+                snd_hdac_chip_writel(bus, DPUBASE, upper_32_bits(bus->posbuf.addr));
+        }
+
+        bus->chip_init = true;
+        return true;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_init_chip);
+
+/**
+ * snd_hdac_bus_stop_chip - disable the whole IRQ and I/Os
+ * @bus: HD-audio core bus
+ */
+void snd_hdac_bus_stop_chip(struct hdac_bus *bus)
+{
+        if (!bus->chip_init)
+                return;
+
+        /* disable interrupts */
+        azx_int_disable(bus);
+        azx_int_clear(bus);
+
+        /* disable CORB/RIRB */
+        snd_hdac_bus_stop_cmd_io(bus);
+
+        /* disable position buffer */
+        if (bus->posbuf.addr) {
+                snd_hdac_chip_writel(bus, DPLBASE, 0);
+                snd_hdac_chip_writel(bus, DPUBASE, 0);
+        }
+
+        bus->chip_init = false;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_stop_chip);
+
+/**
+ * snd_hdac_bus_handle_stream_irq - interrupt handler for streams
+ * @bus: HD-audio core bus
+ * @status: INTSTS register value
+ * @ask: callback to be called for woken streams
+ */
+void snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,
+                                    void (*ack)(struct hdac_bus *,
+                                                struct hdac_stream *))
+{
+        struct hdac_stream *azx_dev;
+        u8 sd_status;
+
+        list_for_each_entry(azx_dev, &bus->stream_list, list) {
+                if (status & azx_dev->sd_int_sta_mask) {
+                        sd_status = snd_hdac_stream_readb(azx_dev, SD_STS);
+                        snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK);
+                        if (!azx_dev->substream || !azx_dev->running ||
+                            !(sd_status & SD_INT_COMPLETE))
+                                continue;
+                        if (ack)
+                                ack(bus, azx_dev);
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_handle_stream_irq);
+
+/**
+ * snd_hdac_bus_alloc_stream_pages - allocate BDL and other buffers
+ * @bus: HD-audio core bus
+ *
+ * Call this after assigning the all streams.
+ * Returns zero for success, or a negative error code.
+ */
+int snd_hdac_bus_alloc_stream_pages(struct hdac_bus *bus)
+{
+        struct hdac_stream *s;
+        int num_streams = 0;
+        int err;
+
+        list_for_each_entry(s, &bus->stream_list, list) {
+                /* allocate memory for the BDL for each stream */
+                err = bus->io_ops->dma_alloc_pages(bus, SNDRV_DMA_TYPE_DEV,
+                                                   BDL_SIZE, &s->bdl);
+                num_streams++;
+                if (err < 0)
+                        return -ENOMEM;
+        }
+
+        if (WARN_ON(!num_streams))
+                return -EINVAL;
+        /* allocate memory for the position buffer */
+        err = bus->io_ops->dma_alloc_pages(bus, SNDRV_DMA_TYPE_DEV,
+                                           num_streams * 8, &bus->posbuf);
+        if (err < 0)
+                return -ENOMEM;
+        list_for_each_entry(s, &bus->stream_list, list)
+                s->posbuf = (__le32 *)(bus->posbuf.area + s->index * 8);
+
+        /* single page (at least 4096 bytes) must suffice for both ringbuffes */
+        return bus->io_ops->dma_alloc_pages(bus, SNDRV_DMA_TYPE_DEV,
+                                            PAGE_SIZE, &bus->rb);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_alloc_stream_pages);
+
+/**
+ * snd_hdac_bus_free_stream_pages - release BDL and other buffers
+ * @bus: HD-audio core bus
+ */
+void snd_hdac_bus_free_stream_pages(struct hdac_bus *bus)
+{
+        struct hdac_stream *s;
+
+        list_for_each_entry(s, &bus->stream_list, list) {
+                if (s->bdl.area)
+                        bus->io_ops->dma_free_pages(bus, &s->bdl);
+        }
+
+        if (bus->rb.area)
+                bus->io_ops->dma_free_pages(bus, &bus->rb);
+        if (bus->posbuf.area)
+                bus->io_ops->dma_free_pages(bus, &bus->posbuf);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_bus_free_stream_pages);
diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c
index f75bf5622687..cdee7103f649 100644
--- a/sound/hda/hdac_device.c
+++ b/sound/hda/hdac_device.c
@@ -10,6 +10,7 @@
 #include <linux/pm_runtime.h>
 #include <sound/hdaudio.h>
 #include <sound/hda_regmap.h>
+#include <sound/pcm.h>
 #include "local.h"
 
 static void setup_fg_nodes(struct hdac_device *codec);
@@ -551,6 +552,21 @@ void snd_hdac_power_down_pm(struct hdac_device *codec)
 EXPORT_SYMBOL_GPL(snd_hdac_power_down_pm);
 #endif
 
+/*
+ * Enable/disable the link power for a codec.
+ */
+int snd_hdac_link_power(struct hdac_device *codec, bool enable)
+{
+        if  (!codec->link_power_control)
+                return 0;
+
+        if  (codec->bus->ops->link_power)
+                return codec->bus->ops->link_power(codec->bus, enable);
+        else
+                return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_link_power);
+
 /* codec vendor labels */
 struct hda_vendor_id {
         unsigned int id;
@@ -597,3 +613,302 @@ static int get_codec_vendor_name(struct hdac_device *codec)
         codec->vendor_name = kasprintf(GFP_KERNEL, "Generic %04x", vendor_id);
         return codec->vendor_name ? 0 : -ENOMEM;
 }
+
+/*
+ * stream formats
+ */
+struct hda_rate_tbl {
+        unsigned int hz;
+        unsigned int alsa_bits;
+        unsigned int hda_fmt;
+};
+
+/* rate = base * mult / div */
+#define HDA_RATE(base, mult, div) \
+        (AC_FMT_BASE_##base##K | (((mult) - 1) << AC_FMT_MULT_SHIFT) | \
+         (((div) - 1) << AC_FMT_DIV_SHIFT))
+
+static struct hda_rate_tbl rate_bits[] = {
+        /* rate in Hz, ALSA rate bitmask, HDA format value */
+
+        /* autodetected value used in snd_hda_query_supported_pcm */
+        { 8000, SNDRV_PCM_RATE_8000, HDA_RATE(48, 1, 6) },
+        { 11025, SNDRV_PCM_RATE_11025, HDA_RATE(44, 1, 4) },
+        { 16000, SNDRV_PCM_RATE_16000, HDA_RATE(48, 1, 3) },
+        { 22050, SNDRV_PCM_RATE_22050, HDA_RATE(44, 1, 2) },
+        { 32000, SNDRV_PCM_RATE_32000, HDA_RATE(48, 2, 3) },
+        { 44100, SNDRV_PCM_RATE_44100, HDA_RATE(44, 1, 1) },
+        { 48000, SNDRV_PCM_RATE_48000, HDA_RATE(48, 1, 1) },
+        { 88200, SNDRV_PCM_RATE_88200, HDA_RATE(44, 2, 1) },
+        { 96000, SNDRV_PCM_RATE_96000, HDA_RATE(48, 2, 1) },
+        { 176400, SNDRV_PCM_RATE_176400, HDA_RATE(44, 4, 1) },
+        { 192000, SNDRV_PCM_RATE_192000, HDA_RATE(48, 4, 1) },
+#define AC_PAR_PCM_RATE_BITS    11
+        /* up to bits 10, 384kHZ isn't supported properly */
+
+        /* not autodetected value */
+        { 9600, SNDRV_PCM_RATE_KNOT, HDA_RATE(48, 1, 5) },
+
+        { 0 } /* terminator */
+};
+
+/**
+ * snd_hdac_calc_stream_format - calculate the format bitset
+ * @rate: the sample rate
+ * @channels: the number of channels
+ * @format: the PCM format (SNDRV_PCM_FORMAT_XXX)
+ * @maxbps: the max. bps
+ * @spdif_ctls: HD-audio SPDIF status bits (0 if irrelevant)
+ *
+ * Calculate the format bitset from the given rate, channels and th PCM format.
+ *
+ * Return zero if invalid.
+ */
+unsigned int snd_hdac_calc_stream_format(unsigned int rate,
+                                         unsigned int channels,
+                                         unsigned int format,
+                                         unsigned int maxbps,
+                                         unsigned short spdif_ctls)
+{
+        int i;
+        unsigned int val = 0;
+
+        for (i = 0; rate_bits[i].hz; i++)
+                if (rate_bits[i].hz == rate) {
+                        val = rate_bits[i].hda_fmt;
+                        break;
+                }
+        if (!rate_bits[i].hz)
+                return 0;
+
+        if (channels == 0 || channels > 8)
+                return 0;
+        val |= channels - 1;
+
+        switch (snd_pcm_format_width(format)) {
+        case 8:
+                val |= AC_FMT_BITS_8;
+                break;
+        case 16:
+                val |= AC_FMT_BITS_16;
+                break;
+        case 20:
+        case 24:
+        case 32:
+                if (maxbps >= 32 || format == SNDRV_PCM_FORMAT_FLOAT_LE)
+                        val |= AC_FMT_BITS_32;
+                else if (maxbps >= 24)
+                        val |= AC_FMT_BITS_24;
+                else
+                        val |= AC_FMT_BITS_20;
+                break;
+        default:
+                return 0;
+        }
+
+        if (spdif_ctls & AC_DIG1_NONAUDIO)
+                val |= AC_FMT_TYPE_NON_PCM;
+
+        return val;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_calc_stream_format);
+
+static unsigned int query_pcm_param(struct hdac_device *codec, hda_nid_t nid)
+{
+        unsigned int val = 0;
+
+        if (nid != codec->afg &&
+            (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD))
+                val = snd_hdac_read_parm(codec, nid, AC_PAR_PCM);
+        if (!val || val == -1)
+                val = snd_hdac_read_parm(codec, codec->afg, AC_PAR_PCM);
+        if (!val || val == -1)
+                return 0;
+        return val;
+}
+
+static unsigned int query_stream_param(struct hdac_device *codec, hda_nid_t nid)
+{
+        unsigned int streams = snd_hdac_read_parm(codec, nid, AC_PAR_STREAM);
+
+        if (!streams || streams == -1)
+                streams = snd_hdac_read_parm(codec, codec->afg, AC_PAR_STREAM);
+        if (!streams || streams == -1)
+                return 0;
+        return streams;
+}
+
+/**
+ * snd_hdac_query_supported_pcm - query the supported PCM rates and formats
+ * @codec: the codec object
+ * @nid: NID to query
+ * @ratesp: the pointer to store the detected rate bitflags
+ * @formatsp: the pointer to store the detected formats
+ * @bpsp: the pointer to store the detected format widths
+ *
+ * Queries the supported PCM rates and formats.  The NULL @ratesp, @formatsp
+ * or @bsps argument is ignored.
+ *
+ * Returns 0 if successful, otherwise a negative error code.
+ */
+int snd_hdac_query_supported_pcm(struct hdac_device *codec, hda_nid_t nid,
+                                 u32 *ratesp, u64 *formatsp, unsigned int *bpsp)
+{
+        unsigned int i, val, wcaps;
+
+        wcaps = get_wcaps(codec, nid);
+        val = query_pcm_param(codec, nid);
+
+        if (ratesp) {
+                u32 rates = 0;
+                for (i = 0; i < AC_PAR_PCM_RATE_BITS; i++) {
+                        if (val & (1 << i))
+                                rates |= rate_bits[i].alsa_bits;
+                }
+                if (rates == 0) {
+                        dev_err(&codec->dev,
+                                "rates == 0 (nid=0x%x, val=0x%x, ovrd=%i)\n",
+                                nid, val,
+                                (wcaps & AC_WCAP_FORMAT_OVRD) ? 1 : 0);
+                        return -EIO;
+                }
+                *ratesp = rates;
+        }
+
+        if (formatsp || bpsp) {
+                u64 formats = 0;
+                unsigned int streams, bps;
+
+                streams = query_stream_param(codec, nid);
+                if (!streams)
+                        return -EIO;
+
+                bps = 0;
+                if (streams & AC_SUPFMT_PCM) {
+                        if (val & AC_SUPPCM_BITS_8) {
+                                formats |= SNDRV_PCM_FMTBIT_U8;
+                                bps = 8;
+                        }
+                        if (val & AC_SUPPCM_BITS_16) {
+                                formats |= SNDRV_PCM_FMTBIT_S16_LE;
+                                bps = 16;
+                        }
+                        if (wcaps & AC_WCAP_DIGITAL) {
+                                if (val & AC_SUPPCM_BITS_32)
+                                        formats |= SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE;
+                                if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24))
+                                        formats |= SNDRV_PCM_FMTBIT_S32_LE;
+                                if (val & AC_SUPPCM_BITS_24)
+                                        bps = 24;
+                                else if (val & AC_SUPPCM_BITS_20)
+                                        bps = 20;
+                        } else if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24|
+                                          AC_SUPPCM_BITS_32)) {
+                                formats |= SNDRV_PCM_FMTBIT_S32_LE;
+                                if (val & AC_SUPPCM_BITS_32)
+                                        bps = 32;
+                                else if (val & AC_SUPPCM_BITS_24)
+                                        bps = 24;
+                                else if (val & AC_SUPPCM_BITS_20)
+                                        bps = 20;
+                        }
+                }
+#if 0 /* FIXME: CS4206 doesn't work, which is the only codec supporting float */
+                if (streams & AC_SUPFMT_FLOAT32) {
+                        formats |= SNDRV_PCM_FMTBIT_FLOAT_LE;
+                        if (!bps)
+                                bps = 32;
+                }
+#endif
+                if (streams == AC_SUPFMT_AC3) {
+                        /* should be exclusive */
+                        /* temporary hack: we have still no proper support
+                         * for the direct AC3 stream...
+                         */
+                        formats |= SNDRV_PCM_FMTBIT_U8;
+                        bps = 8;
+                }
+                if (formats == 0) {
+                        dev_err(&codec->dev,
+                                "formats == 0 (nid=0x%x, val=0x%x, ovrd=%i, streams=0x%x)\n",
+                                nid, val,
+                                (wcaps & AC_WCAP_FORMAT_OVRD) ? 1 : 0,
+                                streams);
+                        return -EIO;
+                }
+                if (formatsp)
+                        *formatsp = formats;
+                if (bpsp)
+                        *bpsp = bps;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_query_supported_pcm);
+
+/**
+ * snd_hdac_is_supported_format - Check the validity of the format
+ * @codec: the codec object
+ * @nid: NID to check
+ * @format: the HD-audio format value to check
+ *
+ * Check whether the given node supports the format value.
+ *
+ * Returns true if supported, false if not.
+ */
+bool snd_hdac_is_supported_format(struct hdac_device *codec, hda_nid_t nid,
+                                  unsigned int format)
+{
+        int i;
+        unsigned int val = 0, rate, stream;
+
+        val = query_pcm_param(codec, nid);
+        if (!val)
+                return false;
+
+        rate = format & 0xff00;
+        for (i = 0; i < AC_PAR_PCM_RATE_BITS; i++)
+                if (rate_bits[i].hda_fmt == rate) {
+                        if (val & (1 << i))
+                                break;
+                        return false;
+                }
+        if (i >= AC_PAR_PCM_RATE_BITS)
+                return false;
+
+        stream = query_stream_param(codec, nid);
+        if (!stream)
+                return false;
+
+        if (stream & AC_SUPFMT_PCM) {
+                switch (format & 0xf0) {
+                case 0x00:
+                        if (!(val & AC_SUPPCM_BITS_8))
+                                return false;
+                        break;
+                case 0x10:
+                        if (!(val & AC_SUPPCM_BITS_16))
+                                return false;
+                        break;
+                case 0x20:
+                        if (!(val & AC_SUPPCM_BITS_20))
+                                return false;
+                        break;
+                case 0x30:
+                        if (!(val & AC_SUPPCM_BITS_24))
+                                return false;
+                        break;
+                case 0x40:
+                        if (!(val & AC_SUPPCM_BITS_32))
+                                return false;
+                        break;
+                default:
+                        return false;
+                }
+        } else {
+                /* FIXME: check for float32 and AC3? */
+        }
+
+        return true;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_is_supported_format);
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
new file mode 100644
index 000000000000..cb78c25585ac
--- /dev/null
+++ b/sound/hda/hdac_i915.c
@@ -0,0 +1,193 @@
+/*
+ *  hdac_i915.c - routines for sync between HD-A core and i915 display driver
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/component.h>
+#include <drm/i915_component.h>
+#include <sound/core.h>
+#include <sound/hdaudio.h>
+#include <sound/hda_i915.h>
+
+static struct i915_audio_component *hdac_acomp;
+
+int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable)
+{
+        struct i915_audio_component *acomp = bus->audio_component;
+
+        if (!acomp->ops)
+                return -ENODEV;
+
+        if (!acomp->ops->codec_wake_override) {
+                dev_warn(bus->dev,
+                        "Invalid codec wake callback\n");
+                return 0;
+        }
+
+        dev_dbg(bus->dev, "%s codec wakeup\n",
+                enable ? "enable" : "disable");
+
+        acomp->ops->codec_wake_override(acomp->dev, enable);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_set_codec_wakeup);
+
+int snd_hdac_display_power(struct hdac_bus *bus, bool enable)
+{
+        struct i915_audio_component *acomp = bus->audio_component;
+
+        if (!acomp->ops)
+                return -ENODEV;
+
+        dev_dbg(bus->dev, "display power %s\n",
+                enable ? "enable" : "disable");
+
+        if (enable) {
+                if (!bus->i915_power_refcount++)
+                        acomp->ops->get_power(acomp->dev);
+        } else {
+                WARN_ON(!bus->i915_power_refcount);
+                if (!--bus->i915_power_refcount)
+                        acomp->ops->put_power(acomp->dev);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_display_power);
+
+int snd_hdac_get_display_clk(struct hdac_bus *bus)
+{
+        struct i915_audio_component *acomp = bus->audio_component;
+
+        if (!acomp->ops)
+                return -ENODEV;
+
+        return acomp->ops->get_cdclk_freq(acomp->dev);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_get_display_clk);
+
+static int hdac_component_master_bind(struct device *dev)
+{
+        struct i915_audio_component *acomp = hdac_acomp;
+        int ret;
+
+        ret = component_bind_all(dev, acomp);
+        if (ret < 0)
+                return ret;
+
+        if (WARN_ON(!(acomp->dev && acomp->ops && acomp->ops->get_power &&
+                      acomp->ops->put_power && acomp->ops->get_cdclk_freq))) {
+                ret = -EINVAL;
+                goto out_unbind;
+        }
+
+        /*
+         * Atm, we don't support dynamic unbinding initiated by the child
+         * component, so pin its containing module until we unbind.
+         */
+        if (!try_module_get(acomp->ops->owner)) {
+                ret = -ENODEV;
+                goto out_unbind;
+        }
+
+        return 0;
+
+out_unbind:
+        component_unbind_all(dev, acomp);
+
+        return ret;
+}
+
+static void hdac_component_master_unbind(struct device *dev)
+{
+        struct i915_audio_component *acomp = hdac_acomp;
+
+        module_put(acomp->ops->owner);
+        component_unbind_all(dev, acomp);
+        WARN_ON(acomp->ops || acomp->dev);
+}
+
+static const struct component_master_ops hdac_component_master_ops = {
+        .bind = hdac_component_master_bind,
+        .unbind = hdac_component_master_unbind,
+};
+
+static int hdac_component_master_match(struct device *dev, void *data)
+{
+        /* i915 is the only supported component */
+        return !strcmp(dev->driver->name, "i915");
+}
+
+int snd_hdac_i915_init(struct hdac_bus *bus)
+{
+        struct component_match *match = NULL;
+        struct device *dev = bus->dev;
+        struct i915_audio_component *acomp;
+        int ret;
+
+        acomp = kzalloc(sizeof(*acomp), GFP_KERNEL);
+        if (!acomp)
+                return -ENOMEM;
+        bus->audio_component = acomp;
+        hdac_acomp = acomp;
+
+        component_match_add(dev, &match, hdac_component_master_match, bus);
+        ret = component_master_add_with_match(dev, &hdac_component_master_ops,
+                                              match);
+        if (ret < 0)
+                goto out_err;
+
+        /*
+         * Atm, we don't support deferring the component binding, so make sure
+         * i915 is loaded and that the binding successfully completes.
+         */
+        request_module("i915");
+
+        if (!acomp->ops) {
+                ret = -ENODEV;
+                goto out_master_del;
+        }
+        dev_dbg(dev, "bound to i915 component master\n");
+
+        return 0;
+out_master_del:
+        component_master_del(dev, &hdac_component_master_ops);
+out_err:
+        kfree(acomp);
+        bus->audio_component = NULL;
+        dev_err(dev, "failed to add i915 component master (%d)\n", ret);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_i915_init);
+
+int snd_hdac_i915_exit(struct hdac_bus *bus)
+{
+        struct device *dev = bus->dev;
+        struct i915_audio_component *acomp = bus->audio_component;
+
+        WARN_ON(bus->i915_power_refcount);
+        if (bus->i915_power_refcount > 0 && acomp && acomp->ops)
+                acomp->ops->put_power(acomp->dev);
+
+        component_master_del(dev, &hdac_component_master_ops);
+
+        kfree(acomp);
+        bus->audio_component = NULL;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_i915_exit);
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c
new file mode 100644
index 000000000000..4c15d0accc9e
--- /dev/null
+++ b/sound/hda/hdac_stream.c
@@ -0,0 +1,697 @@
+/*
+ * HD-audio stream operations
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/export.h>
+#include <linux/clocksource.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/hdaudio.h>
+#include <sound/hda_register.h>
+#include "trace.h"
+
+/**
+ * snd_hdac_stream_init - initialize each stream (aka device)
+ * @bus: HD-audio core bus
+ * @azx_dev: HD-audio core stream object to initialize
+ * @idx: stream index number
+ * @direction: stream direction (SNDRV_PCM_STREAM_PLAYBACK or SNDRV_PCM_STREAM_CAPTURE)
+ * @tag: the tag id to assign
+ *
+ * Assign the starting bdl address to each stream (device) and initialize.
+ */
+void snd_hdac_stream_init(struct hdac_bus *bus, struct hdac_stream *azx_dev,
+                          int idx, int direction, int tag)
+{
+        azx_dev->bus = bus;
+        /* offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */
+        azx_dev->sd_addr = bus->remap_addr + (0x20 * idx + 0x80);
+        /* int mask: SDI0=0x01, SDI1=0x02, ... SDO3=0x80 */
+        azx_dev->sd_int_sta_mask = 1 << idx;
+        azx_dev->index = idx;
+        azx_dev->direction = direction;
+        azx_dev->stream_tag = tag;
+        snd_hdac_dsp_lock_init(azx_dev);
+        list_add_tail(&azx_dev->list, &bus->stream_list);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_init);
+
+/**
+ * snd_hdac_stream_start - start a stream
+ * @azx_dev: HD-audio core stream to start
+ * @fresh_start: false = wallclock timestamp relative to period wallclock
+ *
+ * Start a stream, set start_wallclk and set the running flag.
+ */
+void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+
+        trace_snd_hdac_stream_start(bus, azx_dev);
+
+        azx_dev->start_wallclk = snd_hdac_chip_readl(bus, WALLCLK);
+        if (!fresh_start)
+                azx_dev->start_wallclk -= azx_dev->period_wallclk;
+
+        /* enable SIE */
+        snd_hdac_chip_updatel(bus, INTCTL, 0, 1 << azx_dev->index);
+        /* set DMA start and interrupt mask */
+        snd_hdac_stream_updateb(azx_dev, SD_CTL,
+                                0, SD_CTL_DMA_START | SD_INT_MASK);
+        azx_dev->running = true;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_start);
+
+/**
+ * snd_hdac_stream_clear - stop a stream DMA
+ * @azx_dev: HD-audio core stream to stop
+ */
+void snd_hdac_stream_clear(struct hdac_stream *azx_dev)
+{
+        snd_hdac_stream_updateb(azx_dev, SD_CTL,
+                                SD_CTL_DMA_START | SD_INT_MASK, 0);
+        snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
+        azx_dev->running = false;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_clear);
+
+/**
+ * snd_hdac_stream_stop - stop a stream
+ * @azx_dev: HD-audio core stream to stop
+ *
+ * Stop a stream DMA and disable stream interrupt
+ */
+void snd_hdac_stream_stop(struct hdac_stream *azx_dev)
+{
+        trace_snd_hdac_stream_stop(azx_dev->bus, azx_dev);
+
+        snd_hdac_stream_clear(azx_dev);
+        /* disable SIE */
+        snd_hdac_chip_updatel(azx_dev->bus, INTCTL, 1 << azx_dev->index, 0);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_stop);
+
+/**
+ * snd_hdac_stream_reset - reset a stream
+ * @azx_dev: HD-audio core stream to reset
+ */
+void snd_hdac_stream_reset(struct hdac_stream *azx_dev)
+{
+        unsigned char val;
+        int timeout;
+
+        snd_hdac_stream_clear(azx_dev);
+
+        snd_hdac_stream_updateb(azx_dev, SD_CTL, 0, SD_CTL_STREAM_RESET);
+        udelay(3);
+        timeout = 300;
+        do {
+                val = snd_hdac_stream_readb(azx_dev, SD_CTL) &
+                        SD_CTL_STREAM_RESET;
+                if (val)
+                        break;
+        } while (--timeout);
+        val &= ~SD_CTL_STREAM_RESET;
+        snd_hdac_stream_writeb(azx_dev, SD_CTL, val);
+        udelay(3);
+
+        timeout = 300;
+        /* waiting for hardware to report that the stream is out of reset */
+        do {
+                val = snd_hdac_stream_readb(azx_dev, SD_CTL) &
+                        SD_CTL_STREAM_RESET;
+                if (!val)
+                        break;
+        } while (--timeout);
+
+        /* reset first position - may not be synced with hw at this time */
+        if (azx_dev->posbuf)
+                *azx_dev->posbuf = 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_reset);
+
+/**
+ * snd_hdac_stream_setup -  set up the SD for streaming
+ * @azx_dev: HD-audio core stream to set up
+ */
+int snd_hdac_stream_setup(struct hdac_stream *azx_dev)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+        struct snd_pcm_runtime *runtime;
+        unsigned int val;
+
+        if (azx_dev->substream)
+                runtime = azx_dev->substream->runtime;
+        else
+                runtime = NULL;
+        /* make sure the run bit is zero for SD */
+        snd_hdac_stream_clear(azx_dev);
+        /* program the stream_tag */
+        val = snd_hdac_stream_readl(azx_dev, SD_CTL);
+        val = (val & ~SD_CTL_STREAM_TAG_MASK) |
+                (azx_dev->stream_tag << SD_CTL_STREAM_TAG_SHIFT);
+        if (!bus->snoop)
+                val |= SD_CTL_TRAFFIC_PRIO;
+        snd_hdac_stream_writel(azx_dev, SD_CTL, val);
+
+        /* program the length of samples in cyclic buffer */
+        snd_hdac_stream_writel(azx_dev, SD_CBL, azx_dev->bufsize);
+
+        /* program the stream format */
+        /* this value needs to be the same as the one programmed */
+        snd_hdac_stream_writew(azx_dev, SD_FORMAT, azx_dev->format_val);
+
+        /* program the stream LVI (last valid index) of the BDL */
+        snd_hdac_stream_writew(azx_dev, SD_LVI, azx_dev->frags - 1);
+
+        /* program the BDL address */
+        /* lower BDL address */
+        snd_hdac_stream_writel(azx_dev, SD_BDLPL, (u32)azx_dev->bdl.addr);
+        /* upper BDL address */
+        snd_hdac_stream_writel(azx_dev, SD_BDLPU,
+                               upper_32_bits(azx_dev->bdl.addr));
+
+        /* enable the position buffer */
+        if (bus->use_posbuf && bus->posbuf.addr) {
+                if (!(snd_hdac_chip_readl(bus, DPLBASE) & AZX_DPLBASE_ENABLE))
+                        snd_hdac_chip_writel(bus, DPLBASE,
+                                (u32)bus->posbuf.addr | AZX_DPLBASE_ENABLE);
+        }
+
+        /* set the interrupt enable bits in the descriptor control register */
+        snd_hdac_stream_updatel(azx_dev, SD_CTL, 0, SD_INT_MASK);
+
+        if (azx_dev->direction == SNDRV_PCM_STREAM_PLAYBACK)
+                azx_dev->fifo_size =
+                        snd_hdac_stream_readw(azx_dev, SD_FIFOSIZE) + 1;
+        else
+                azx_dev->fifo_size = 0;
+
+        /* when LPIB delay correction gives a small negative value,
+         * we ignore it; currently set the threshold statically to
+         * 64 frames
+         */
+        if (runtime && runtime->period_size > 64)
+                azx_dev->delay_negative_threshold =
+                        -frames_to_bytes(runtime, 64);
+        else
+                azx_dev->delay_negative_threshold = 0;
+
+        /* wallclk has 24Mhz clock source */
+        if (runtime)
+                azx_dev->period_wallclk = (((runtime->period_size * 24000) /
+                                    runtime->rate) * 1000);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_setup);
+
+/**
+ * snd_hdac_stream_cleanup - cleanup a stream
+ * @azx_dev: HD-audio core stream to clean up
+ */
+void snd_hdac_stream_cleanup(struct hdac_stream *azx_dev)
+{
+        snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0);
+        snd_hdac_stream_writel(azx_dev, SD_BDLPU, 0);
+        snd_hdac_stream_writel(azx_dev, SD_CTL, 0);
+        azx_dev->bufsize = 0;
+        azx_dev->period_bytes = 0;
+        azx_dev->format_val = 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_cleanup);
+
+/**
+ * snd_hdac_stream_assign - assign a stream for the PCM
+ * @bus: HD-audio core bus
+ * @substream: PCM substream to assign
+ *
+ * Look for an unused stream for the given PCM substream, assign it
+ * and return the stream object.  If no stream is free, returns NULL.
+ * The function tries to keep using the same stream object when it's used
+ * beforehand.  Also, when bus->reverse_assign flag is set, the last free
+ * or matching entry is returned.  This is needed for some strange codecs.
+ */
+struct hdac_stream *snd_hdac_stream_assign(struct hdac_bus *bus,
+                                           struct snd_pcm_substream *substream)
+{
+        struct hdac_stream *azx_dev;
+        struct hdac_stream *res = NULL;
+
+        /* make a non-zero unique key for the substream */
+        int key = (substream->pcm->device << 16) | (substream->number << 2) |
+                (substream->stream + 1);
+
+        list_for_each_entry(azx_dev, &bus->stream_list, list) {
+                if (azx_dev->direction != substream->stream)
+                        continue;
+                if (azx_dev->opened)
+                        continue;
+                if (azx_dev->assigned_key == key) {
+                        res = azx_dev;
+                        break;
+                }
+                if (!res || bus->reverse_assign)
+                        res = azx_dev;
+        }
+        if (res) {
+                spin_lock_irq(&bus->reg_lock);
+                res->opened = 1;
+                res->running = 0;
+                res->assigned_key = key;
+                res->substream = substream;
+                spin_unlock_irq(&bus->reg_lock);
+        }
+        return res;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_assign);
+
+/**
+ * snd_hdac_stream_release - release the assigned stream
+ * @azx_dev: HD-audio core stream to release
+ *
+ * Release the stream that has been assigned by snd_hdac_stream_assign().
+ */
+void snd_hdac_stream_release(struct hdac_stream *azx_dev)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+
+        spin_lock_irq(&bus->reg_lock);
+        azx_dev->opened = 0;
+        azx_dev->running = 0;
+        azx_dev->substream = NULL;
+        spin_unlock_irq(&bus->reg_lock);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_release);
+
+/*
+ * set up a BDL entry
+ */
+static int setup_bdle(struct hdac_bus *bus,
+                      struct snd_dma_buffer *dmab,
+                      struct hdac_stream *azx_dev, __le32 **bdlp,
+                      int ofs, int size, int with_ioc)
+{
+        __le32 *bdl = *bdlp;
+
+        while (size > 0) {
+                dma_addr_t addr;
+                int chunk;
+
+                if (azx_dev->frags >= AZX_MAX_BDL_ENTRIES)
+                        return -EINVAL;
+
+                addr = snd_sgbuf_get_addr(dmab, ofs);
+                /* program the address field of the BDL entry */
+                bdl[0] = cpu_to_le32((u32)addr);
+                bdl[1] = cpu_to_le32(upper_32_bits(addr));
+                /* program the size field of the BDL entry */
+                chunk = snd_sgbuf_get_chunk_size(dmab, ofs, size);
+                /* one BDLE cannot cross 4K boundary on CTHDA chips */
+                if (bus->align_bdle_4k) {
+                        u32 remain = 0x1000 - (ofs & 0xfff);
+
+                        if (chunk > remain)
+                                chunk = remain;
+                }
+                bdl[2] = cpu_to_le32(chunk);
+                /* program the IOC to enable interrupt
+                 * only when the whole fragment is processed
+                 */
+                size -= chunk;
+                bdl[3] = (size || !with_ioc) ? 0 : cpu_to_le32(0x01);
+                bdl += 4;
+                azx_dev->frags++;
+                ofs += chunk;
+        }
+        *bdlp = bdl;
+        return ofs;
+}
+
+/**
+ * snd_hdac_stream_setup_periods - set up BDL entries
+ * @azx_dev: HD-audio core stream to set up
+ *
+ * Set up the buffer descriptor table of the given stream based on the
+ * period and buffer sizes of the assigned PCM substream.
+ */
+int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+        struct snd_pcm_substream *substream = azx_dev->substream;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        __le32 *bdl;
+        int i, ofs, periods, period_bytes;
+        int pos_adj, pos_align;
+
+        /* reset BDL address */
+        snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0);
+        snd_hdac_stream_writel(azx_dev, SD_BDLPU, 0);
+
+        period_bytes = azx_dev->period_bytes;
+        periods = azx_dev->bufsize / period_bytes;
+
+        /* program the initial BDL entries */
+        bdl = (__le32 *)azx_dev->bdl.area;
+        ofs = 0;
+        azx_dev->frags = 0;
+
+        pos_adj = bus->bdl_pos_adj;
+        if (!azx_dev->no_period_wakeup && pos_adj > 0) {
+                pos_align = pos_adj;
+                pos_adj = (pos_adj * runtime->rate + 47999) / 48000;
+                if (!pos_adj)
+                        pos_adj = pos_align;
+                else
+                        pos_adj = ((pos_adj + pos_align - 1) / pos_align) *
+                                pos_align;
+                pos_adj = frames_to_bytes(runtime, pos_adj);
+                if (pos_adj >= period_bytes) {
+                        dev_warn(bus->dev, "Too big adjustment %d\n",
+                                 pos_adj);
+                        pos_adj = 0;
+                } else {
+                        ofs = setup_bdle(bus, snd_pcm_get_dma_buf(substream),
+                                         azx_dev,
+                                         &bdl, ofs, pos_adj, true);
+                        if (ofs < 0)
+                                goto error;
+                }
+        } else
+                pos_adj = 0;
+
+        for (i = 0; i < periods; i++) {
+                if (i == periods - 1 && pos_adj)
+                        ofs = setup_bdle(bus, snd_pcm_get_dma_buf(substream),
+                                         azx_dev, &bdl, ofs,
+                                         period_bytes - pos_adj, 0);
+                else
+                        ofs = setup_bdle(bus, snd_pcm_get_dma_buf(substream),
+                                         azx_dev, &bdl, ofs,
+                                         period_bytes,
+                                         !azx_dev->no_period_wakeup);
+                if (ofs < 0)
+                        goto error;
+        }
+        return 0;
+
+ error:
+        dev_err(bus->dev, "Too many BDL entries: buffer=%d, period=%d\n",
+                azx_dev->bufsize, period_bytes);
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_setup_periods);
+
+/* snd_hdac_stream_set_params - set stream parameters
+ * @azx_dev: HD-audio core stream for which parameters are to be set
+ * @format_val: format value parameter
+ *
+ * Setup the HD-audio core stream parameters from substream of the stream
+ * and passed format value
+ */
+int snd_hdac_stream_set_params(struct hdac_stream *azx_dev,
+                                 unsigned int format_val)
+{
+
+        unsigned int bufsize, period_bytes;
+        struct snd_pcm_substream *substream = azx_dev->substream;
+        struct snd_pcm_runtime *runtime;
+        int err;
+
+        if (!substream)
+                return -EINVAL;
+        runtime = substream->runtime;
+        bufsize = snd_pcm_lib_buffer_bytes(substream);
+        period_bytes = snd_pcm_lib_period_bytes(substream);
+
+        if (bufsize != azx_dev->bufsize ||
+            period_bytes != azx_dev->period_bytes ||
+            format_val != azx_dev->format_val ||
+            runtime->no_period_wakeup != azx_dev->no_period_wakeup) {
+                azx_dev->bufsize = bufsize;
+                azx_dev->period_bytes = period_bytes;
+                azx_dev->format_val = format_val;
+                azx_dev->no_period_wakeup = runtime->no_period_wakeup;
+                err = snd_hdac_stream_setup_periods(azx_dev);
+                if (err < 0)
+                        return err;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_set_params);
+
+static cycle_t azx_cc_read(const struct cyclecounter *cc)
+{
+        struct hdac_stream *azx_dev = container_of(cc, struct hdac_stream, cc);
+
+        return snd_hdac_chip_readl(azx_dev->bus, WALLCLK);
+}
+
+static void azx_timecounter_init(struct hdac_stream *azx_dev,
+                                 bool force, cycle_t last)
+{
+        struct timecounter *tc = &azx_dev->tc;
+        struct cyclecounter *cc = &azx_dev->cc;
+        u64 nsec;
+
+        cc->read = azx_cc_read;
+        cc->mask = CLOCKSOURCE_MASK(32);
+
+        /*
+         * Converting from 24 MHz to ns means applying a 125/3 factor.
+         * To avoid any saturation issues in intermediate operations,
+         * the 125 factor is applied first. The division is applied
+         * last after reading the timecounter value.
+         * Applying the 1/3 factor as part of the multiplication
+         * requires at least 20 bits for a decent precision, however
+         * overflows occur after about 4 hours or less, not a option.
+         */
+
+        cc->mult = 125; /* saturation after 195 years */
+        cc->shift = 0;
+
+        nsec = 0; /* audio time is elapsed time since trigger */
+        timecounter_init(tc, cc, nsec);
+        if (force) {
+                /*
+                 * force timecounter to use predefined value,
+                 * used for synchronized starts
+                 */
+                tc->cycle_last = last;
+        }
+}
+
+/**
+ * snd_hdac_stream_timecounter_init - initialize time counter
+ * @azx_dev: HD-audio core stream (master stream)
+ * @streams: bit flags of streams to set up
+ *
+ * Initializes the time counter of streams marked by the bit flags (each
+ * bit corresponds to the stream index).
+ * The trigger timestamp of PCM substream assigned to the given stream is
+ * updated accordingly, too.
+ */
+void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,
+                                      unsigned int streams)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+        struct snd_pcm_runtime *runtime = azx_dev->substream->runtime;
+        struct hdac_stream *s;
+        bool inited = false;
+        cycle_t cycle_last = 0;
+        int i = 0;
+
+        list_for_each_entry(s, &bus->stream_list, list) {
+                if (streams & (1 << i)) {
+                        azx_timecounter_init(s, inited, cycle_last);
+                        if (!inited) {
+                                inited = true;
+                                cycle_last = s->tc.cycle_last;
+                        }
+                }
+                i++;
+        }
+
+        snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
+        runtime->trigger_tstamp_latched = true;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_timecounter_init);
+
+/**
+ * snd_hdac_stream_sync_trigger - turn on/off stream sync register
+ * @azx_dev: HD-audio core stream (master stream)
+ * @streams: bit flags of streams to sync
+ */
+void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set,
+                                  unsigned int streams, unsigned int reg)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+        unsigned int val;
+
+        if (!reg)
+                reg = AZX_REG_SSYNC;
+        val = _snd_hdac_chip_read(l, bus, reg);
+        if (set)
+                val |= streams;
+        else
+                val &= ~streams;
+        _snd_hdac_chip_write(l, bus, reg, val);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_sync_trigger);
+
+/**
+ * snd_hdac_stream_sync - sync with start/strop trigger operation
+ * @azx_dev: HD-audio core stream (master stream)
+ * @start: true = start, false = stop
+ * @streams: bit flags of streams to sync
+ *
+ * For @start = true, wait until all FIFOs get ready.
+ * For @start = false, wait until all RUN bits are cleared.
+ */
+void snd_hdac_stream_sync(struct hdac_stream *azx_dev, bool start,
+                          unsigned int streams)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+        int i, nwait, timeout;
+        struct hdac_stream *s;
+
+        for (timeout = 5000; timeout; timeout--) {
+                nwait = 0;
+                i = 0;
+                list_for_each_entry(s, &bus->stream_list, list) {
+                        if (streams & (1 << i)) {
+                                if (start) {
+                                        /* check FIFO gets ready */
+                                        if (!(snd_hdac_stream_readb(s, SD_STS) &
+                                              SD_STS_FIFO_READY))
+                                                nwait++;
+                                } else {
+                                        /* check RUN bit is cleared */
+                                        if (snd_hdac_stream_readb(s, SD_CTL) &
+                                            SD_CTL_DMA_START)
+                                                nwait++;
+                                }
+                        }
+                        i++;
+                }
+                if (!nwait)
+                        break;
+                cpu_relax();
+        }
+}
+EXPORT_SYMBOL_GPL(snd_hdac_stream_sync);
+
+#ifdef CONFIG_SND_HDA_DSP_LOADER
+/**
+ * snd_hdac_dsp_prepare - prepare for DSP loading
+ * @azx_dev: HD-audio core stream used for DSP loading
+ * @format: HD-audio stream format
+ * @byte_size: data chunk byte size
+ * @bufp: allocated buffer
+ *
+ * Allocate the buffer for the given size and set up the given stream for
+ * DSP loading.  Returns the stream tag (>= 0), or a negative error code.
+ */
+int snd_hdac_dsp_prepare(struct hdac_stream *azx_dev, unsigned int format,
+                         unsigned int byte_size, struct snd_dma_buffer *bufp)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+        u32 *bdl;
+        int err;
+
+        snd_hdac_dsp_lock(azx_dev);
+        spin_lock_irq(&bus->reg_lock);
+        if (azx_dev->running || azx_dev->locked) {
+                spin_unlock_irq(&bus->reg_lock);
+                err = -EBUSY;
+                goto unlock;
+        }
+        azx_dev->locked = true;
+        spin_unlock_irq(&bus->reg_lock);
+
+        err = bus->io_ops->dma_alloc_pages(bus, SNDRV_DMA_TYPE_DEV_SG,
+                                           byte_size, bufp);
+        if (err < 0)
+                goto err_alloc;
+
+        azx_dev->substream = NULL;
+        azx_dev->bufsize = byte_size;
+        azx_dev->period_bytes = byte_size;
+        azx_dev->format_val = format;
+
+        snd_hdac_stream_reset(azx_dev);
+
+        /* reset BDL address */
+        snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0);
+        snd_hdac_stream_writel(azx_dev, SD_BDLPU, 0);
+
+        azx_dev->frags = 0;
+        bdl = (u32 *)azx_dev->bdl.area;
+        err = setup_bdle(bus, bufp, azx_dev, &bdl, 0, byte_size, 0);
+        if (err < 0)
+                goto error;
+
+        snd_hdac_stream_setup(azx_dev);
+        snd_hdac_dsp_unlock(azx_dev);
+        return azx_dev->stream_tag;
+
+ error:
+        bus->io_ops->dma_free_pages(bus, bufp);
+ err_alloc:
+        spin_lock_irq(&bus->reg_lock);
+        azx_dev->locked = false;
+        spin_unlock_irq(&bus->reg_lock);
+ unlock:
+        snd_hdac_dsp_unlock(azx_dev);
+        return err;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_dsp_prepare);
+
+/**
+ * snd_hdac_dsp_trigger - start / stop DSP loading
+ * @azx_dev: HD-audio core stream used for DSP loading
+ * @start: trigger start or stop
+ */
+void snd_hdac_dsp_trigger(struct hdac_stream *azx_dev, bool start)
+{
+        if (start)
+                snd_hdac_stream_start(azx_dev, true);
+        else
+                snd_hdac_stream_stop(azx_dev);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_dsp_trigger);
+
+/**
+ * snd_hdac_dsp_cleanup - clean up the stream from DSP loading to normal
+ * @azx_dev: HD-audio core stream used for DSP loading
+ * @dmab: buffer used by DSP loading
+ */
+void snd_hdac_dsp_cleanup(struct hdac_stream *azx_dev,
+                          struct snd_dma_buffer *dmab)
+{
+        struct hdac_bus *bus = azx_dev->bus;
+
+        if (!dmab->area || !azx_dev->locked)
+                return;
+
+        snd_hdac_dsp_lock(azx_dev);
+        /* reset BDL address */
+        snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0);
+        snd_hdac_stream_writel(azx_dev, SD_BDLPU, 0);
+        snd_hdac_stream_writel(azx_dev, SD_CTL, 0);
+        azx_dev->bufsize = 0;
+        azx_dev->period_bytes = 0;
+        azx_dev->format_val = 0;
+
+        bus->io_ops->dma_free_pages(bus, dmab);
+        dmab->area = NULL;
+
+        spin_lock_irq(&bus->reg_lock);
+        azx_dev->locked = false;
+        spin_unlock_irq(&bus->reg_lock);
+        snd_hdac_dsp_unlock(azx_dev);
+}
+EXPORT_SYMBOL_GPL(snd_hdac_dsp_cleanup);
+#endif /* CONFIG_SND_HDA_DSP_LOADER */
diff --git a/sound/hda/trace.h b/sound/hda/trace.h
index 33a7eb5573d4..e27e2c0b7b17 100644
--- a/sound/hda/trace.h
+++ b/sound/hda/trace.h
@@ -50,6 +50,33 @@ TRACE_EVENT(hda_unsol_event,
         ),
         TP_printk("%s", __get_str(msg))
 );
+
+DECLARE_EVENT_CLASS(hdac_stream,
+        TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),
+
+        TP_ARGS(bus, azx_dev),
+
+        TP_STRUCT__entry(
+                __field(unsigned char, stream_tag)
+        ),
+
+        TP_fast_assign(
+                __entry->stream_tag = (azx_dev)->stream_tag;
+        ),
+
+        TP_printk("stream_tag: %d", __entry->stream_tag)
+);
+
+DEFINE_EVENT(hdac_stream, snd_hdac_stream_start,
+        TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),
+        TP_ARGS(bus, azx_dev)
+);
+
+DEFINE_EVENT(hdac_stream, snd_hdac_stream_stop,
+        TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),
+        TP_ARGS(bus, azx_dev)
+);
+
 #endif /* __HDAC_TRACE_H */
 
 /* This part must be outside protection */
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index ec1ee07df59d..10c8de1f8d29 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -2860,6 +2860,7 @@ static struct {
         {NULL}
 };
 
+#ifdef MODULE
 static struct isapnp_device_id id_table[] = {
         {       ISAPNP_VENDOR('C','M','I'), ISAPNP_DEVICE(0x0001),
                 ISAPNP_VENDOR('@','@','@'), ISAPNP_FUNCTION(0x0001), 0 },
@@ -2877,6 +2878,7 @@ static struct isapnp_device_id id_table[] = {
 };
 
 MODULE_DEVICE_TABLE(isapnp, id_table);
+#endif
 
 static struct pnp_dev *activate_dev(char *devname, char *resname, struct pnp_dev *dev)
 {
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 66ddd981d1d5..1fc6d8bc09e5 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -898,8 +898,8 @@ snd_ad1889_create(struct snd_card *card,
                 return err;
 
         /* check PCI availability (32bit DMA) */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                 dev_err(card->dev, "error setting 32-bit DMA mask.\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index c8d499575c01..36470af7eda7 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2105,8 +2105,8 @@ static int snd_ali_create(struct snd_card *card,
         if (err < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 31 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(31)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(31)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(31)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(31)) < 0) {
                 dev_err(card->dev,
                         "architecture does not support 31bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 57e034f208dc..add3176398d3 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -658,8 +658,8 @@ static int snd_als300_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-                pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+                dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                 dev_err(card->dev, "error setting 28bit DMA mask\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index a3dea464134d..ff39a0c7277b 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -871,8 +871,8 @@ static int snd_card_als4000_probe(struct pci_dev *pci,
                 return err;
         }
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                 dev_err(&pci->dev, "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 996369134ea8..32092184bbf2 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -150,8 +150,8 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
         // check PCI availability (DMA).
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                 dev_err(card->dev, "error to set DMA mask\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index 8d2fee7b33bd..167714303070 100644
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -258,8 +258,8 @@ static int snd_aw2_create(struct snd_card *card,
         pci_set_master(pci);
 
         /* check PCI availability (32bit DMA) */
-        if ((pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) ||
-            (pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0)) {
+        if ((dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) ||
+            (dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0)) {
                 dev_err(card->dev, "Impossible to set 32bit mask DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 33b2a0af1b59..07a4acc99541 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -2420,8 +2420,8 @@ snd_azf3328_create(struct snd_card *card,
         chip->irq = -1;
 
         /* check if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                 dev_err(card->dev,
                         "architecture does not support 24bit PCI busmaster DMA\n"
                 );
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index dd75b7536fa2..0b31732eb4dc 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1676,8 +1676,8 @@ static int snd_ca0106_create(int dev, struct snd_card *card,
         err = pci_enable_device(pci);
         if (err < 0)
                 return err;
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                 dev_err(card->dev, "error to set 32bit mask DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 963b912550d4..de409cda50aa 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -289,8 +289,8 @@ static int snd_cs5535audio_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                 dev_warn(card->dev, "unable to get 32bit dma\n");
                 err = -ENXIO;
                 goto pcifail;
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 1cac55fd1139..9667cbfb0ca2 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1910,8 +1910,8 @@ static int hw_card_start(struct hw *hw)
                 return err;
 
         /* Set DMA transfer mask */
-        if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
+        if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||
+            dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {
                 dev_err(hw->card->dev,
                         "architecture does not support PCI busmaster DMA with mask 0x%llx\n",
                         CT_XFI_DMA_MASK);
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index 955ad871e9a8..9dc2950e1ab7 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -2035,8 +2035,8 @@ static int hw_card_start(struct hw *hw)
                 return err;
 
         /* Set DMA transfer mask */
-        if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
-            pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
+        if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||
+            dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {
                 dev_err(hw->card->dev,
                         "architecture does not support PCI busmaster DMA with mask 0x%llx\n",
                         CT_XFI_DMA_MASK);
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 37d0220a094c..db7a2e5e4a14 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -183,8 +183,10 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci,
         }
 #endif
  
-        strcpy(card->driver, emu->card_capabilities->driver);
-        strcpy(card->shortname, emu->card_capabilities->name);
+        strlcpy(card->driver, emu->card_capabilities->driver,
+                sizeof(card->driver));
+        strlcpy(card->shortname, emu->card_capabilities->name,
+                sizeof(card->shortname));
         snprintf(card->longname, sizeof(card->longname),
                  "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i",
                  card->shortname, emu->revision, emu->serial, emu->port, emu->irq);
diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c
index 874cd76c7b7f..d2c7ea3a7610 100644
--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
@@ -415,7 +415,7 @@ start_voice(struct snd_emux_voice *vp)
         snd_emu10k1_ptr_write(hw, Z2, ch, 0);
 
         /* invalidate maps */
-        temp = (hw->silent_page.addr << 1) | MAP_PTI_MASK;
+        temp = (hw->silent_page.addr << hw->address_mode) | (hw->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
         snd_emu10k1_ptr_write(hw, MAPA, ch, temp);
         snd_emu10k1_ptr_write(hw, MAPB, ch, temp);
 #if 0
@@ -436,7 +436,7 @@ start_voice(struct snd_emux_voice *vp)
                 snd_emu10k1_ptr_write(hw, CDF, ch, sample);
 
                 /* invalidate maps */
-                temp = ((unsigned int)hw->silent_page.addr << 1) | MAP_PTI_MASK;
+                temp = ((unsigned int)hw->silent_page.addr << hw_address_mode) | (hw->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
                 snd_emu10k1_ptr_write(hw, MAPA, ch, temp);
                 snd_emu10k1_ptr_write(hw, MAPB, ch, temp);
                 
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 54079f5d5673..54219fd662a1 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -282,7 +282,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
         snd_emu10k1_ptr_write(emu, TCB, 0, 0);  /* taken from original driver */
         snd_emu10k1_ptr_write(emu, TCBS, 0, 4); /* taken from original driver */
 
-        silent_page = (emu->silent_page.addr << 1) | MAP_PTI_MASK;
+        silent_page = (emu->silent_page.addr << emu->address_mode) | (emu->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
         for (ch = 0; ch < NUM_G; ch++) {
                 snd_emu10k1_ptr_write(emu, MAPA, ch, silent_page);
                 snd_emu10k1_ptr_write(emu, MAPB, ch, silent_page);
@@ -348,6 +348,11 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
                 outl(reg | A_IOCFG_GPOUT0, emu->port + A_IOCFG);
         }
 
+        if (emu->address_mode == 0) {
+                /* use 16M in 4G */
+                outl(inl(emu->port + HCFG) | HCFG_EXPANDED_MEM, emu->port + HCFG);
+        }
+
         return 0;
 }
 
@@ -1446,7 +1451,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          *
          */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,
-         .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]",
+         .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
@@ -1596,7 +1601,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
-         .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]",
+         .driver = "Audigy2", .name = "Audigy 2 Platinum EX [SB0280]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1902,10 +1907,12 @@ int snd_emu10k1_create(struct snd_card *card,
 
         is_audigy = emu->audigy = c->emu10k2_chip;
 
+        /* set addressing mode */
+        emu->address_mode = is_audigy ? 0 : 1;
         /* set the DMA transfer mask */
-        emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;
-        if (pci_set_dma_mask(pci, emu->dma_mask) < 0 ||
-            pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) {
+        emu->dma_mask = emu->address_mode ? EMU10K1_DMA_MASK : AUDIGY_DMA_MASK;
+        if (dma_set_mask(&pci->dev, emu->dma_mask) < 0 ||
+            dma_set_coherent_mask(&pci->dev, emu->dma_mask) < 0) {
                 dev_err(card->dev,
                         "architecture does not support PCI busmaster DMA with mask 0x%lx\n",
                         emu->dma_mask);
@@ -1928,7 +1935,7 @@ int snd_emu10k1_create(struct snd_card *card,
 
         emu->max_cache_pages = max_cache_bytes >> PAGE_SHIFT;
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
-                                32 * 1024, &emu->ptb_pages) < 0) {
+                                (emu->address_mode ? 32 : 16) * 1024, &emu->ptb_pages) < 0) {
                 err = -ENOMEM;
                 goto error;
         }
@@ -2027,8 +2034,8 @@ int snd_emu10k1_create(struct snd_card *card,
 
         /* Clear silent pages and set up pointers */
         memset(emu->silent_page.area, 0, PAGE_SIZE);
-        silent_page = emu->silent_page.addr << 1;
-        for (idx = 0; idx < MAXPAGES; idx++)
+        silent_page = emu->silent_page.addr << emu->address_mode;
+        for (idx = 0; idx < (emu->address_mode ? MAXPAGES1 : MAXPAGES0); idx++)
                 ((u32 *)emu->ptb_pages.area)[idx] = cpu_to_le32(silent_page | idx);
 
         /* set up voice indices */
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 0dc07385af0e..14a305bd8a98 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -380,7 +380,7 @@ static void snd_emu10k1_pcm_init_voice(struct snd_emu10k1 *emu,
         snd_emu10k1_ptr_write(emu, Z1, voice, 0);
         snd_emu10k1_ptr_write(emu, Z2, voice, 0);
         /* invalidate maps */
-        silent_page = ((unsigned int)emu->silent_page.addr << 1) | MAP_PTI_MASK;
+        silent_page = ((unsigned int)emu->silent_page.addr << emu->address_mode) | (emu->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
         snd_emu10k1_ptr_write(emu, MAPA, voice, silent_page);
         snd_emu10k1_ptr_write(emu, MAPB, voice, silent_page);
         /* modulation envelope */
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index c68e6dd2fa67..4f1f69be1865 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -34,10 +34,11 @@
  * aligned pages in others
  */
 #define __set_ptb_entry(emu,page,addr) \
-        (((u32 *)(emu)->ptb_pages.area)[page] = cpu_to_le32(((addr) << 1) | (page)))
+        (((u32 *)(emu)->ptb_pages.area)[page] = cpu_to_le32(((addr) << (emu->address_mode)) | (page)))
 
 #define UNIT_PAGES              (PAGE_SIZE / EMUPAGESIZE)
-#define MAX_ALIGN_PAGES         (MAXPAGES / UNIT_PAGES)
+#define MAX_ALIGN_PAGES0                (MAXPAGES0 / UNIT_PAGES)
+#define MAX_ALIGN_PAGES1                (MAXPAGES1 / UNIT_PAGES)
 /* get aligned page from offset address */
 #define get_aligned_page(offset)        ((offset) >> PAGE_SHIFT)
 /* get offset address from aligned page */
@@ -124,7 +125,7 @@ static int search_empty_map_area(struct snd_emu10k1 *emu, int npages, struct lis
                 }
                 page = blk->mapped_page + blk->pages;
         }
-        size = MAX_ALIGN_PAGES - page;
+        size = (emu->address_mode ? MAX_ALIGN_PAGES1 : MAX_ALIGN_PAGES0) - page;
         if (size >= max_size) {
                 *nextp = pos;
                 return page;
@@ -181,7 +182,7 @@ static int unmap_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
                 q = get_emu10k1_memblk(p, mapped_link);
                 end_page = q->mapped_page;
         } else
-                end_page = MAX_ALIGN_PAGES;
+                end_page = (emu->address_mode ? MAX_ALIGN_PAGES1 : MAX_ALIGN_PAGES0);
 
         /* remove links */
         list_del(&blk->mapped_link);
@@ -307,7 +308,7 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst
         if (snd_BUG_ON(!emu))
                 return NULL;
         if (snd_BUG_ON(runtime->dma_bytes <= 0 ||
-                       runtime->dma_bytes >= MAXPAGES * EMUPAGESIZE))
+                       runtime->dma_bytes >= (emu->address_mode ? MAXPAGES1 : MAXPAGES0) * EMUPAGESIZE))
                 return NULL;
         hdr = emu->memhdr;
         if (snd_BUG_ON(!hdr))
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index e1858d9d23d8..8963d7688fb0 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1580,8 +1580,8 @@ static int snd_es1938_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                 dev_err(card->dev,
                         "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 059f3846d7b8..e0d9363dc7fd 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2689,8 +2689,8 @@ static int snd_es1968_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                 dev_err(card->dev,
                         "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index a5ed1c181784..98ced971cb43 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -4,7 +4,7 @@ config SND_HDA
         tristate
         select SND_PCM
         select SND_VMASTER
-        select SND_KCTL_JACK
+        select SND_JACK if INPUT=y || INPUT=SND
         select SND_HDA_CORE
 
 config SND_HDA_INTEL
@@ -38,9 +38,6 @@ config SND_HDA_TEGRA
 
 if SND_HDA
 
-config SND_HDA_DSP_LOADER
-        bool
-
 config SND_HDA_PREALLOC_SIZE
         int "Pre-allocated buffer size for HD-audio driver"
         range 0 32768
@@ -87,14 +84,6 @@ config SND_HDA_INPUT_BEEP_MODE
           Set 1 to always enable the digital beep interface for HD-audio by
           default.
 
-config SND_HDA_INPUT_JACK
-        bool "Support jack plugging notification via input layer"
-        depends on INPUT=y || INPUT=SND
-        select SND_JACK
-        help
-          Say Y here to enable the jack plugging notification via
-          input layer.
-
 config SND_HDA_PATCH_LOADER
         bool "Support initialization patch loading for HD-audio"
         select FW_LOADER
@@ -156,11 +145,6 @@ config SND_HDA_CODEC_HDMI
 comment "Set to Y if you want auto-loading the codec driver"
         depends on SND_HDA=y && SND_HDA_CODEC_HDMI=m
 
-config SND_HDA_I915
-        bool
-        default y
-        depends on DRM_I915
-
 config SND_HDA_CODEC_CIRRUS
         tristate "Build Cirrus Logic codec support"
         select SND_HDA_GENERIC
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index af78fb33a4fd..90e69b243b41 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,16 +1,15 @@
 snd-hda-intel-objs := hda_intel.o
-snd-hda-controller-objs := hda_controller.o
 snd-hda-tegra-objs := hda_tegra.o
-# for haswell power well
-snd-hda-intel-$(CONFIG_SND_HDA_I915) += hda_i915.o
 
 snd-hda-codec-y := hda_bind.o hda_codec.o hda_jack.o hda_auto_parser.o hda_sysfs.o
+snd-hda-codec-y += hda_controller.o
 snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o
 snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
 snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
 
 # for trace-points
 CFLAGS_hda_controller.o := -I$(src)
+CFLAGS_hda_intel.o := -I$(src)
 
 snd-hda-codec-generic-objs :=   hda_generic.o
 snd-hda-codec-realtek-objs :=   patch_realtek.o
@@ -27,7 +26,6 @@ snd-hda-codec-hdmi-objs :=	patch_hdmi.o hda_eld.o
 
 # common driver
 obj-$(CONFIG_SND_HDA) := snd-hda-codec.o
-obj-$(CONFIG_SND_HDA) += snd-hda-controller.o
 
 # codec drivers
 obj-$(CONFIG_SND_HDA_GENERIC) += snd-hda-codec-generic.o
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 873ed1bce12b..54380ed03697 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -146,11 +146,11 @@ static int codec_exec_verb(struct hdac_device *dev, unsigned int cmd,
         bus->no_response_fallback = 0;
         mutex_unlock(&bus->core.cmd_mutex);
         snd_hda_power_down_pm(codec);
-        if (!codec_in_pm(codec) && res && err < 0 && bus->rirb_error) {
+        if (!codec_in_pm(codec) && res && err == -EAGAIN) {
                 if (bus->response_reset) {
                         codec_dbg(codec,
                                   "resetting BUS due to fatal communication error\n");
-                        bus->ops.bus_reset(bus);
+                        snd_hda_bus_reset(bus);
                 }
                 goto again;
         }
@@ -436,9 +436,8 @@ static unsigned int get_num_devices(struct hda_codec *codec, hda_nid_t nid)
             get_wcaps_type(wcaps) != AC_WID_PIN)
                 return 0;
 
-        parm = snd_hda_param_read(codec, nid, AC_PAR_DEVLIST_LEN);
-        if (parm == -1 && codec->bus->rirb_error)
-                parm = 0;
+        if (_snd_hdac_read_parm(&codec->core, nid, AC_PAR_DEVLIST_LEN, &parm))
+                return 0; /* error */
         return parm & AC_DEV_LIST_LEN_MASK;
 }
 
@@ -467,10 +466,9 @@ int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,
 
         devices = 0;
         while (devices < dev_len) {
-                parm = snd_hda_codec_read(codec, nid, 0,
-                                          AC_VERB_GET_DEVICE_LIST, devices);
-                if (parm == -1 && codec->bus->rirb_error)
-                        break;
+                if (snd_hdac_read(&codec->core, nid,
+                                  AC_VERB_GET_DEVICE_LIST, devices, &parm))
+                        break; /* error */
 
                 for (i = 0; i < 8; i++) {
                         dev_list[devices] = (u8)parm;
@@ -484,96 +482,6 @@ int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,
 }
 
 /*
- * destructor
- */
-static void snd_hda_bus_free(struct hda_bus *bus)
-{
-        if (!bus)
-                return;
-        if (bus->ops.private_free)
-                bus->ops.private_free(bus);
-        snd_hdac_bus_exit(&bus->core);
-        kfree(bus);
-}
-
-static int snd_hda_bus_dev_free(struct snd_device *device)
-{
-        snd_hda_bus_free(device->device_data);
-        return 0;
-}
-
-static int snd_hda_bus_dev_disconnect(struct snd_device *device)
-{
-        struct hda_bus *bus = device->device_data;
-        bus->shutdown = 1;
-        return 0;
-}
-
-/* hdac_bus_ops translations */
-static int _hda_bus_command(struct hdac_bus *_bus, unsigned int cmd)
-{
-        struct hda_bus *bus = container_of(_bus, struct hda_bus, core);
-        return bus->ops.command(bus, cmd);
-}
-
-static int _hda_bus_get_response(struct hdac_bus *_bus, unsigned int addr,
-                                 unsigned int *res)
-{
-        struct hda_bus *bus = container_of(_bus, struct hda_bus, core);
-        *res = bus->ops.get_response(bus, addr);
-        return bus->rirb_error ? -EIO : 0;
-}
-
-static const struct hdac_bus_ops bus_ops = {
-        .command = _hda_bus_command,
-        .get_response = _hda_bus_get_response,
-};
-
-/**
- * snd_hda_bus_new - create a HDA bus
- * @card: the card entry
- * @busp: the pointer to store the created bus instance
- *
- * Returns 0 if successful, or a negative error code.
- */
-int snd_hda_bus_new(struct snd_card *card,
-                    struct hda_bus **busp)
-{
-        struct hda_bus *bus;
-        int err;
-        static struct snd_device_ops dev_ops = {
-                .dev_disconnect = snd_hda_bus_dev_disconnect,
-                .dev_free = snd_hda_bus_dev_free,
-        };
-
-        if (busp)
-                *busp = NULL;
-
-        bus = kzalloc(sizeof(*bus), GFP_KERNEL);
-        if (!bus)
-                return -ENOMEM;
-
-        err = snd_hdac_bus_init(&bus->core, card->dev, &bus_ops);
-        if (err < 0) {
-                kfree(bus);
-                return err;
-        }
-
-        bus->card = card;
-        mutex_init(&bus->prepare_mutex);
-
-        err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops);
-        if (err < 0) {
-                snd_hda_bus_free(bus);
-                return err;
-        }
-        if (busp)
-                *busp = bus;
-        return 0;
-}
-EXPORT_SYMBOL_GPL(snd_hda_bus_new);
-
-/*
  * read widget caps for each widget and store in cache
  */
 static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)
@@ -873,14 +781,15 @@ struct hda_pcm *snd_hda_codec_pcm_new(struct hda_codec *codec,
         struct hda_pcm *pcm;
         va_list args;
 
-        va_start(args, fmt);
         pcm = kzalloc(sizeof(*pcm), GFP_KERNEL);
         if (!pcm)
                 return NULL;
 
         pcm->codec = codec;
         kref_init(&pcm->kref);
+        va_start(args, fmt);
         pcm->name = kvasprintf(GFP_KERNEL, fmt, args);
+        va_end(args);
         if (!pcm->name) {
                 kfree(pcm);
                 return NULL;
@@ -949,6 +858,7 @@ void snd_hda_codec_register(struct hda_codec *codec)
                 return;
         if (device_is_registered(hda_codec_dev(codec))) {
                 snd_hda_register_beep_device(codec);
+                snd_hdac_link_power(&codec->core, true);
                 pm_runtime_enable(hda_codec_dev(codec));
                 /* it was powered up in snd_hda_codec_new(), now all done */
                 snd_hda_power_down(codec);
@@ -975,6 +885,7 @@ static int snd_hda_codec_dev_free(struct snd_device *device)
         struct hda_codec *codec = device->device_data;
 
         codec->in_freeing = 1;
+        snd_hdac_link_power(&codec->core, false);
         snd_hdac_device_unregister(&codec->core);
         put_device(hda_codec_dev(codec));
         return 0;
@@ -2082,6 +1993,16 @@ static struct snd_kcontrol_new vmaster_mute_mode = {
         .put = vmaster_mute_mode_put,
 };
 
+/* meta hook to call each driver's vmaster hook */
+static void vmaster_hook(void *private_data, int enabled)
+{
+        struct hda_vmaster_mute_hook *hook = private_data;
+
+        if (hook->mute_mode != HDA_VMUTE_FOLLOW_MASTER)
+                enabled = hook->mute_mode;
+        hook->hook(hook->codec, enabled);
+}
+
 /**
  * snd_hda_add_vmaster_hook - Add a vmaster hook for mute-LED
  * @codec: the HDA codec
@@ -2100,9 +2021,9 @@ int snd_hda_add_vmaster_hook(struct hda_codec *codec,
 
         if (!hook->hook || !hook->sw_kctl)
                 return 0;
-        snd_ctl_add_vmaster_hook(hook->sw_kctl, hook->hook, codec);
         hook->codec = codec;
         hook->mute_mode = HDA_VMUTE_FOLLOW_MASTER;
+        snd_ctl_add_vmaster_hook(hook->sw_kctl, vmaster_hook, hook);
         if (!expose_enum_ctl)
                 return 0;
         kctl = snd_ctl_new1(&vmaster_mute_mode, hook);
@@ -2128,14 +2049,7 @@ void snd_hda_sync_vmaster_hook(struct hda_vmaster_mute_hook *hook)
          */
         if (hook->codec->bus->shutdown)
                 return;
-        switch (hook->mute_mode) {
-        case HDA_VMUTE_FOLLOW_MASTER:
-                snd_ctl_sync_vmaster_hook(hook->sw_kctl);
-                break;
-        default:
-                hook->hook(hook->codec, hook->mute_mode);
-                break;
-        }
+        snd_ctl_sync_vmaster_hook(hook->sw_kctl);
 }
 EXPORT_SYMBOL_GPL(snd_hda_sync_vmaster_hook);
 
@@ -3194,6 +3108,7 @@ static int hda_codec_runtime_suspend(struct device *dev)
         if (codec_has_clkstop(codec) && codec_has_epss(codec) &&
             (state & AC_PWRST_CLK_STOP_OK))
                 snd_hdac_codec_link_down(&codec->core);
+        snd_hdac_link_power(&codec->core, false);
         return 0;
 }
 
@@ -3201,6 +3116,7 @@ static int hda_codec_runtime_resume(struct device *dev)
 {
         struct hda_codec *codec = dev_to_hda_codec(dev);
 
+        snd_hdac_link_power(&codec->core, true);
         snd_hdac_codec_link_up(&codec->core);
         hda_call_codec_resume(codec);
         pm_runtime_mark_last_busy(dev);
@@ -3284,311 +3200,6 @@ int snd_hda_codec_build_controls(struct hda_codec *codec)
 }
 
 /*
- * stream formats
- */
-struct hda_rate_tbl {
-        unsigned int hz;
-        unsigned int alsa_bits;
-        unsigned int hda_fmt;
-};
-
-/* rate = base * mult / div */
-#define HDA_RATE(base, mult, div) \
-        (AC_FMT_BASE_##base##K | (((mult) - 1) << AC_FMT_MULT_SHIFT) | \
-         (((div) - 1) << AC_FMT_DIV_SHIFT))
-
-static struct hda_rate_tbl rate_bits[] = {
-        /* rate in Hz, ALSA rate bitmask, HDA format value */
-
-        /* autodetected value used in snd_hda_query_supported_pcm */
-        { 8000, SNDRV_PCM_RATE_8000, HDA_RATE(48, 1, 6) },
-        { 11025, SNDRV_PCM_RATE_11025, HDA_RATE(44, 1, 4) },
-        { 16000, SNDRV_PCM_RATE_16000, HDA_RATE(48, 1, 3) },
-        { 22050, SNDRV_PCM_RATE_22050, HDA_RATE(44, 1, 2) },
-        { 32000, SNDRV_PCM_RATE_32000, HDA_RATE(48, 2, 3) },
-        { 44100, SNDRV_PCM_RATE_44100, HDA_RATE(44, 1, 1) },
-        { 48000, SNDRV_PCM_RATE_48000, HDA_RATE(48, 1, 1) },
-        { 88200, SNDRV_PCM_RATE_88200, HDA_RATE(44, 2, 1) },
-        { 96000, SNDRV_PCM_RATE_96000, HDA_RATE(48, 2, 1) },
-        { 176400, SNDRV_PCM_RATE_176400, HDA_RATE(44, 4, 1) },
-        { 192000, SNDRV_PCM_RATE_192000, HDA_RATE(48, 4, 1) },
-#define AC_PAR_PCM_RATE_BITS    11
-        /* up to bits 10, 384kHZ isn't supported properly */
-
-        /* not autodetected value */
-        { 9600, SNDRV_PCM_RATE_KNOT, HDA_RATE(48, 1, 5) },
-
-        { 0 } /* terminator */
-};
-
-/**
- * snd_hda_calc_stream_format - calculate format bitset
- * @codec: HD-audio codec
- * @rate: the sample rate
- * @channels: the number of channels
- * @format: the PCM format (SNDRV_PCM_FORMAT_XXX)
- * @maxbps: the max. bps
- * @spdif_ctls: HD-audio SPDIF status bits (0 if irrelevant)
- *
- * Calculate the format bitset from the given rate, channels and th PCM format.
- *
- * Return zero if invalid.
- */
-unsigned int snd_hda_calc_stream_format(struct hda_codec *codec,
-                                        unsigned int rate,
-                                        unsigned int channels,
-                                        unsigned int format,
-                                        unsigned int maxbps,
-                                        unsigned short spdif_ctls)
-{
-        int i;
-        unsigned int val = 0;
-
-        for (i = 0; rate_bits[i].hz; i++)
-                if (rate_bits[i].hz == rate) {
-                        val = rate_bits[i].hda_fmt;
-                        break;
-                }
-        if (!rate_bits[i].hz) {
-                codec_dbg(codec, "invalid rate %d\n", rate);
-                return 0;
-        }
-
-        if (channels == 0 || channels > 8) {
-                codec_dbg(codec, "invalid channels %d\n", channels);
-                return 0;
-        }
-        val |= channels - 1;
-
-        switch (snd_pcm_format_width(format)) {
-        case 8:
-                val |= AC_FMT_BITS_8;
-                break;
-        case 16:
-                val |= AC_FMT_BITS_16;
-                break;
-        case 20:
-        case 24:
-        case 32:
-                if (maxbps >= 32 || format == SNDRV_PCM_FORMAT_FLOAT_LE)
-                        val |= AC_FMT_BITS_32;
-                else if (maxbps >= 24)
-                        val |= AC_FMT_BITS_24;
-                else
-                        val |= AC_FMT_BITS_20;
-                break;
-        default:
-                codec_dbg(codec, "invalid format width %d\n",
-                          snd_pcm_format_width(format));
-                return 0;
-        }
-
-        if (spdif_ctls & AC_DIG1_NONAUDIO)
-                val |= AC_FMT_TYPE_NON_PCM;
-
-        return val;
-}
-EXPORT_SYMBOL_GPL(snd_hda_calc_stream_format);
-
-static unsigned int query_pcm_param(struct hda_codec *codec, hda_nid_t nid)
-{
-        unsigned int val = 0;
-        if (nid != codec->core.afg &&
-            (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD))
-                val = snd_hda_param_read(codec, nid, AC_PAR_PCM);
-        if (!val || val == -1)
-                val = snd_hda_param_read(codec, codec->core.afg, AC_PAR_PCM);
-        if (!val || val == -1)
-                return 0;
-        return val;
-}
-
-static unsigned int query_stream_param(struct hda_codec *codec, hda_nid_t nid)
-{
-        unsigned int streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
-        if (!streams || streams == -1)
-                streams = snd_hda_param_read(codec, codec->core.afg, AC_PAR_STREAM);
-        if (!streams || streams == -1)
-                return 0;
-        return streams;
-}
-
-/**
- * snd_hda_query_supported_pcm - query the supported PCM rates and formats
- * @codec: the HDA codec
- * @nid: NID to query
- * @ratesp: the pointer to store the detected rate bitflags
- * @formatsp: the pointer to store the detected formats
- * @bpsp: the pointer to store the detected format widths
- *
- * Queries the supported PCM rates and formats.  The NULL @ratesp, @formatsp
- * or @bsps argument is ignored.
- *
- * Returns 0 if successful, otherwise a negative error code.
- */
-int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
-                                u32 *ratesp, u64 *formatsp, unsigned int *bpsp)
-{
-        unsigned int i, val, wcaps;
-
-        wcaps = get_wcaps(codec, nid);
-        val = query_pcm_param(codec, nid);
-
-        if (ratesp) {
-                u32 rates = 0;
-                for (i = 0; i < AC_PAR_PCM_RATE_BITS; i++) {
-                        if (val & (1 << i))
-                                rates |= rate_bits[i].alsa_bits;
-                }
-                if (rates == 0) {
-                        codec_err(codec,
-                                  "rates == 0 (nid=0x%x, val=0x%x, ovrd=%i)\n",
-                                  nid, val,
-                                  (wcaps & AC_WCAP_FORMAT_OVRD) ? 1 : 0);
-                        return -EIO;
-                }
-                *ratesp = rates;
-        }
-
-        if (formatsp || bpsp) {
-                u64 formats = 0;
-                unsigned int streams, bps;
-
-                streams = query_stream_param(codec, nid);
-                if (!streams)
-                        return -EIO;
-
-                bps = 0;
-                if (streams & AC_SUPFMT_PCM) {
-                        if (val & AC_SUPPCM_BITS_8) {
-                                formats |= SNDRV_PCM_FMTBIT_U8;
-                                bps = 8;
-                        }
-                        if (val & AC_SUPPCM_BITS_16) {
-                                formats |= SNDRV_PCM_FMTBIT_S16_LE;
-                                bps = 16;
-                        }
-                        if (wcaps & AC_WCAP_DIGITAL) {
-                                if (val & AC_SUPPCM_BITS_32)
-                                        formats |= SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE;
-                                if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24))
-                                        formats |= SNDRV_PCM_FMTBIT_S32_LE;
-                                if (val & AC_SUPPCM_BITS_24)
-                                        bps = 24;
-                                else if (val & AC_SUPPCM_BITS_20)
-                                        bps = 20;
-                        } else if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24|
-                                          AC_SUPPCM_BITS_32)) {
-                                formats |= SNDRV_PCM_FMTBIT_S32_LE;
-                                if (val & AC_SUPPCM_BITS_32)
-                                        bps = 32;
-                                else if (val & AC_SUPPCM_BITS_24)
-                                        bps = 24;
-                                else if (val & AC_SUPPCM_BITS_20)
-                                        bps = 20;
-                        }
-                }
-#if 0 /* FIXME: CS4206 doesn't work, which is the only codec supporting float */
-                if (streams & AC_SUPFMT_FLOAT32) {
-                        formats |= SNDRV_PCM_FMTBIT_FLOAT_LE;
-                        if (!bps)
-                                bps = 32;
-                }
-#endif
-                if (streams == AC_SUPFMT_AC3) {
-                        /* should be exclusive */
-                        /* temporary hack: we have still no proper support
-                         * for the direct AC3 stream...
-                         */
-                        formats |= SNDRV_PCM_FMTBIT_U8;
-                        bps = 8;
-                }
-                if (formats == 0) {
-                        codec_err(codec,
-                                  "formats == 0 (nid=0x%x, val=0x%x, ovrd=%i, streams=0x%x)\n",
-                                  nid, val,
-                                  (wcaps & AC_WCAP_FORMAT_OVRD) ? 1 : 0,
-                                  streams);
-                        return -EIO;
-                }
-                if (formatsp)
-                        *formatsp = formats;
-                if (bpsp)
-                        *bpsp = bps;
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(snd_hda_query_supported_pcm);
-
-/**
- * snd_hda_is_supported_format - Check the validity of the format
- * @codec: HD-audio codec
- * @nid: NID to check
- * @format: the HD-audio format value to check
- *
- * Check whether the given node supports the format value.
- *
- * Returns 1 if supported, 0 if not.
- */
-int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
-                                unsigned int format)
-{
-        int i;
-        unsigned int val = 0, rate, stream;
-
-        val = query_pcm_param(codec, nid);
-        if (!val)
-                return 0;
-
-        rate = format & 0xff00;
-        for (i = 0; i < AC_PAR_PCM_RATE_BITS; i++)
-                if (rate_bits[i].hda_fmt == rate) {
-                        if (val & (1 << i))
-                                break;
-                        return 0;
-                }
-        if (i >= AC_PAR_PCM_RATE_BITS)
-                return 0;
-
-        stream = query_stream_param(codec, nid);
-        if (!stream)
-                return 0;
-
-        if (stream & AC_SUPFMT_PCM) {
-                switch (format & 0xf0) {
-                case 0x00:
-                        if (!(val & AC_SUPPCM_BITS_8))
-                                return 0;
-                        break;
-                case 0x10:
-                        if (!(val & AC_SUPPCM_BITS_16))
-                                return 0;
-                        break;
-                case 0x20:
-                        if (!(val & AC_SUPPCM_BITS_20))
-                                return 0;
-                        break;
-                case 0x30:
-                        if (!(val & AC_SUPPCM_BITS_24))
-                                return 0;
-                        break;
-                case 0x40:
-                        if (!(val & AC_SUPPCM_BITS_32))
-                                return 0;
-                        break;
-                default:
-                        return 0;
-                }
-        } else {
-                /* FIXME: check for float32 and AC3? */
-        }
-
-        return 1;
-}
-EXPORT_SYMBOL_GPL(snd_hda_is_supported_format);
-
-/*
  * PCM stuff
  */
 static int hda_pcm_default_open_close(struct hda_pcm_stream *hinfo,
@@ -3800,9 +3411,6 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
         struct hda_pcm *cpcm;
         int dev, err;
 
-        if (snd_BUG_ON(!bus->ops.attach_pcm))
-                return -EINVAL;
-
         err = snd_hda_codec_parse_pcms(codec);
         if (err < 0) {
                 snd_hda_codec_reset(codec);
@@ -3820,7 +3428,7 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
                 if (dev < 0)
                         continue; /* no fatal error */
                 cpcm->device = dev;
-                err =  bus->ops.attach_pcm(bus, codec, cpcm);
+                err =  snd_hda_attach_pcm_stream(bus, codec, cpcm);
                 if (err < 0) {
                         codec_err(codec,
                                   "cannot attach PCM stream %d for codec #%d\n",
@@ -4490,10 +4098,10 @@ int snd_hda_add_imux_item(struct hda_codec *codec,
 EXPORT_SYMBOL_GPL(snd_hda_add_imux_item);
 
 /**
- * snd_hda_bus_reset - Reset the bus
+ * snd_hda_bus_reset_codecs - Reset the bus
  * @bus: HD-audio bus
  */
-void snd_hda_bus_reset(struct hda_bus *bus)
+void snd_hda_bus_reset_codecs(struct hda_bus *bus)
 {
         struct hda_codec *codec;
 
@@ -4508,7 +4116,6 @@ void snd_hda_bus_reset(struct hda_bus *bus)
 #endif
         }
 }
-EXPORT_SYMBOL_GPL(snd_hda_bus_reset);
 
 /**
  * snd_print_pcm_bits - Print the supported PCM fmt bits to the string buffer
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 9075ac28dc4b..ed7e9cfd699a 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -40,32 +40,6 @@ struct hda_codec;
 struct hda_pcm;
 struct hda_pcm_stream;
 
-/* bus operators */
-struct hda_bus_ops {
-        /* send a single command */
-        int (*command)(struct hda_bus *bus, unsigned int cmd);
-        /* get a response from the last command */
-        unsigned int (*get_response)(struct hda_bus *bus, unsigned int addr);
-        /* free the private data */
-        void (*private_free)(struct hda_bus *);
-        /* attach a PCM stream */
-        int (*attach_pcm)(struct hda_bus *bus, struct hda_codec *codec,
-                          struct hda_pcm *pcm);
-        /* reset bus for retry verb */
-        void (*bus_reset)(struct hda_bus *bus);
-#ifdef CONFIG_SND_HDA_DSP_LOADER
-        /* prepare DSP transfer */
-        int (*load_dsp_prepare)(struct hda_bus *bus, unsigned int format,
-                                unsigned int byte_size,
-                                struct snd_dma_buffer *bufp);
-        /* start/stop DSP transfer */
-        void (*load_dsp_trigger)(struct hda_bus *bus, bool start);
-        /* clean up DSP transfer */
-        void (*load_dsp_cleanup)(struct hda_bus *bus,
-                                 struct snd_dma_buffer *dmab);
-#endif
-};
-
 /*
  * codec bus
  *
@@ -77,10 +51,8 @@ struct hda_bus {
 
         struct snd_card *card;
 
-        void *private_data;
         struct pci_dev *pci;
         const char *modelname;
-        struct hda_bus_ops ops;
 
         struct mutex prepare_mutex;
 
@@ -92,7 +64,6 @@ struct hda_bus {
         unsigned int allow_bus_reset:1; /* allow bus reset at fatal error */
         /* status for codec/controller */
         unsigned int shutdown :1;       /* being unloaded */
-        unsigned int rirb_error:1;      /* error in codec communication */
         unsigned int response_reset:1;  /* controller was reset */
         unsigned int in_reset:1;        /* during reset operation */
         unsigned int no_response_fallback:1; /* don't fallback at RIRB error */
@@ -100,6 +71,9 @@ struct hda_bus {
         int primary_dig_out_type;       /* primary digital out PCM type */
 };
 
+/* from hdac_bus to hda_bus */
+#define to_hda_bus(bus)         container_of(bus, struct hda_bus, core)
+
 /*
  * codec preset
  *
@@ -300,10 +274,8 @@ struct hda_codec {
         unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */
         struct delayed_work jackpoll_work;
 
-#ifdef CONFIG_SND_HDA_INPUT_JACK
         /* jack detection */
         struct snd_array jacks;
-#endif
 
         int depop_delay; /* depop delay in ms, -1 for default delay time */
 
@@ -328,7 +300,10 @@ struct hda_codec {
 /*
  * constructors
  */
-int snd_hda_bus_new(struct snd_card *card, struct hda_bus **busp);
+int snd_hda_bus_new(struct snd_card *card,
+                    const struct hdac_bus_ops *ops,
+                    const struct hdac_io_ops *io_ops,
+                    struct hda_bus **busp);
 int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,
                       unsigned int codec_addr, struct hda_codec **codecp);
 int snd_hda_codec_configure(struct hda_codec *codec);
@@ -367,8 +342,6 @@ int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,
                            hda_nid_t nid, int recursive);
 int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,
                         u8 *dev_list, int max_devices);
-int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
-                                u32 *ratesp, u64 *formatsp, unsigned int *bpsp);
 
 struct hda_verb {
         hda_nid_t nid;
@@ -460,17 +433,17 @@ void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,
                                     int do_now);
 #define snd_hda_codec_cleanup_stream(codec, nid) \
         __snd_hda_codec_cleanup_stream(codec, nid, 0)
-unsigned int snd_hda_calc_stream_format(struct hda_codec *codec,
-                                        unsigned int rate,
-                                        unsigned int channels,
-                                        unsigned int format,
-                                        unsigned int maxbps,
-                                        unsigned short spdif_ctls);
-int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
-                                unsigned int format);
+
+#define snd_hda_query_supported_pcm(codec, nid, ratesp, fmtsp, bpsp) \
+        snd_hdac_query_supported_pcm(&(codec)->core, nid, ratesp, fmtsp, bpsp)
+#define snd_hda_is_supported_format(codec, nid, fmt) \
+        snd_hdac_is_supported_format(&(codec)->core, nid, fmt)
 
 extern const struct snd_pcm_chmap_elem snd_pcm_2_1_chmaps[];
 
+int snd_hda_attach_pcm_stream(struct hda_bus *_bus, struct hda_codec *codec,
+                              struct hda_pcm *cpcm);
+
 /*
  * Misc
  */
@@ -481,6 +454,7 @@ void snd_hda_codec_set_power_to_all(struct hda_codec *codec, hda_nid_t fg,
 int snd_hda_lock_devices(struct hda_bus *bus);
 void snd_hda_unlock_devices(struct hda_bus *bus);
 void snd_hda_bus_reset(struct hda_bus *bus);
+void snd_hda_bus_reset_codecs(struct hda_bus *bus);
 
 /*
  * power management
@@ -526,24 +500,12 @@ int snd_hda_load_patch(struct hda_bus *bus, size_t size, const void *buf);
 #endif
 
 #ifdef CONFIG_SND_HDA_DSP_LOADER
-static inline int
-snd_hda_codec_load_dsp_prepare(struct hda_codec *codec, unsigned int format,
-                                unsigned int size,
-                                struct snd_dma_buffer *bufp)
-{
-        return codec->bus->ops.load_dsp_prepare(codec->bus, format, size, bufp);
-}
-static inline void
-snd_hda_codec_load_dsp_trigger(struct hda_codec *codec, bool start)
-{
-        return codec->bus->ops.load_dsp_trigger(codec->bus, start);
-}
-static inline void
-snd_hda_codec_load_dsp_cleanup(struct hda_codec *codec,
-                                struct snd_dma_buffer *dmab)
-{
-        return codec->bus->ops.load_dsp_cleanup(codec->bus, dmab);
-}
+int snd_hda_codec_load_dsp_prepare(struct hda_codec *codec, unsigned int format,
+                                   unsigned int size,
+                                   struct snd_dma_buffer *bufp);
+void snd_hda_codec_load_dsp_trigger(struct hda_codec *codec, bool start);
+void snd_hda_codec_load_dsp_cleanup(struct hda_codec *codec,
+                                    struct snd_dma_buffer *dmab);
 #else
 static inline int
 snd_hda_codec_load_dsp_prepare(struct hda_codec *codec, unsigned int format,
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 26ce990592a0..944455997fdc 100644
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -32,229 +32,29 @@
 #include "hda_controller.h"
 
 #define CREATE_TRACE_POINTS
-#include "hda_intel_trace.h"
+#include "hda_controller_trace.h"
 
 /* DSP lock helpers */
-#ifdef CONFIG_SND_HDA_DSP_LOADER
-#define dsp_lock_init(dev)      mutex_init(&(dev)->dsp_mutex)
-#define dsp_lock(dev)           mutex_lock(&(dev)->dsp_mutex)
-#define dsp_unlock(dev)         mutex_unlock(&(dev)->dsp_mutex)
-#define dsp_is_locked(dev)      ((dev)->locked)
-#else
-#define dsp_lock_init(dev)      do {} while (0)
-#define dsp_lock(dev)           do {} while (0)
-#define dsp_unlock(dev)         do {} while (0)
-#define dsp_is_locked(dev)      0
-#endif
-
-/*
- * AZX stream operations.
- */
-
-/* start a stream */
-static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)
-{
-        /*
-         * Before stream start, initialize parameter
-         */
-        azx_dev->insufficient = 1;
-
-        /* enable SIE */
-        azx_writel(chip, INTCTL,
-                   azx_readl(chip, INTCTL) | (1 << azx_dev->index));
-        /* set DMA start and interrupt mask */
-        azx_sd_writeb(chip, azx_dev, SD_CTL,
-                      azx_sd_readb(chip, azx_dev, SD_CTL) |
-                      SD_CTL_DMA_START | SD_INT_MASK);
-}
-
-/* stop DMA */
-static void azx_stream_clear(struct azx *chip, struct azx_dev *azx_dev)
-{
-        azx_sd_writeb(chip, azx_dev, SD_CTL,
-                      azx_sd_readb(chip, azx_dev, SD_CTL) &
-                      ~(SD_CTL_DMA_START | SD_INT_MASK));
-        azx_sd_writeb(chip, azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
-}
-
-/* stop a stream */
-void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
-{
-        azx_stream_clear(chip, azx_dev);
-        /* disable SIE */
-        azx_writel(chip, INTCTL,
-                   azx_readl(chip, INTCTL) & ~(1 << azx_dev->index));
-}
-EXPORT_SYMBOL_GPL(azx_stream_stop);
-
-/* reset stream */
-static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
-{
-        unsigned char val;
-        int timeout;
-
-        azx_stream_clear(chip, azx_dev);
-
-        azx_sd_writeb(chip, azx_dev, SD_CTL,
-                      azx_sd_readb(chip, azx_dev, SD_CTL) |
-                      SD_CTL_STREAM_RESET);
-        udelay(3);
-        timeout = 300;
-        while (!((val = azx_sd_readb(chip, azx_dev, SD_CTL)) &
-                 SD_CTL_STREAM_RESET) && --timeout)
-                ;
-        val &= ~SD_CTL_STREAM_RESET;
-        azx_sd_writeb(chip, azx_dev, SD_CTL, val);
-        udelay(3);
-
-        timeout = 300;
-        /* waiting for hardware to report that the stream is out of reset */
-        while (((val = azx_sd_readb(chip, azx_dev, SD_CTL)) &
-                SD_CTL_STREAM_RESET) && --timeout)
-                ;
-
-        /* reset first position - may not be synced with hw at this time */
-        *azx_dev->posbuf = 0;
-}
-
-/*
- * set up the SD for streaming
- */
-static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
-{
-        unsigned int val;
-        /* make sure the run bit is zero for SD */
-        azx_stream_clear(chip, azx_dev);
-        /* program the stream_tag */
-        val = azx_sd_readl(chip, azx_dev, SD_CTL);
-        val = (val & ~SD_CTL_STREAM_TAG_MASK) |
-                (azx_dev->stream_tag << SD_CTL_STREAM_TAG_SHIFT);
-        if (!azx_snoop(chip))
-                val |= SD_CTL_TRAFFIC_PRIO;
-        azx_sd_writel(chip, azx_dev, SD_CTL, val);
-
-        /* program the length of samples in cyclic buffer */
-        azx_sd_writel(chip, azx_dev, SD_CBL, azx_dev->bufsize);
-
-        /* program the stream format */
-        /* this value needs to be the same as the one programmed */
-        azx_sd_writew(chip, azx_dev, SD_FORMAT, azx_dev->format_val);
-
-        /* program the stream LVI (last valid index) of the BDL */
-        azx_sd_writew(chip, azx_dev, SD_LVI, azx_dev->frags - 1);
-
-        /* program the BDL address */
-        /* lower BDL address */
-        azx_sd_writel(chip, azx_dev, SD_BDLPL, (u32)azx_dev->bdl.addr);
-        /* upper BDL address */
-        azx_sd_writel(chip, azx_dev, SD_BDLPU,
-                      upper_32_bits(azx_dev->bdl.addr));
-
-        /* enable the position buffer */
-        if (chip->get_position[0] != azx_get_pos_lpib ||
-            chip->get_position[1] != azx_get_pos_lpib) {
-                if (!(azx_readl(chip, DPLBASE) & AZX_DPLBASE_ENABLE))
-                        azx_writel(chip, DPLBASE,
-                                (u32)chip->posbuf.addr | AZX_DPLBASE_ENABLE);
-        }
-
-        /* set the interrupt enable bits in the descriptor control register */
-        azx_sd_writel(chip, azx_dev, SD_CTL,
-                      azx_sd_readl(chip, azx_dev, SD_CTL) | SD_INT_MASK);
-
-        return 0;
-}
+#define dsp_lock(dev)           snd_hdac_dsp_lock(azx_stream(dev))
+#define dsp_unlock(dev)         snd_hdac_dsp_unlock(azx_stream(dev))
+#define dsp_is_locked(dev)      snd_hdac_stream_is_locked(azx_stream(dev))
 
 /* assign a stream for the PCM */
 static inline struct azx_dev *
 azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream)
 {
-        int dev, i, nums;
-        struct azx_dev *res = NULL;
-        /* make a non-zero unique key for the substream */
-        int key = (substream->pcm->device << 16) | (substream->number << 2) |
-                (substream->stream + 1);
-
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                dev = chip->playback_index_offset;
-                nums = chip->playback_streams;
-        } else {
-                dev = chip->capture_index_offset;
-                nums = chip->capture_streams;
-        }
-        for (i = 0; i < nums; i++, dev++) {
-                struct azx_dev *azx_dev = &chip->azx_dev[dev];
-                dsp_lock(azx_dev);
-                if (!azx_dev->opened && !dsp_is_locked(azx_dev)) {
-                        if (azx_dev->assigned_key == key) {
-                                azx_dev->opened = 1;
-                                azx_dev->assigned_key = key;
-                                dsp_unlock(azx_dev);
-                                return azx_dev;
-                        }
-                        if (!res ||
-                            (chip->driver_caps & AZX_DCAPS_REVERSE_ASSIGN))
-                                res = azx_dev;
-                }
-                dsp_unlock(azx_dev);
-        }
-        if (res) {
-                dsp_lock(res);
-                res->opened = 1;
-                res->assigned_key = key;
-                dsp_unlock(res);
-        }
-        return res;
+        struct hdac_stream *s;
+
+        s = snd_hdac_stream_assign(azx_bus(chip), substream);
+        if (!s)
+                return NULL;
+        return stream_to_azx_dev(s);
 }
 
 /* release the assigned stream */
 static inline void azx_release_device(struct azx_dev *azx_dev)
 {
-        azx_dev->opened = 0;
-}
-
-static cycle_t azx_cc_read(const struct cyclecounter *cc)
-{
-        struct azx_dev *azx_dev = container_of(cc, struct azx_dev, azx_cc);
-        struct snd_pcm_substream *substream = azx_dev->substream;
-        struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
-        struct azx *chip = apcm->chip;
-
-        return azx_readl(chip, WALLCLK);
-}
-
-static void azx_timecounter_init(struct snd_pcm_substream *substream,
-                                bool force, cycle_t last)
-{
-        struct azx_dev *azx_dev = get_azx_dev(substream);
-        struct timecounter *tc = &azx_dev->azx_tc;
-        struct cyclecounter *cc = &azx_dev->azx_cc;
-        u64 nsec;
-
-        cc->read = azx_cc_read;
-        cc->mask = CLOCKSOURCE_MASK(32);
-
-        /*
-         * Converting from 24 MHz to ns means applying a 125/3 factor.
-         * To avoid any saturation issues in intermediate operations,
-         * the 125 factor is applied first. The division is applied
-         * last after reading the timecounter value.
-         * Applying the 1/3 factor as part of the multiplication
-         * requires at least 20 bits for a decent precision, however
-         * overflows occur after about 4 hours or less, not a option.
-         */
-
-        cc->mult = 125; /* saturation after 195 years */
-        cc->shift = 0;
-
-        nsec = 0; /* audio time is elapsed time since trigger */
-        timecounter_init(tc, cc, nsec);
-        if (force)
-                /*
-                 * force timecounter to use predefined value,
-                 * used for synchronized starts
-                 */
-                tc->cycle_last = last;
+        snd_hdac_stream_release(azx_stream(azx_dev));
 }
 
 static inline struct hda_pcm_stream *
@@ -285,119 +85,6 @@ static u64 azx_adjust_codec_delay(struct snd_pcm_substream *substream,
 }
 
 /*
- * set up a BDL entry
- */
-static int setup_bdle(struct azx *chip,
-                      struct snd_dma_buffer *dmab,
-                      struct azx_dev *azx_dev, u32 **bdlp,
-                      int ofs, int size, int with_ioc)
-{
-        u32 *bdl = *bdlp;
-
-        while (size > 0) {
-                dma_addr_t addr;
-                int chunk;
-
-                if (azx_dev->frags >= AZX_MAX_BDL_ENTRIES)
-                        return -EINVAL;
-
-                addr = snd_sgbuf_get_addr(dmab, ofs);
-                /* program the address field of the BDL entry */
-                bdl[0] = cpu_to_le32((u32)addr);
-                bdl[1] = cpu_to_le32(upper_32_bits(addr));
-                /* program the size field of the BDL entry */
-                chunk = snd_sgbuf_get_chunk_size(dmab, ofs, size);
-                /* one BDLE cannot cross 4K boundary on CTHDA chips */
-                if (chip->driver_caps & AZX_DCAPS_4K_BDLE_BOUNDARY) {
-                        u32 remain = 0x1000 - (ofs & 0xfff);
-                        if (chunk > remain)
-                                chunk = remain;
-                }
-                bdl[2] = cpu_to_le32(chunk);
-                /* program the IOC to enable interrupt
-                 * only when the whole fragment is processed
-                 */
-                size -= chunk;
-                bdl[3] = (size || !with_ioc) ? 0 : cpu_to_le32(0x01);
-                bdl += 4;
-                azx_dev->frags++;
-                ofs += chunk;
-        }
-        *bdlp = bdl;
-        return ofs;
-}
-
-/*
- * set up BDL entries
- */
-static int azx_setup_periods(struct azx *chip,
-                             struct snd_pcm_substream *substream,
-                             struct azx_dev *azx_dev)
-{
-        u32 *bdl;
-        int i, ofs, periods, period_bytes;
-        int pos_adj = 0;
-
-        /* reset BDL address */
-        azx_sd_writel(chip, azx_dev, SD_BDLPL, 0);
-        azx_sd_writel(chip, azx_dev, SD_BDLPU, 0);
-
-        period_bytes = azx_dev->period_bytes;
-        periods = azx_dev->bufsize / period_bytes;
-
-        /* program the initial BDL entries */
-        bdl = (u32 *)azx_dev->bdl.area;
-        ofs = 0;
-        azx_dev->frags = 0;
-
-        if (chip->bdl_pos_adj)
-                pos_adj = chip->bdl_pos_adj[chip->dev_index];
-        if (!azx_dev->no_period_wakeup && pos_adj > 0) {
-                struct snd_pcm_runtime *runtime = substream->runtime;
-                int pos_align = pos_adj;
-                pos_adj = (pos_adj * runtime->rate + 47999) / 48000;
-                if (!pos_adj)
-                        pos_adj = pos_align;
-                else
-                        pos_adj = ((pos_adj + pos_align - 1) / pos_align) *
-                                pos_align;
-                pos_adj = frames_to_bytes(runtime, pos_adj);
-                if (pos_adj >= period_bytes) {
-                        dev_warn(chip->card->dev,"Too big adjustment %d\n",
-                                 pos_adj);
-                        pos_adj = 0;
-                } else {
-                        ofs = setup_bdle(chip, snd_pcm_get_dma_buf(substream),
-                                         azx_dev,
-                                         &bdl, ofs, pos_adj, true);
-                        if (ofs < 0)
-                                goto error;
-                }
-        } else
-                pos_adj = 0;
-
-        for (i = 0; i < periods; i++) {
-                if (i == periods - 1 && pos_adj)
-                        ofs = setup_bdle(chip, snd_pcm_get_dma_buf(substream),
-                                         azx_dev, &bdl, ofs,
-                                         period_bytes - pos_adj, 0);
-                else
-                        ofs = setup_bdle(chip, snd_pcm_get_dma_buf(substream),
-                                         azx_dev, &bdl, ofs,
-                                         period_bytes,
-                                         !azx_dev->no_period_wakeup);
-                if (ofs < 0)
-                        goto error;
-        }
-        return 0;
-
- error:
-        dev_err(chip->card->dev, "Too many BDL entries: buffer=%d, period=%d\n",
-                azx_dev->bufsize, period_bytes);
-        return -EINVAL;
-}
-
-/*
  * PCM ops
  */
 
@@ -407,13 +94,9 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
         struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);
         struct azx *chip = apcm->chip;
         struct azx_dev *azx_dev = get_azx_dev(substream);
-        unsigned long flags;
 
+        trace_azx_pcm_close(chip, azx_dev);
         mutex_lock(&chip->open_mutex);
-        spin_lock_irqsave(&chip->reg_lock, flags);
-        azx_dev->substream = NULL;
-        azx_dev->running = 0;
-        spin_unlock_irqrestore(&chip->reg_lock, flags);
         azx_release_device(azx_dev);
         if (hinfo->ops.close)
                 hinfo->ops.close(hinfo, apcm->codec, substream);
@@ -428,18 +111,23 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream,
 {
         struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
         struct azx *chip = apcm->chip;
+        struct azx_dev *azx_dev = get_azx_dev(substream);
         int ret;
 
-        dsp_lock(get_azx_dev(substream));
-        if (dsp_is_locked(get_azx_dev(substream))) {
+        trace_azx_pcm_hw_params(chip, azx_dev);
+        dsp_lock(azx_dev);
+        if (dsp_is_locked(azx_dev)) {
                 ret = -EBUSY;
                 goto unlock;
         }
 
+        azx_dev->core.bufsize = 0;
+        azx_dev->core.period_bytes = 0;
+        azx_dev->core.format_val = 0;
         ret = chip->ops->substream_alloc_pages(chip, substream,
                                           params_buffer_bytes(hw_params));
 unlock:
-        dsp_unlock(get_azx_dev(substream));
+        dsp_unlock(azx_dev);
         return ret;
 }
 
@@ -453,19 +141,13 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
 
         /* reset BDL address */
         dsp_lock(azx_dev);
-        if (!dsp_is_locked(azx_dev)) {
-                azx_sd_writel(chip, azx_dev, SD_BDLPL, 0);
-                azx_sd_writel(chip, azx_dev, SD_BDLPU, 0);
-                azx_sd_writel(chip, azx_dev, SD_CTL, 0);
-                azx_dev->bufsize = 0;
-                azx_dev->period_bytes = 0;
-                azx_dev->format_val = 0;
-        }
+        if (!dsp_is_locked(azx_dev))
+                snd_hdac_stream_cleanup(azx_stream(azx_dev));
 
         snd_hda_codec_cleanup(apcm->codec, hinfo, substream);
 
         err = chip->ops->substream_free_pages(chip, substream);
-        azx_dev->prepared = 0;
+        azx_stream(azx_dev)->prepared = 0;
         dsp_unlock(azx_dev);
         return err;
 }
@@ -477,21 +159,21 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
         struct azx_dev *azx_dev = get_azx_dev(substream);
         struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
-        unsigned int bufsize, period_bytes, format_val, stream_tag;
+        unsigned int format_val, stream_tag;
         int err;
         struct hda_spdif_out *spdif =
                 snd_hda_spdif_out_of_nid(apcm->codec, hinfo->nid);
         unsigned short ctls = spdif ? spdif->ctls : 0;
 
+        trace_azx_pcm_prepare(chip, azx_dev);
         dsp_lock(azx_dev);
         if (dsp_is_locked(azx_dev)) {
                 err = -EBUSY;
                 goto unlock;
         }
 
-        azx_stream_reset(chip, azx_dev);
-        format_val = snd_hda_calc_stream_format(apcm->codec,
-                                                runtime->rate,
+        snd_hdac_stream_reset(azx_stream(azx_dev));
+        format_val = snd_hdac_calc_stream_format(runtime->rate,
                                                 runtime->channels,
                                                 runtime->format,
                                                 hinfo->maxbps,
@@ -504,55 +186,23 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
                 goto unlock;
         }
 
-        bufsize = snd_pcm_lib_buffer_bytes(substream);
-        period_bytes = snd_pcm_lib_period_bytes(substream);
-
-        dev_dbg(chip->card->dev, "azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",
-                bufsize, format_val);
-
-        if (bufsize != azx_dev->bufsize ||
-            period_bytes != azx_dev->period_bytes ||
-            format_val != azx_dev->format_val ||
-            runtime->no_period_wakeup != azx_dev->no_period_wakeup) {
-                azx_dev->bufsize = bufsize;
-                azx_dev->period_bytes = period_bytes;
-                azx_dev->format_val = format_val;
-                azx_dev->no_period_wakeup = runtime->no_period_wakeup;
-                err = azx_setup_periods(chip, substream, azx_dev);
-                if (err < 0)
-                        goto unlock;
-        }
+        err = snd_hdac_stream_set_params(azx_stream(azx_dev), format_val);
+        if (err < 0)
+                goto unlock;
 
-        /* when LPIB delay correction gives a small negative value,
-         * we ignore it; currently set the threshold statically to
-         * 64 frames
-         */
-        if (runtime->period_size > 64)
-                azx_dev->delay_negative_threshold = -frames_to_bytes(runtime, 64);
-        else
-                azx_dev->delay_negative_threshold = 0;
-
-        /* wallclk has 24Mhz clock source */
-        azx_dev->period_wallclk = (((runtime->period_size * 24000) /
-                                                runtime->rate) * 1000);
-        azx_setup_controller(chip, azx_dev);
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                azx_dev->fifo_size =
-                        azx_sd_readw(chip, azx_dev, SD_FIFOSIZE) + 1;
-        else
-                azx_dev->fifo_size = 0;
+        snd_hdac_stream_setup(azx_stream(azx_dev));
 
-        stream_tag = azx_dev->stream_tag;
+        stream_tag = azx_dev->core.stream_tag;
         /* CA-IBG chips need the playback stream starting from 1 */
         if ((chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND) &&
             stream_tag > chip->capture_streams)
                 stream_tag -= chip->capture_streams;
         err = snd_hda_codec_prepare(apcm->codec, hinfo, stream_tag,
-                                     azx_dev->format_val, substream);
+                                     azx_dev->core.format_val, substream);
 
  unlock:
         if (!err)
-                azx_dev->prepared = 1;
+                azx_stream(azx_dev)->prepared = 1;
         dsp_unlock(azx_dev);
         return err;
 }
@@ -561,28 +211,36 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
         struct azx *chip = apcm->chip;
+        struct hdac_bus *bus = azx_bus(chip);
         struct azx_dev *azx_dev;
         struct snd_pcm_substream *s;
-        int rstart = 0, start, nsync = 0, sbits = 0;
-        int nwait, timeout;
+        struct hdac_stream *hstr;
+        bool start;
+        int sbits = 0;
+        int sync_reg;
 
         azx_dev = get_azx_dev(substream);
         trace_azx_pcm_trigger(chip, azx_dev, cmd);
 
-        if (dsp_is_locked(azx_dev) || !azx_dev->prepared)
+        hstr = azx_stream(azx_dev);
+        if (chip->driver_caps & AZX_DCAPS_OLD_SSYNC)
+                sync_reg = AZX_REG_OLD_SSYNC;
+        else
+                sync_reg = AZX_REG_SSYNC;
+
+        if (dsp_is_locked(azx_dev) || !hstr->prepared)
                 return -EPIPE;
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
-                rstart = 1;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
         case SNDRV_PCM_TRIGGER_RESUME:
-                start = 1;
+                start = true;
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_STOP:
-                start = 0;
+                start = false;
                 break;
         default:
                 return -EINVAL;
@@ -592,115 +250,55 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 if (s->pcm->card != substream->pcm->card)
                         continue;
                 azx_dev = get_azx_dev(s);
-                sbits |= 1 << azx_dev->index;
-                nsync++;
+                sbits |= 1 << azx_dev->core.index;
                 snd_pcm_trigger_done(s, substream);
         }
 
-        spin_lock(&chip->reg_lock);
+        spin_lock(&bus->reg_lock);
 
         /* first, set SYNC bits of corresponding streams */
-        if (chip->driver_caps & AZX_DCAPS_OLD_SSYNC)
-                azx_writel(chip, OLD_SSYNC,
-                        azx_readl(chip, OLD_SSYNC) | sbits);
-        else
-                azx_writel(chip, SSYNC, azx_readl(chip, SSYNC) | sbits);
+        snd_hdac_stream_sync_trigger(hstr, true, sbits, sync_reg);
 
         snd_pcm_group_for_each_entry(s, substream) {
                 if (s->pcm->card != substream->pcm->card)
                         continue;
                 azx_dev = get_azx_dev(s);
                 if (start) {
-                        azx_dev->start_wallclk = azx_readl(chip, WALLCLK);
-                        if (!rstart)
-                                azx_dev->start_wallclk -=
-                                                azx_dev->period_wallclk;
-                        azx_stream_start(chip, azx_dev);
+                        azx_dev->insufficient = 1;
+                        snd_hdac_stream_start(azx_stream(azx_dev), true);
                 } else {
-                        azx_stream_stop(chip, azx_dev);
-                }
-                azx_dev->running = start;
-        }
-        spin_unlock(&chip->reg_lock);
-        if (start) {
-                /* wait until all FIFOs get ready */
-                for (timeout = 5000; timeout; timeout--) {
-                        nwait = 0;
-                        snd_pcm_group_for_each_entry(s, substream) {
-                                if (s->pcm->card != substream->pcm->card)
-                                        continue;
-                                azx_dev = get_azx_dev(s);
-                                if (!(azx_sd_readb(chip, azx_dev, SD_STS) &
-                                      SD_STS_FIFO_READY))
-                                        nwait++;
-                        }
-                        if (!nwait)
-                                break;
-                        cpu_relax();
-                }
-        } else {
-                /* wait until all RUN bits are cleared */
-                for (timeout = 5000; timeout; timeout--) {
-                        nwait = 0;
-                        snd_pcm_group_for_each_entry(s, substream) {
-                                if (s->pcm->card != substream->pcm->card)
-                                        continue;
-                                azx_dev = get_azx_dev(s);
-                                if (azx_sd_readb(chip, azx_dev, SD_CTL) &
-                                    SD_CTL_DMA_START)
-                                        nwait++;
-                        }
-                        if (!nwait)
-                                break;
-                        cpu_relax();
+                        snd_hdac_stream_stop(azx_stream(azx_dev));
                 }
         }
-        spin_lock(&chip->reg_lock);
+        spin_unlock(&bus->reg_lock);
+
+        snd_hdac_stream_sync(hstr, start, sbits);
+
+        spin_lock(&bus->reg_lock);
         /* reset SYNC bits */
-        if (chip->driver_caps & AZX_DCAPS_OLD_SSYNC)
-                azx_writel(chip, OLD_SSYNC,
-                        azx_readl(chip, OLD_SSYNC) & ~sbits);
-        else
-                azx_writel(chip, SSYNC, azx_readl(chip, SSYNC) & ~sbits);
-        if (start) {
-                azx_timecounter_init(substream, 0, 0);
-                snd_pcm_gettime(substream->runtime, &substream->runtime->trigger_tstamp);
-                substream->runtime->trigger_tstamp_latched = true;
-
-                if (nsync > 1) {
-                        cycle_t cycle_last;
-
-                        /* same start cycle for master and group */
-                        azx_dev = get_azx_dev(substream);
-                        cycle_last = azx_dev->azx_tc.cycle_last;
-
-                        snd_pcm_group_for_each_entry(s, substream) {
-                                if (s->pcm->card != substream->pcm->card)
-                                        continue;
-                                azx_timecounter_init(s, 1, cycle_last);
-                        }
-                }
-        }
-        spin_unlock(&chip->reg_lock);
+        snd_hdac_stream_sync_trigger(hstr, false, sbits, sync_reg);
+        if (start)
+                snd_hdac_stream_timecounter_init(hstr, sbits);
+        spin_unlock(&bus->reg_lock);
         return 0;
 }
 
 unsigned int azx_get_pos_lpib(struct azx *chip, struct azx_dev *azx_dev)
 {
-        return azx_sd_readl(chip, azx_dev, SD_LPIB);
+        return snd_hdac_stream_get_pos_lpib(azx_stream(azx_dev));
 }
 EXPORT_SYMBOL_GPL(azx_get_pos_lpib);
 
 unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev)
 {
-        return le32_to_cpu(*azx_dev->posbuf);
+        return snd_hdac_stream_get_pos_posbuf(azx_stream(azx_dev));
 }
 EXPORT_SYMBOL_GPL(azx_get_pos_posbuf);
 
 unsigned int azx_get_position(struct azx *chip,
                               struct azx_dev *azx_dev)
 {
-        struct snd_pcm_substream *substream = azx_dev->substream;
+        struct snd_pcm_substream *substream = azx_dev->core.substream;
         unsigned int pos;
         int stream = substream->stream;
         int delay = 0;
@@ -710,7 +308,7 @@ unsigned int azx_get_position(struct azx *chip,
         else /* use the position buffer as default */
                 pos = azx_get_pos_posbuf(chip, azx_dev);
 
-        if (pos >= azx_dev->bufsize)
+        if (pos >= azx_dev->core.bufsize)
                 pos = 0;
 
         if (substream->runtime) {
@@ -752,7 +350,7 @@ static int azx_get_time_info(struct snd_pcm_substream *substream,
 
                 snd_pcm_gettime(substream->runtime, system_ts);
 
-                nsec = timecounter_read(&azx_dev->azx_tc);
+                nsec = timecounter_read(&azx_dev->core.tc);
                 nsec = div_u64(nsec, 3); /* can be optimized */
                 if (audio_tstamp_config->report_delay)
                         nsec = azx_adjust_codec_delay(substream, nsec);
@@ -802,17 +400,18 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         struct azx *chip = apcm->chip;
         struct azx_dev *azx_dev;
         struct snd_pcm_runtime *runtime = substream->runtime;
-        unsigned long flags;
         int err;
         int buff_step;
 
         snd_hda_codec_pcm_get(apcm->info);
         mutex_lock(&chip->open_mutex);
         azx_dev = azx_assign_device(chip, substream);
+        trace_azx_pcm_open(chip, azx_dev);
         if (azx_dev == NULL) {
                 err = -EBUSY;
                 goto unlock;
         }
+        runtime->private_data = azx_dev;
         runtime->hw = azx_pcm_hw;
         runtime->hw.channels_min = hinfo->channels_min;
         runtime->hw.channels_max = hinfo->channels_max;
@@ -874,12 +473,6 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
                 runtime->hw.info &= ~SNDRV_PCM_INFO_HAS_LINK_ATIME;
         }
 
-        spin_lock_irqsave(&chip->reg_lock, flags);
-        azx_dev->substream = substream;
-        azx_dev->running = 0;
-        spin_unlock_irqrestore(&chip->reg_lock, flags);
-
-        runtime->private_data = azx_dev;
         snd_pcm_set_sync(substream);
         mutex_unlock(&chip->open_mutex);
         return 0;
@@ -928,10 +521,11 @@ static void azx_pcm_free(struct snd_pcm *pcm)
 
 #define MAX_PREALLOC_SIZE       (32 * 1024 * 1024)
 
-static int azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
-                                 struct hda_pcm *cpcm)
+int snd_hda_attach_pcm_stream(struct hda_bus *_bus, struct hda_codec *codec,
+                              struct hda_pcm *cpcm)
 {
-        struct azx *chip = bus->private_data;
+        struct hdac_bus *bus = &_bus->core;
+        struct azx *chip = bus_to_azx(bus);
         struct snd_pcm *pcm;
         struct azx_pcm *apcm;
         int pcm_dev = cpcm->device;
@@ -979,89 +573,6 @@ static int azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
         return 0;
 }
 
-/*
- * CORB / RIRB interface
- */
-static int azx_alloc_cmd_io(struct azx *chip)
-{
-        /* single page (at least 4096 bytes) must suffice for both ringbuffes */
-        return chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
-                                          PAGE_SIZE, &chip->rb);
-}
-
-static void azx_init_cmd_io(struct azx *chip)
-{
-        int timeout;
-
-        spin_lock_irq(&chip->reg_lock);
-        /* CORB set up */
-        chip->corb.addr = chip->rb.addr;
-        chip->corb.buf = (u32 *)chip->rb.area;
-        azx_writel(chip, CORBLBASE, (u32)chip->corb.addr);
-        azx_writel(chip, CORBUBASE, upper_32_bits(chip->corb.addr));
-
-        /* set the corb size to 256 entries (ULI requires explicitly) */
-        azx_writeb(chip, CORBSIZE, 0x02);
-        /* set the corb write pointer to 0 */
-        azx_writew(chip, CORBWP, 0);
-
-        /* reset the corb hw read pointer */
-        azx_writew(chip, CORBRP, AZX_CORBRP_RST);
-        if (!(chip->driver_caps & AZX_DCAPS_CORBRP_SELF_CLEAR)) {
-                for (timeout = 1000; timeout > 0; timeout--) {
-                        if ((azx_readw(chip, CORBRP) & AZX_CORBRP_RST) == AZX_CORBRP_RST)
-                                break;
-                        udelay(1);
-                }
-                if (timeout <= 0)
-                        dev_err(chip->card->dev, "CORB reset timeout#1, CORBRP = %d\n",
-                                azx_readw(chip, CORBRP));
-
-                azx_writew(chip, CORBRP, 0);
-                for (timeout = 1000; timeout > 0; timeout--) {
-                        if (azx_readw(chip, CORBRP) == 0)
-                                break;
-                        udelay(1);
-                }
-                if (timeout <= 0)
-                        dev_err(chip->card->dev, "CORB reset timeout#2, CORBRP = %d\n",
-                                azx_readw(chip, CORBRP));
-        }
-
-        /* enable corb dma */
-        azx_writeb(chip, CORBCTL, AZX_CORBCTL_RUN);
-
-        /* RIRB set up */
-        chip->rirb.addr = chip->rb.addr + 2048;
-        chip->rirb.buf = (u32 *)(chip->rb.area + 2048);
-        chip->rirb.wp = chip->rirb.rp = 0;
-        memset(chip->rirb.cmds, 0, sizeof(chip->rirb.cmds));
-        azx_writel(chip, RIRBLBASE, (u32)chip->rirb.addr);
-        azx_writel(chip, RIRBUBASE, upper_32_bits(chip->rirb.addr));
-
-        /* set the rirb size to 256 entries (ULI requires explicitly) */
-        azx_writeb(chip, RIRBSIZE, 0x02);
-        /* reset the rirb hw write pointer */
-        azx_writew(chip, RIRBWP, AZX_RIRBWP_RST);
-        /* set N=1, get RIRB response interrupt for new entry */
-        if (chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND)
-                azx_writew(chip, RINTCNT, 0xc0);
-        else
-                azx_writew(chip, RINTCNT, 1);
-        /* enable rirb dma and response irq */
-        azx_writeb(chip, RIRBCTL, AZX_RBCTL_DMA_EN | AZX_RBCTL_IRQ_EN);
-        spin_unlock_irq(&chip->reg_lock);
-}
-
-static void azx_free_cmd_io(struct azx *chip)
-{
-        spin_lock_irq(&chip->reg_lock);
-        /* disable ringbuffer DMAs */
-        azx_writeb(chip, RIRBCTL, 0);
-        azx_writeb(chip, CORBCTL, 0);
-        spin_unlock_irq(&chip->reg_lock);
-}
-
 static unsigned int azx_command_addr(u32 cmd)
 {
         unsigned int addr = cmd >> 28;
@@ -1074,92 +585,12 @@ static unsigned int azx_command_addr(u32 cmd)
         return addr;
 }
 
-/* send a command */
-static int azx_corb_send_cmd(struct hda_bus *bus, u32 val)
-{
-        struct azx *chip = bus->private_data;
-        unsigned int addr = azx_command_addr(val);
-        unsigned int wp, rp;
-
-        spin_lock_irq(&chip->reg_lock);
-
-        /* add command to corb */
-        wp = azx_readw(chip, CORBWP);
-        if (wp == 0xffff) {
-                /* something wrong, controller likely turned to D3 */
-                spin_unlock_irq(&chip->reg_lock);
-                return -EIO;
-        }
-        wp++;
-        wp %= AZX_MAX_CORB_ENTRIES;
-
-        rp = azx_readw(chip, CORBRP);
-        if (wp == rp) {
-                /* oops, it's full */
-                spin_unlock_irq(&chip->reg_lock);
-                return -EAGAIN;
-        }
-
-        chip->rirb.cmds[addr]++;
-        chip->corb.buf[wp] = cpu_to_le32(val);
-        azx_writew(chip, CORBWP, wp);
-
-        spin_unlock_irq(&chip->reg_lock);
-
-        return 0;
-}
-
-#define AZX_RIRB_EX_UNSOL_EV    (1<<4)
-
-/* retrieve RIRB entry - called from interrupt handler */
-static void azx_update_rirb(struct azx *chip)
-{
-        unsigned int rp, wp;
-        unsigned int addr;
-        u32 res, res_ex;
-
-        wp = azx_readw(chip, RIRBWP);
-        if (wp == 0xffff) {
-                /* something wrong, controller likely turned to D3 */
-                return;
-        }
-
-        if (wp == chip->rirb.wp)
-                return;
-        chip->rirb.wp = wp;
-
-        while (chip->rirb.rp != wp) {
-                chip->rirb.rp++;
-                chip->rirb.rp %= AZX_MAX_RIRB_ENTRIES;
-
-                rp = chip->rirb.rp << 1; /* an RIRB entry is 8-bytes */
-                res_ex = le32_to_cpu(chip->rirb.buf[rp + 1]);
-                res = le32_to_cpu(chip->rirb.buf[rp]);
-                addr = res_ex & 0xf;
-                if ((addr >= AZX_MAX_CODECS) || !(chip->codec_mask & (1 << addr))) {
-                        dev_err(chip->card->dev, "spurious response %#x:%#x, rp = %d, wp = %d",
-                                res, res_ex,
-                                chip->rirb.rp, wp);
-                        snd_BUG();
-                } else if (res_ex & AZX_RIRB_EX_UNSOL_EV)
-                        snd_hda_queue_unsol_event(chip->bus, res, res_ex);
-                else if (chip->rirb.cmds[addr]) {
-                        chip->rirb.res[addr] = res;
-                        smp_wmb();
-                        chip->rirb.cmds[addr]--;
-                } else if (printk_ratelimit()) {
-                        dev_err(chip->card->dev, "spurious response %#x:%#x, last cmd=%#08x\n",
-                                res, res_ex,
-                                chip->last_cmd[addr]);
-                }
-        }
-}
-
 /* receive a response */
-static unsigned int azx_rirb_get_response(struct hda_bus *bus,
-                                          unsigned int addr)
+static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr,
+                                 unsigned int *res)
 {
-        struct azx *chip = bus->private_data;
+        struct azx *chip = bus_to_azx(bus);
+        struct hda_bus *hbus = &chip->bus;
         unsigned long timeout;
         unsigned long loopcounter;
         int do_poll = 0;
@@ -1168,22 +599,21 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
         timeout = jiffies + msecs_to_jiffies(1000);
 
         for (loopcounter = 0;; loopcounter++) {
-                if (chip->polling_mode || do_poll) {
-                        spin_lock_irq(&chip->reg_lock);
-                        azx_update_rirb(chip);
-                        spin_unlock_irq(&chip->reg_lock);
-                }
-                if (!chip->rirb.cmds[addr]) {
-                        smp_rmb();
-                        bus->rirb_error = 0;
-
+                spin_lock_irq(&bus->reg_lock);
+                if (chip->polling_mode || do_poll)
+                        snd_hdac_bus_update_rirb(bus);
+                if (!bus->rirb.cmds[addr]) {
                         if (!do_poll)
                                 chip->poll_count = 0;
-                        return chip->rirb.res[addr]; /* the last value */
+                        if (res)
+                                *res = bus->rirb.res[addr]; /* the last value */
+                        spin_unlock_irq(&bus->reg_lock);
+                        return 0;
                 }
+                spin_unlock_irq(&bus->reg_lock);
                 if (time_after(jiffies, timeout))
                         break;
-                if (bus->needs_damn_long_delay || loopcounter > 3000)
+                if (hbus->needs_damn_long_delay || loopcounter > 3000)
                         msleep(2); /* temporary workaround */
                 else {
                         udelay(10);
@@ -1191,13 +621,13 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
                 }
         }
 
-        if (bus->no_response_fallback)
-                return -1;
+        if (hbus->no_response_fallback)
+                return -EIO;
 
         if (!chip->polling_mode && chip->poll_count < 2) {
                 dev_dbg(chip->card->dev,
                         "azx_get_response timeout, polling the codec once: last cmd=0x%08x\n",
-                        chip->last_cmd[addr]);
+                        bus->last_cmd[addr]);
                 do_poll = 1;
                 chip->poll_count++;
                 goto again;
@@ -1207,7 +637,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
         if (!chip->polling_mode) {
                 dev_warn(chip->card->dev,
                          "azx_get_response timeout, switching to polling mode: last cmd=0x%08x\n",
-                         chip->last_cmd[addr]);
+                         bus->last_cmd[addr]);
                 chip->polling_mode = 1;
                 goto again;
         }
@@ -1215,12 +645,10 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
         if (chip->msi) {
                 dev_warn(chip->card->dev,
                          "No response from codec, disabling MSI: last cmd=0x%08x\n",
-                         chip->last_cmd[addr]);
-                if (chip->ops->disable_msi_reset_irq(chip) &&
-                    chip->ops->disable_msi_reset_irq(chip) < 0) {
-                        bus->rirb_error = 1;
-                        return -1;
-                }
+                         bus->last_cmd[addr]);
+                if (chip->ops->disable_msi_reset_irq &&
+                    chip->ops->disable_msi_reset_irq(chip) < 0)
+                        return -EIO;
                 goto again;
         }
 
@@ -1229,28 +657,24 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
                  * phase, this is likely an access to a non-existing codec
                  * slot.  Better to return an error and reset the system.
                  */
-                return -1;
+                return -EIO;
         }
 
         /* a fatal communication error; need either to reset or to fallback
          * to the single_cmd mode
          */
-        bus->rirb_error = 1;
-        if (bus->allow_bus_reset && !bus->response_reset && !bus->in_reset) {
-                bus->response_reset = 1;
-                return -1; /* give a chance to retry */
+        if (hbus->allow_bus_reset && !hbus->response_reset && !hbus->in_reset) {
+                hbus->response_reset = 1;
+                return -EAGAIN; /* give a chance to retry */
         }
 
         dev_err(chip->card->dev,
                 "azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n",
-                chip->last_cmd[addr]);
+                bus->last_cmd[addr]);
         chip->single_cmd = 1;
-        bus->response_reset = 0;
-        /* release CORB/RIRB */
-        azx_free_cmd_io(chip);
-        /* disable unsolicited responses */
-        azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~AZX_GCTL_UNSOL);
-        return -1;
+        hbus->response_reset = 0;
+        snd_hdac_bus_stop_cmd_io(bus);
+        return -EIO;
 }
 
 /*
@@ -1272,7 +696,7 @@ static int azx_single_wait_for_response(struct azx *chip, unsigned int addr)
                 /* check IRV busy bit */
                 if (azx_readw(chip, IRS) & AZX_IRS_VALID) {
                         /* reuse rirb.res as the response return value */
-                        chip->rirb.res[addr] = azx_readl(chip, IR);
+                        azx_bus(chip)->rirb.res[addr] = azx_readl(chip, IR);
                         return 0;
                 }
                 udelay(1);
@@ -1280,18 +704,18 @@ static int azx_single_wait_for_response(struct azx *chip, unsigned int addr)
         if (printk_ratelimit())
                 dev_dbg(chip->card->dev, "get_response timeout: IRS=0x%x\n",
                         azx_readw(chip, IRS));
-        chip->rirb.res[addr] = -1;
+        azx_bus(chip)->rirb.res[addr] = -1;
         return -EIO;
 }
 
 /* send a command */
-static int azx_single_send_cmd(struct hda_bus *bus, u32 val)
+static int azx_single_send_cmd(struct hdac_bus *bus, u32 val)
 {
-        struct azx *chip = bus->private_data;
+        struct azx *chip = bus_to_azx(bus);
         unsigned int addr = azx_command_addr(val);
         int timeout = 50;
 
-        bus->rirb_error = 0;
+        bus->last_cmd[azx_command_addr(val)] = val;
         while (timeout--) {
                 /* check ICB busy bit */
                 if (!((azx_readw(chip, IRS) & AZX_IRS_BUSY))) {
@@ -1313,11 +737,12 @@ static int azx_single_send_cmd(struct hda_bus *bus, u32 val)
 }
 
 /* receive a response */
-static unsigned int azx_single_get_response(struct hda_bus *bus,
-                                            unsigned int addr)
+static int azx_single_get_response(struct hdac_bus *bus, unsigned int addr,
+                                   unsigned int *res)
 {
-        struct azx *chip = bus->private_data;
-        return chip->rirb.res[addr];
+        if (res)
+                *res = bus->rirb.res[addr];
+        return 0;
 }
 
 /*
@@ -1328,32 +753,48 @@ static unsigned int azx_single_get_response(struct hda_bus *bus,
  */
 
 /* send a command */
-static int azx_send_cmd(struct hda_bus *bus, unsigned int val)
+static int azx_send_cmd(struct hdac_bus *bus, unsigned int val)
 {
-        struct azx *chip = bus->private_data;
+        struct azx *chip = bus_to_azx(bus);
 
         if (chip->disabled)
                 return 0;
-        chip->last_cmd[azx_command_addr(val)] = val;
         if (chip->single_cmd)
                 return azx_single_send_cmd(bus, val);
         else
-                return azx_corb_send_cmd(bus, val);
+                return snd_hdac_bus_send_cmd(bus, val);
 }
 
 /* get a response */
-static unsigned int azx_get_response(struct hda_bus *bus,
-                                     unsigned int addr)
+static int azx_get_response(struct hdac_bus *bus, unsigned int addr,
+                            unsigned int *res)
 {
-        struct azx *chip = bus->private_data;
+        struct azx *chip = bus_to_azx(bus);
+
         if (chip->disabled)
                 return 0;
         if (chip->single_cmd)
-                return azx_single_get_response(bus, addr);
+                return azx_single_get_response(bus, addr, res);
+        else
+                return azx_rirb_get_response(bus, addr, res);
+}
+
+static int azx_link_power(struct hdac_bus *bus, bool enable)
+{
+        struct azx *chip = bus_to_azx(bus);
+
+        if (chip->ops->link_power)
+                return chip->ops->link_power(chip, enable);
         else
-                return azx_rirb_get_response(bus, addr);
+                return -EINVAL;
 }
 
+static const struct hdac_bus_ops bus_core_ops = {
+        .command = azx_send_cmd,
+        .get_response = azx_get_response,
+        .link_power = azx_link_power,
+};
+
 #ifdef CONFIG_SND_HDA_DSP_LOADER
 /*
  * DSP loading code (e.g. for CA0132)
@@ -1363,339 +804,132 @@ static unsigned int azx_get_response(struct hda_bus *bus,
 static struct azx_dev *
 azx_get_dsp_loader_dev(struct azx *chip)
 {
-        return &chip->azx_dev[chip->playback_index_offset];
+        struct hdac_bus *bus = azx_bus(chip);
+        struct hdac_stream *s;
+
+        list_for_each_entry(s, &bus->stream_list, list)
+                if (s->index == chip->playback_index_offset)
+                        return stream_to_azx_dev(s);
+
+        return NULL;
 }
 
-static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format,
-                                unsigned int byte_size,
-                                struct snd_dma_buffer *bufp)
+int snd_hda_codec_load_dsp_prepare(struct hda_codec *codec, unsigned int format,
+                                   unsigned int byte_size,
+                                   struct snd_dma_buffer *bufp)
 {
-        u32 *bdl;
-        struct azx *chip = bus->private_data;
+        struct hdac_bus *bus = &codec->bus->core;
+        struct azx *chip = bus_to_azx(bus);
         struct azx_dev *azx_dev;
+        struct hdac_stream *hstr;
+        bool saved = false;
         int err;
 
         azx_dev = azx_get_dsp_loader_dev(chip);
-
-        dsp_lock(azx_dev);
-        spin_lock_irq(&chip->reg_lock);
-        if (azx_dev->running || azx_dev->locked) {
-                spin_unlock_irq(&chip->reg_lock);
-                err = -EBUSY;
-                goto unlock;
+        hstr = azx_stream(azx_dev);
+        spin_lock_irq(&bus->reg_lock);
+        if (hstr->opened) {
+                chip->saved_azx_dev = *azx_dev;
+                saved = true;
         }
-        azx_dev->prepared = 0;
-        chip->saved_azx_dev = *azx_dev;
-        azx_dev->locked = 1;
-        spin_unlock_irq(&chip->reg_lock);
-
-        err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV_SG,
-                                         byte_size, bufp);
-        if (err < 0)
-                goto err_alloc;
+        spin_unlock_irq(&bus->reg_lock);
 
-        azx_dev->bufsize = byte_size;
-        azx_dev->period_bytes = byte_size;
-        azx_dev->format_val = format;
-
-        azx_stream_reset(chip, azx_dev);
-
-        /* reset BDL address */
-        azx_sd_writel(chip, azx_dev, SD_BDLPL, 0);
-        azx_sd_writel(chip, azx_dev, SD_BDLPU, 0);
-
-        azx_dev->frags = 0;
-        bdl = (u32 *)azx_dev->bdl.area;
-        err = setup_bdle(chip, bufp, azx_dev, &bdl, 0, byte_size, 0);
-        if (err < 0)
-                goto error;
-
-        azx_setup_controller(chip, azx_dev);
-        dsp_unlock(azx_dev);
-        return azx_dev->stream_tag;
+        err = snd_hdac_dsp_prepare(hstr, format, byte_size, bufp);
+        if (err < 0) {
+                spin_lock_irq(&bus->reg_lock);
+                if (saved)
+                        *azx_dev = chip->saved_azx_dev;
+                spin_unlock_irq(&bus->reg_lock);
+                return err;
+        }
 
- error:
-        chip->ops->dma_free_pages(chip, bufp);
- err_alloc:
-        spin_lock_irq(&chip->reg_lock);
-        if (azx_dev->opened)
-                *azx_dev = chip->saved_azx_dev;
-        azx_dev->locked = 0;
-        spin_unlock_irq(&chip->reg_lock);
- unlock:
-        dsp_unlock(azx_dev);
+        hstr->prepared = 0;
         return err;
 }
+EXPORT_SYMBOL_GPL(snd_hda_codec_load_dsp_prepare);
 
-static void azx_load_dsp_trigger(struct hda_bus *bus, bool start)
+void snd_hda_codec_load_dsp_trigger(struct hda_codec *codec, bool start)
 {
-        struct azx *chip = bus->private_data;
+        struct hdac_bus *bus = &codec->bus->core;
+        struct azx *chip = bus_to_azx(bus);
         struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip);
 
-        if (start)
-                azx_stream_start(chip, azx_dev);
-        else
-                azx_stream_stop(chip, azx_dev);
-        azx_dev->running = start;
+        snd_hdac_dsp_trigger(azx_stream(azx_dev), start);
 }
+EXPORT_SYMBOL_GPL(snd_hda_codec_load_dsp_trigger);
 
-static void azx_load_dsp_cleanup(struct hda_bus *bus,
-                                 struct snd_dma_buffer *dmab)
+void snd_hda_codec_load_dsp_cleanup(struct hda_codec *codec,
+                                    struct snd_dma_buffer *dmab)
 {
-        struct azx *chip = bus->private_data;
+        struct hdac_bus *bus = &codec->bus->core;
+        struct azx *chip = bus_to_azx(bus);
         struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip);
+        struct hdac_stream *hstr = azx_stream(azx_dev);
 
-        if (!dmab->area || !azx_dev->locked)
+        if (!dmab->area || !hstr->locked)
                 return;
 
-        dsp_lock(azx_dev);
-        /* reset BDL address */
-        azx_sd_writel(chip, azx_dev, SD_BDLPL, 0);
-        azx_sd_writel(chip, azx_dev, SD_BDLPU, 0);
-        azx_sd_writel(chip, azx_dev, SD_CTL, 0);
-        azx_dev->bufsize = 0;
-        azx_dev->period_bytes = 0;
-        azx_dev->format_val = 0;
-
-        chip->ops->dma_free_pages(chip, dmab);
-        dmab->area = NULL;
-
-        spin_lock_irq(&chip->reg_lock);
-        if (azx_dev->opened)
+        snd_hdac_dsp_cleanup(hstr, dmab);
+        spin_lock_irq(&bus->reg_lock);
+        if (hstr->opened)
                 *azx_dev = chip->saved_azx_dev;
-        azx_dev->locked = 0;
-        spin_unlock_irq(&chip->reg_lock);
-        dsp_unlock(azx_dev);
+        hstr->locked = false;
+        spin_unlock_irq(&bus->reg_lock);
 }
+EXPORT_SYMBOL_GPL(snd_hda_codec_load_dsp_cleanup);
 #endif /* CONFIG_SND_HDA_DSP_LOADER */
 
-int azx_alloc_stream_pages(struct azx *chip)
-{
-        int i, err;
-
-        for (i = 0; i < chip->num_streams; i++) {
-                dsp_lock_init(&chip->azx_dev[i]);
-                /* allocate memory for the BDL for each stream */
-                err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
-                                                 BDL_SIZE,
-                                                 &chip->azx_dev[i].bdl);
-                if (err < 0)
-                        return -ENOMEM;
-        }
-        /* allocate memory for the position buffer */
-        err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
-                                         chip->num_streams * 8, &chip->posbuf);
-        if (err < 0)
-                return -ENOMEM;
-
-        /* allocate CORB/RIRB */
-        err = azx_alloc_cmd_io(chip);
-        if (err < 0)
-                return err;
-        return 0;
-}
-EXPORT_SYMBOL_GPL(azx_alloc_stream_pages);
-
-void azx_free_stream_pages(struct azx *chip)
-{
-        int i;
-        if (chip->azx_dev) {
-                for (i = 0; i < chip->num_streams; i++)
-                        if (chip->azx_dev[i].bdl.area)
-                                chip->ops->dma_free_pages(
-                                        chip, &chip->azx_dev[i].bdl);
-        }
-        if (chip->rb.area)
-                chip->ops->dma_free_pages(chip, &chip->rb);
-        if (chip->posbuf.area)
-                chip->ops->dma_free_pages(chip, &chip->posbuf);
-}
-EXPORT_SYMBOL_GPL(azx_free_stream_pages);
-
 /*
- * Lowlevel interface
+ * reset and start the controller registers
  */
-
-/* enter link reset */
-void azx_enter_link_reset(struct azx *chip)
-{
-        unsigned long timeout;
-
-        /* reset controller */
-        azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~AZX_GCTL_RESET);
-
-        timeout = jiffies + msecs_to_jiffies(100);
-        while ((azx_readb(chip, GCTL) & AZX_GCTL_RESET) &&
-                        time_before(jiffies, timeout))
-                usleep_range(500, 1000);
-}
-EXPORT_SYMBOL_GPL(azx_enter_link_reset);
-
-/* exit link reset */
-static void azx_exit_link_reset(struct azx *chip)
-{
-        unsigned long timeout;
-
-        azx_writeb(chip, GCTL, azx_readb(chip, GCTL) | AZX_GCTL_RESET);
-
-        timeout = jiffies + msecs_to_jiffies(100);
-        while (!azx_readb(chip, GCTL) &&
-                        time_before(jiffies, timeout))
-                usleep_range(500, 1000);
-}
-
-/* reset codec link */
-static int azx_reset(struct azx *chip, bool full_reset)
-{
-        if (!full_reset)
-                goto __skip;
-
-        /* clear STATESTS */
-        azx_writew(chip, STATESTS, STATESTS_INT_MASK);
-
-        /* reset controller */
-        azx_enter_link_reset(chip);
-
-        /* delay for >= 100us for codec PLL to settle per spec
-         * Rev 0.9 section 5.5.1
-         */
-        usleep_range(500, 1000);
-
-        /* Bring controller out of reset */
-        azx_exit_link_reset(chip);
-
-        /* Brent Chartrand said to wait >= 540us for codecs to initialize */
-        usleep_range(1000, 1200);
-
-      __skip:
-        /* check to see if controller is ready */
-        if (!azx_readb(chip, GCTL)) {
-                dev_dbg(chip->card->dev, "azx_reset: controller not ready!\n");
-                return -EBUSY;
-        }
-
-        /* Accept unsolicited responses */
-        if (!chip->single_cmd)
-                azx_writel(chip, GCTL, azx_readl(chip, GCTL) |
-                           AZX_GCTL_UNSOL);
-
-        /* detect codecs */
-        if (!chip->codec_mask) {
-                chip->codec_mask = azx_readw(chip, STATESTS);
-                dev_dbg(chip->card->dev, "codec_mask = 0x%x\n",
-                        chip->codec_mask);
-        }
-
-        return 0;
-}
-
-/* enable interrupts */
-static void azx_int_enable(struct azx *chip)
-{
-        /* enable controller CIE and GIE */
-        azx_writel(chip, INTCTL, azx_readl(chip, INTCTL) |
-                   AZX_INT_CTRL_EN | AZX_INT_GLOBAL_EN);
-}
-
-/* disable interrupts */
-static void azx_int_disable(struct azx *chip)
-{
-        int i;
-
-        /* disable interrupts in stream descriptor */
-        for (i = 0; i < chip->num_streams; i++) {
-                struct azx_dev *azx_dev = &chip->azx_dev[i];
-                azx_sd_writeb(chip, azx_dev, SD_CTL,
-                              azx_sd_readb(chip, azx_dev, SD_CTL) &
-                                        ~SD_INT_MASK);
-        }
-
-        /* disable SIE for all streams */
-        azx_writeb(chip, INTCTL, 0);
-
-        /* disable controller CIE and GIE */
-        azx_writel(chip, INTCTL, azx_readl(chip, INTCTL) &
-                   ~(AZX_INT_CTRL_EN | AZX_INT_GLOBAL_EN));
-}
-
-/* clear interrupts */
-static void azx_int_clear(struct azx *chip)
+void azx_init_chip(struct azx *chip, bool full_reset)
 {
-        int i;
-
-        /* clear stream status */
-        for (i = 0; i < chip->num_streams; i++) {
-                struct azx_dev *azx_dev = &chip->azx_dev[i];
-                azx_sd_writeb(chip, azx_dev, SD_STS, SD_INT_MASK);
+        if (snd_hdac_bus_init_chip(azx_bus(chip), full_reset)) {
+                /* correct RINTCNT for CXT */
+                if (chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND)
+                        azx_writew(chip, RINTCNT, 0xc0);
         }
-
-        /* clear STATESTS */
-        azx_writew(chip, STATESTS, STATESTS_INT_MASK);
-
-        /* clear rirb status */
-        azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);
-
-        /* clear int status */
-        azx_writel(chip, INTSTS, AZX_INT_CTRL_EN | AZX_INT_ALL_STREAM);
 }
+EXPORT_SYMBOL_GPL(azx_init_chip);
 
-/*
- * reset and start the controller registers
- */
-void azx_init_chip(struct azx *chip, bool full_reset)
+void azx_stop_all_streams(struct azx *chip)
 {
-        if (chip->initialized)
-                return;
-
-        /* reset controller */
-        azx_reset(chip, full_reset);
-
-        /* initialize interrupts */
-        azx_int_clear(chip);
-        azx_int_enable(chip);
-
-        /* initialize the codec command I/O */
-        if (!chip->single_cmd)
-                azx_init_cmd_io(chip);
-
-        /* program the position buffer */
-        azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
-        azx_writel(chip, DPUBASE, upper_32_bits(chip->posbuf.addr));
+        struct hdac_bus *bus = azx_bus(chip);
+        struct hdac_stream *s;
 
-        chip->initialized = 1;
+        list_for_each_entry(s, &bus->stream_list, list)
+                snd_hdac_stream_stop(s);
 }
-EXPORT_SYMBOL_GPL(azx_init_chip);
+EXPORT_SYMBOL_GPL(azx_stop_all_streams);
 
 void azx_stop_chip(struct azx *chip)
 {
-        if (!chip->initialized)
-                return;
-
-        /* disable interrupts */
-        azx_int_disable(chip);
-        azx_int_clear(chip);
-
-        /* disable CORB/RIRB */
-        azx_free_cmd_io(chip);
-
-        /* disable position buffer */
-        azx_writel(chip, DPLBASE, 0);
-        azx_writel(chip, DPUBASE, 0);
-
-        chip->initialized = 0;
+        snd_hdac_bus_stop_chip(azx_bus(chip));
 }
 EXPORT_SYMBOL_GPL(azx_stop_chip);
 
 /*
  * interrupt handler
  */
+static void stream_update(struct hdac_bus *bus, struct hdac_stream *s)
+{
+        struct azx *chip = bus_to_azx(bus);
+        struct azx_dev *azx_dev = stream_to_azx_dev(s);
+
+        /* check whether this IRQ is really acceptable */
+        if (!chip->ops->position_check ||
+            chip->ops->position_check(chip, azx_dev)) {
+                spin_unlock(&bus->reg_lock);
+                snd_pcm_period_elapsed(azx_stream(azx_dev)->substream);
+                spin_lock(&bus->reg_lock);
+        }
+}
+
 irqreturn_t azx_interrupt(int irq, void *dev_id)
 {
         struct azx *chip = dev_id;
-        struct azx_dev *azx_dev;
+        struct hdac_bus *bus = azx_bus(chip);
         u32 status;
-        u8 sd_status;
-        int i;
 
 #ifdef CONFIG_PM
         if (azx_has_pm_runtime(chip))
@@ -1703,36 +937,20 @@ irqreturn_t azx_interrupt(int irq, void *dev_id)
                         return IRQ_NONE;
 #endif
 
-        spin_lock(&chip->reg_lock);
+        spin_lock(&bus->reg_lock);
 
         if (chip->disabled) {
-                spin_unlock(&chip->reg_lock);
+                spin_unlock(&bus->reg_lock);
                 return IRQ_NONE;
         }
 
         status = azx_readl(chip, INTSTS);
         if (status == 0 || status == 0xffffffff) {
-                spin_unlock(&chip->reg_lock);
+                spin_unlock(&bus->reg_lock);
                 return IRQ_NONE;
         }
 
-        for (i = 0; i < chip->num_streams; i++) {
-                azx_dev = &chip->azx_dev[i];
-                if (status & azx_dev->sd_int_sta_mask) {
-                        sd_status = azx_sd_readb(chip, azx_dev, SD_STS);
-                        azx_sd_writeb(chip, azx_dev, SD_STS, SD_INT_MASK);
-                        if (!azx_dev->substream || !azx_dev->running ||
-                            !(sd_status & SD_INT_COMPLETE))
-                                continue;
-                        /* check whether this IRQ is really acceptable */
-                        if (!chip->ops->position_check ||
-                            chip->ops->position_check(chip, azx_dev)) {
-                                spin_unlock(&chip->reg_lock);
-                                snd_pcm_period_elapsed(azx_dev->substream);
-                                spin_lock(&chip->reg_lock);
-                        }
-                }
-        }
+        snd_hdac_bus_handle_stream_irq(bus, status, stream_update);
 
         /* clear rirb int */
         status = azx_readb(chip, RIRBSTS);
@@ -1740,12 +958,12 @@ irqreturn_t azx_interrupt(int irq, void *dev_id)
                 if (status & RIRB_INT_RESPONSE) {
                         if (chip->driver_caps & AZX_DCAPS_RIRB_PRE_DELAY)
                                 udelay(80);
-                        azx_update_rirb(chip);
+                        snd_hdac_bus_update_rirb(bus);
                 }
                 azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);
         }
 
-        spin_unlock(&chip->reg_lock);
+        spin_unlock(&bus->reg_lock);
 
         return IRQ_HANDLED;
 }
@@ -1762,29 +980,31 @@ static int probe_codec(struct azx *chip, int addr)
 {
         unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) |
                 (AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;
-        unsigned int res;
+        struct hdac_bus *bus = azx_bus(chip);
+        int err;
+        unsigned int res = -1;
 
-        mutex_lock(&chip->bus->core.cmd_mutex);
+        mutex_lock(&bus->cmd_mutex);
         chip->probing = 1;
-        azx_send_cmd(chip->bus, cmd);
-        res = azx_get_response(chip->bus, addr);
+        azx_send_cmd(bus, cmd);
+        err = azx_get_response(bus, addr, &res);
         chip->probing = 0;
-        mutex_unlock(&chip->bus->core.cmd_mutex);
-        if (res == -1)
+        mutex_unlock(&bus->cmd_mutex);
+        if (err < 0 || res == -1)
                 return -EIO;
         dev_dbg(chip->card->dev, "codec #%d probed OK\n", addr);
         return 0;
 }
 
-static void azx_bus_reset(struct hda_bus *bus)
+void snd_hda_bus_reset(struct hda_bus *bus)
 {
-        struct azx *chip = bus->private_data;
+        struct azx *chip = bus_to_azx(&bus->core);
 
         bus->in_reset = 1;
         azx_stop_chip(chip);
         azx_init_chip(chip, true);
-        if (chip->initialized)
-                snd_hda_bus_reset(chip->bus);
+        if (bus->core.chip_init)
+                snd_hda_bus_reset_codecs(bus);
         bus->in_reset = 0;
 }
 
@@ -1809,33 +1029,30 @@ static int get_jackpoll_interval(struct azx *chip)
         return j;
 }
 
-static struct hda_bus_ops bus_ops = {
-        .command = azx_send_cmd,
-        .get_response = azx_get_response,
-        .attach_pcm = azx_attach_pcm_stream,
-        .bus_reset = azx_bus_reset,
-#ifdef CONFIG_SND_HDA_DSP_LOADER
-        .load_dsp_prepare = azx_load_dsp_prepare,
-        .load_dsp_trigger = azx_load_dsp_trigger,
-        .load_dsp_cleanup = azx_load_dsp_cleanup,
-#endif
-};
-
 /* HD-audio bus initialization */
-int azx_bus_create(struct azx *chip, const char *model)
+int azx_bus_init(struct azx *chip, const char *model,
+                 const struct hdac_io_ops *io_ops)
 {
-        struct hda_bus *bus;
+        struct hda_bus *bus = &chip->bus;
         int err;
 
-        err = snd_hda_bus_new(chip->card, &bus);
+        err = snd_hdac_bus_init(&bus->core, chip->card->dev, &bus_core_ops,
+                                io_ops);
         if (err < 0)
                 return err;
 
-        chip->bus = bus;
-        bus->private_data = chip;
+        bus->card = chip->card;
+        mutex_init(&bus->prepare_mutex);
         bus->pci = chip->pci;
         bus->modelname = model;
-        bus->ops = bus_ops;
+        bus->core.snoop = azx_snoop(chip);
+        if (chip->get_position[0] != azx_get_pos_lpib ||
+            chip->get_position[1] != azx_get_pos_lpib)
+                bus->core.use_posbuf = true;
+        if (chip->bdl_pos_adj)
+                bus->core.bdl_pos_adj = chip->bdl_pos_adj[chip->dev_index];
+        if (chip->driver_caps & AZX_DCAPS_CORBRP_SELF_CLEAR)
+                bus->core.corbrp_self_clear = true;
 
         if (chip->driver_caps & AZX_DCAPS_RIRB_DELAY) {
                 dev_dbg(chip->card->dev, "Enable delay in RIRB handling\n");
@@ -1854,12 +1071,12 @@ int azx_bus_create(struct azx *chip, const char *model)
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(azx_bus_create);
+EXPORT_SYMBOL_GPL(azx_bus_init);
 
 /* Probe codecs */
 int azx_probe_codecs(struct azx *chip, unsigned int max_slots)
 {
-        struct hda_bus *bus = chip->bus;
+        struct hdac_bus *bus = azx_bus(chip);
         int c, codecs, err;
 
         codecs = 0;
@@ -1868,14 +1085,14 @@ int azx_probe_codecs(struct azx *chip, unsigned int max_slots)
 
         /* First try to probe all given codec slots */
         for (c = 0; c < max_slots; c++) {
-                if ((chip->codec_mask & (1 << c)) & chip->codec_probe_mask) {
+                if ((bus->codec_mask & (1 << c)) & chip->codec_probe_mask) {
                         if (probe_codec(chip, c) < 0) {
                                 /* Some BIOSen give you wrong codec addresses
                                  * that don't exist
                                  */
                                 dev_warn(chip->card->dev,
                                          "Codec #%d probe error; disabling it...\n", c);
-                                chip->codec_mask &= ~(1 << c);
+                                bus->codec_mask &= ~(1 << c);
                                 /* More badly, accessing to a non-existing
                                  * codec often screws up the controller chip,
                                  * and disturbs the further communications.
@@ -1891,9 +1108,9 @@ int azx_probe_codecs(struct azx *chip, unsigned int max_slots)
 
         /* Then create codec instances */
         for (c = 0; c < max_slots; c++) {
-                if ((chip->codec_mask & (1 << c)) & chip->codec_probe_mask) {
+                if ((bus->codec_mask & (1 << c)) & chip->codec_probe_mask) {
                         struct hda_codec *codec;
-                        err = snd_hda_codec_new(bus, bus->card, c, &codec);
+                        err = snd_hda_codec_new(&chip->bus, chip->card, c, &codec);
                         if (err < 0)
                                 continue;
                         codec->jackpoll_interval = get_jackpoll_interval(chip);
@@ -1913,40 +1130,39 @@ EXPORT_SYMBOL_GPL(azx_probe_codecs);
 int azx_codec_configure(struct azx *chip)
 {
         struct hda_codec *codec;
-        list_for_each_codec(codec, chip->bus) {
+        list_for_each_codec(codec, &chip->bus) {
                 snd_hda_codec_configure(codec);
         }
         return 0;
 }
 EXPORT_SYMBOL_GPL(azx_codec_configure);
 
-
-static bool is_input_stream(struct azx *chip, unsigned char index)
+static int stream_direction(struct azx *chip, unsigned char index)
 {
-        return (index >= chip->capture_index_offset &&
-                index < chip->capture_index_offset + chip->capture_streams);
+        if (index >= chip->capture_index_offset &&
+            index < chip->capture_index_offset + chip->capture_streams)
+                return SNDRV_PCM_STREAM_CAPTURE;
+        return SNDRV_PCM_STREAM_PLAYBACK;
 }
 
 /* initialize SD streams */
-int azx_init_stream(struct azx *chip)
+int azx_init_streams(struct azx *chip)
 {
         int i;
-        int in_stream_tag = 0;
-        int out_stream_tag = 0;
+        int stream_tags[2] = { 0, 0 };
 
         /* initialize each stream (aka device)
          * assign the starting bdl address to each stream (device)
          * and initialize
          */
         for (i = 0; i < chip->num_streams; i++) {
-                struct azx_dev *azx_dev = &chip->azx_dev[i];
-                azx_dev->posbuf = (u32 __iomem *)(chip->posbuf.area + i * 8);
-                /* offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */
-                azx_dev->sd_addr = chip->remap_addr + (0x20 * i + 0x80);
-                /* int mask: SDI0=0x01, SDI1=0x02, ... SDO3=0x80 */
-                azx_dev->sd_int_sta_mask = 1 << i;
-                azx_dev->index = i;
+                struct azx_dev *azx_dev = kzalloc(sizeof(*azx_dev), GFP_KERNEL);
+                int dir, tag;
+
+                if (!azx_dev)
+                        return -ENOMEM;
 
+                dir = stream_direction(chip, i);
                 /* stream tag must be unique throughout
                  * the stream direction group,
                  * valid values 1...15
@@ -1954,17 +1170,26 @@ int azx_init_stream(struct azx *chip)
                  * AZX_DCAPS_SEPARATE_STREAM_TAG is used
                  */
                 if (chip->driver_caps & AZX_DCAPS_SEPARATE_STREAM_TAG)
-                        azx_dev->stream_tag =
-                                is_input_stream(chip, i) ?
-                                ++in_stream_tag :
-                                ++out_stream_tag;
+                        tag = ++stream_tags[dir];
                 else
-                        azx_dev->stream_tag = i + 1;
+                        tag = i + 1;
+                snd_hdac_stream_init(azx_bus(chip), azx_stream(azx_dev),
+                                     i, dir, tag);
         }
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(azx_init_stream);
+EXPORT_SYMBOL_GPL(azx_init_streams);
 
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Common HDA driver functions");
+void azx_free_streams(struct azx *chip)
+{
+        struct hdac_bus *bus = azx_bus(chip);
+        struct hdac_stream *s;
+
+        while (!list_empty(&bus->stream_list)) {
+                s = list_first_entry(&bus->stream_list, struct hdac_stream, list);
+                list_del(&s->list);
+                kfree(stream_to_azx_dev(s));
+        }
+}
+EXPORT_SYMBOL_GPL(azx_free_streams);
diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
index 0efdb094d21c..314105cd5061 100644
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@ -21,135 +21,10 @@
 #include <sound/pcm.h>
 #include <sound/initval.h>
 #include "hda_codec.h"
+#include <sound/hda_register.h>
 
-/*
- * registers
- */
-#define AZX_REG_GCAP                    0x00
-#define   AZX_GCAP_64OK         (1 << 0)   /* 64bit address support */
-#define   AZX_GCAP_NSDO         (3 << 1)   /* # of serial data out signals */
-#define   AZX_GCAP_BSS          (31 << 3)  /* # of bidirectional streams */
-#define   AZX_GCAP_ISS          (15 << 8)  /* # of input streams */
-#define   AZX_GCAP_OSS          (15 << 12) /* # of output streams */
-#define AZX_REG_VMIN                    0x02
-#define AZX_REG_VMAJ                    0x03
-#define AZX_REG_OUTPAY                  0x04
-#define AZX_REG_INPAY                   0x06
-#define AZX_REG_GCTL                    0x08
-#define   AZX_GCTL_RESET        (1 << 0)   /* controller reset */
-#define   AZX_GCTL_FCNTRL       (1 << 1)   /* flush control */
-#define   AZX_GCTL_UNSOL        (1 << 8)   /* accept unsol. response enable */
-#define AZX_REG_WAKEEN                  0x0c
-#define AZX_REG_STATESTS                0x0e
-#define AZX_REG_GSTS                    0x10
-#define   AZX_GSTS_FSTS         (1 << 1)   /* flush status */
-#define AZX_REG_INTCTL                  0x20
-#define AZX_REG_INTSTS                  0x24
-#define AZX_REG_WALLCLK                 0x30    /* 24Mhz source */
-#define AZX_REG_OLD_SSYNC               0x34    /* SSYNC for old ICH */
-#define AZX_REG_SSYNC                   0x38
-#define AZX_REG_CORBLBASE               0x40
-#define AZX_REG_CORBUBASE               0x44
-#define AZX_REG_CORBWP                  0x48
-#define AZX_REG_CORBRP                  0x4a
-#define   AZX_CORBRP_RST        (1 << 15)  /* read pointer reset */
-#define AZX_REG_CORBCTL                 0x4c
-#define   AZX_CORBCTL_RUN       (1 << 1)   /* enable DMA */
-#define   AZX_CORBCTL_CMEIE     (1 << 0)   /* enable memory error irq */
-#define AZX_REG_CORBSTS                 0x4d
-#define   AZX_CORBSTS_CMEI      (1 << 0)   /* memory error indication */
-#define AZX_REG_CORBSIZE                0x4e
-
-#define AZX_REG_RIRBLBASE               0x50
-#define AZX_REG_RIRBUBASE               0x54
-#define AZX_REG_RIRBWP                  0x58
-#define   AZX_RIRBWP_RST        (1 << 15)  /* write pointer reset */
-#define AZX_REG_RINTCNT                 0x5a
-#define AZX_REG_RIRBCTL                 0x5c
-#define   AZX_RBCTL_IRQ_EN      (1 << 0)   /* enable IRQ */
-#define   AZX_RBCTL_DMA_EN      (1 << 1)   /* enable DMA */
-#define   AZX_RBCTL_OVERRUN_EN  (1 << 2)   /* enable overrun irq */
-#define AZX_REG_RIRBSTS                 0x5d
-#define   AZX_RBSTS_IRQ         (1 << 0)   /* response irq */
-#define   AZX_RBSTS_OVERRUN     (1 << 2)   /* overrun irq */
-#define AZX_REG_RIRBSIZE                0x5e
-
-#define AZX_REG_IC                      0x60
-#define AZX_REG_IR                      0x64
-#define AZX_REG_IRS                     0x68
-#define   AZX_IRS_VALID         (1<<1)
-#define   AZX_IRS_BUSY          (1<<0)
-
-#define AZX_REG_DPLBASE                 0x70
-#define AZX_REG_DPUBASE                 0x74
-#define   AZX_DPLBASE_ENABLE    0x1     /* Enable position buffer */
-
-/* SD offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */
-enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
-
-/* stream register offsets from stream base */
-#define AZX_REG_SD_CTL                  0x00
-#define AZX_REG_SD_STS                  0x03
-#define AZX_REG_SD_LPIB                 0x04
-#define AZX_REG_SD_CBL                  0x08
-#define AZX_REG_SD_LVI                  0x0c
-#define AZX_REG_SD_FIFOW                0x0e
-#define AZX_REG_SD_FIFOSIZE             0x10
-#define AZX_REG_SD_FORMAT               0x12
-#define AZX_REG_SD_BDLPL                0x18
-#define AZX_REG_SD_BDLPU                0x1c
-
-/* PCI space */
-#define AZX_PCIREG_TCSEL                0x44
-
-/*
- * other constants
- */
-
-/* max number of fragments - we may use more if allocating more pages for BDL */
-#define BDL_SIZE                4096
-#define AZX_MAX_BDL_ENTRIES     (BDL_SIZE / 16)
-#define AZX_MAX_FRAG            32
-/* max buffer size - no h/w limit, you can increase as you like */
-#define AZX_MAX_BUF_SIZE        (1024*1024*1024)
-
-/* RIRB int mask: overrun[2], response[0] */
-#define RIRB_INT_RESPONSE       0x01
-#define RIRB_INT_OVERRUN        0x04
-#define RIRB_INT_MASK           0x05
-
-/* STATESTS int mask: S3,SD2,SD1,SD0 */
-#define AZX_MAX_CODECS          8
+#define AZX_MAX_CODECS          HDA_MAX_CODECS
 #define AZX_DEFAULT_CODECS      4
-#define STATESTS_INT_MASK       ((1 << AZX_MAX_CODECS) - 1)
-
-/* SD_CTL bits */
-#define SD_CTL_STREAM_RESET     0x01    /* stream reset bit */
-#define SD_CTL_DMA_START        0x02    /* stream DMA start bit */
-#define SD_CTL_STRIPE           (3 << 16)       /* stripe control */
-#define SD_CTL_TRAFFIC_PRIO     (1 << 18)       /* traffic priority */
-#define SD_CTL_DIR              (1 << 19)       /* bi-directional stream */
-#define SD_CTL_STREAM_TAG_MASK  (0xf << 20)
-#define SD_CTL_STREAM_TAG_SHIFT 20
-
-/* SD_CTL and SD_STS */
-#define SD_INT_DESC_ERR         0x10    /* descriptor error interrupt */
-#define SD_INT_FIFO_ERR         0x08    /* FIFO error interrupt */
-#define SD_INT_COMPLETE         0x04    /* completion interrupt */
-#define SD_INT_MASK             (SD_INT_DESC_ERR|SD_INT_FIFO_ERR|\
-                                 SD_INT_COMPLETE)
-
-/* SD_STS */
-#define SD_STS_FIFO_READY       0x20    /* FIFO ready */
-
-/* INTCTL and INTSTS */
-#define AZX_INT_ALL_STREAM      0xff       /* all stream interrupts */
-#define AZX_INT_CTRL_EN 0x40000000 /* controller interrupt enable bit */
-#define AZX_INT_GLOBAL_EN       0x80000000 /* global interrupt enable bit */
-
-/* below are so far hardcoded - should read registers in future */
-#define AZX_MAX_CORB_ENTRIES    256
-#define AZX_MAX_RIRB_ENTRIES    256
 
 /* driver quirks (capabilities) */
 /* bits 0-7 are used for indicating driver type */
@@ -183,40 +58,10 @@ enum {
         AZX_SNOOP_TYPE_NVIDIA,
 };
 
-/* HD Audio class code */
-#define PCI_CLASS_MULTIMEDIA_HD_AUDIO   0x0403
-
 struct azx_dev {
-        struct snd_dma_buffer bdl; /* BDL buffer */
-        u32 *posbuf;            /* position buffer pointer */
-
-        unsigned int bufsize;   /* size of the play buffer in bytes */
-        unsigned int period_bytes; /* size of the period in bytes */
-        unsigned int frags;     /* number for period in the play buffer */
-        unsigned int fifo_size; /* FIFO size */
-        unsigned long start_wallclk;    /* start + minimum wallclk */
-        unsigned long period_wallclk;   /* wallclk for period */
-
-        void __iomem *sd_addr;  /* stream descriptor pointer */
-
-        u32 sd_int_sta_mask;    /* stream int status mask */
-
-        /* pcm support */
-        struct snd_pcm_substream *substream;    /* assigned substream,
-                                                 * set in PCM open
-                                                 */
-        unsigned int format_val;        /* format value to be set in the
-                                         * controller and the codec
-                                         */
-        unsigned char stream_tag;       /* assigned stream */
-        unsigned char index;            /* stream index */
-        int assigned_key;               /* last device# key assigned to */
-
-        unsigned int opened:1;
-        unsigned int running:1;
+        struct hdac_stream core;
+
         unsigned int irq_pending:1;
-        unsigned int prepared:1;
-        unsigned int locked:1;
         /*
          * For VIA:
          *  A flag to ensure DMA position is 0
@@ -224,50 +69,17 @@ struct azx_dev {
          */
         unsigned int insufficient:1;
         unsigned int wc_marked:1;
-        unsigned int no_period_wakeup:1;
-
-        struct timecounter  azx_tc;
-        struct cyclecounter azx_cc;
-
-        int delay_negative_threshold;
-
-#ifdef CONFIG_SND_HDA_DSP_LOADER
-        /* Allows dsp load to have sole access to the playback stream. */
-        struct mutex dsp_mutex;
-#endif
 };
 
-/* CORB/RIRB */
-struct azx_rb {
-        u32 *buf;               /* CORB/RIRB buffer
-                                 * Each CORB entry is 4byte, RIRB is 8byte
-                                 */
-        dma_addr_t addr;        /* physical address of CORB/RIRB buffer */
-        /* for RIRB */
-        unsigned short rp, wp;  /* read/write pointers */
-        int cmds[AZX_MAX_CODECS];       /* number of pending requests */
-        u32 res[AZX_MAX_CODECS];        /* last read value */
-};
+#define azx_stream(dev)         (&(dev)->core)
+#define stream_to_azx_dev(s)    container_of(s, struct azx_dev, core)
 
 struct azx;
 
 /* Functions to read/write to hda registers. */
 struct hda_controller_ops {
-        /* Register Access */
-        void (*reg_writel)(u32 value, u32 __iomem *addr);
-        u32 (*reg_readl)(u32 __iomem *addr);
-        void (*reg_writew)(u16 value, u16 __iomem *addr);
-        u16 (*reg_readw)(u16 __iomem *addr);
-        void (*reg_writeb)(u8 value, u8 __iomem *addr);
-        u8 (*reg_readb)(u8 __iomem *addr);
         /* Disable msi if supported, PCI only */
         int (*disable_msi_reset_irq)(struct azx *);
-        /* Allocation ops */
-        int (*dma_alloc_pages)(struct azx *chip,
-                               int type,
-                               size_t size,
-                               struct snd_dma_buffer *buf);
-        void (*dma_free_pages)(struct azx *chip, struct snd_dma_buffer *buf);
         int (*substream_alloc_pages)(struct azx *chip,
                                      struct snd_pcm_substream *substream,
                                      size_t size);
@@ -277,6 +89,8 @@ struct hda_controller_ops {
                                  struct vm_area_struct *area);
         /* Check if current position is acceptable */
         int (*position_check)(struct azx *chip, struct azx_dev *azx_dev);
+        /* enable/disable the link power */
+        int (*link_power)(struct azx *chip, bool enable);
 };
 
 struct azx_pcm {
@@ -291,6 +105,8 @@ typedef unsigned int (*azx_get_pos_callback_t)(struct azx *, struct azx_dev *);
 typedef int (*azx_get_delay_callback_t)(struct azx *, struct azx_dev *, unsigned int pos);
 
 struct azx {
+        struct hda_bus bus;
+
         struct snd_card *card;
         struct pci_dev *pci;
         int dev_index;
@@ -312,35 +128,16 @@ struct azx {
         azx_get_pos_callback_t get_position[2];
         azx_get_delay_callback_t get_delay[2];
 
-        /* pci resources */
-        unsigned long addr;
-        void __iomem *remap_addr;
-        int irq;
-
         /* locks */
-        spinlock_t reg_lock;
         struct mutex open_mutex; /* Prevents concurrent open/close operations */
 
-        /* streams (x num_streams) */
-        struct azx_dev *azx_dev;
-
         /* PCM */
         struct list_head pcm_list; /* azx_pcm list */
 
         /* HD codec */
-        unsigned short codec_mask;
         int  codec_probe_mask; /* copied from probe_mask option */
-        struct hda_bus *bus;
         unsigned int beep_mode;
 
-        /* CORB/RIRB */
-        struct azx_rb corb;
-        struct azx_rb rirb;
-
-        /* CORB/RIRB and position buffers */
-        struct snd_dma_buffer rb;
-        struct snd_dma_buffer posbuf;
-
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
         const struct firmware *fw;
 #endif
@@ -349,7 +146,6 @@ struct azx {
         const int *bdl_pos_adj;
         int poll_count;
         unsigned int running:1;
-        unsigned int initialized:1;
         unsigned int single_cmd:1;
         unsigned int polling_mode:1;
         unsigned int msi:1;
@@ -359,14 +155,14 @@ struct azx {
         unsigned int region_requested:1;
         unsigned int disabled:1; /* disabled by VGA-switcher */
 
-        /* for debugging */
-        unsigned int last_cmd[AZX_MAX_CODECS];
-
 #ifdef CONFIG_SND_HDA_DSP_LOADER
         struct azx_dev saved_azx_dev;
 #endif
 };
 
+#define azx_bus(chip)   (&(chip)->bus.core)
+#define bus_to_azx(_bus)        container_of(_bus, struct azx, bus.core)
+
 #ifdef CONFIG_X86
 #define azx_snoop(chip)         ((chip)->snoop)
 #else
@@ -378,30 +174,17 @@ struct azx {
  */
 
 #define azx_writel(chip, reg, value) \
-        ((chip)->ops->reg_writel(value, (chip)->remap_addr + AZX_REG_##reg))
+        snd_hdac_chip_writel(azx_bus(chip), reg, value)
 #define azx_readl(chip, reg) \
-        ((chip)->ops->reg_readl((chip)->remap_addr + AZX_REG_##reg))
+        snd_hdac_chip_readl(azx_bus(chip), reg)
 #define azx_writew(chip, reg, value) \
-        ((chip)->ops->reg_writew(value, (chip)->remap_addr + AZX_REG_##reg))
+        snd_hdac_chip_writew(azx_bus(chip), reg, value)
 #define azx_readw(chip, reg) \
-        ((chip)->ops->reg_readw((chip)->remap_addr + AZX_REG_##reg))
+        snd_hdac_chip_readw(azx_bus(chip), reg)
 #define azx_writeb(chip, reg, value) \
-        ((chip)->ops->reg_writeb(value, (chip)->remap_addr + AZX_REG_##reg))
+        snd_hdac_chip_writeb(azx_bus(chip), reg, value)
 #define azx_readb(chip, reg) \
-        ((chip)->ops->reg_readb((chip)->remap_addr + AZX_REG_##reg))
-
-#define azx_sd_writel(chip, dev, reg, value) \
-        ((chip)->ops->reg_writel(value, (dev)->sd_addr + AZX_REG_##reg))
-#define azx_sd_readl(chip, dev, reg) \
-        ((chip)->ops->reg_readl((dev)->sd_addr + AZX_REG_##reg))
-#define azx_sd_writew(chip, dev, reg, value) \
-        ((chip)->ops->reg_writew(value, (dev)->sd_addr + AZX_REG_##reg))
-#define azx_sd_readw(chip, dev, reg) \
-        ((chip)->ops->reg_readw((dev)->sd_addr + AZX_REG_##reg))
-#define azx_sd_writeb(chip, dev, reg, value) \
-        ((chip)->ops->reg_writeb(value, (dev)->sd_addr + AZX_REG_##reg))
-#define azx_sd_readb(chip, dev, reg) \
-        ((chip)->ops->reg_readb((dev)->sd_addr + AZX_REG_##reg))
+        snd_hdac_chip_readb(azx_bus(chip), reg)
 
 #define azx_has_pm_runtime(chip) \
         ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME)
@@ -416,22 +199,27 @@ unsigned int azx_get_pos_lpib(struct azx *chip, struct azx_dev *azx_dev);
 unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev);
 
 /* Stream control. */
-void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev);
+void azx_stop_all_streams(struct azx *chip);
 
 /* Allocation functions. */
-int azx_alloc_stream_pages(struct azx *chip);
-void azx_free_stream_pages(struct azx *chip);
+#define azx_alloc_stream_pages(chip) \
+        snd_hdac_bus_alloc_stream_pages(azx_bus(chip))
+#define azx_free_stream_pages(chip) \
+        snd_hdac_bus_free_stream_pages(azx_bus(chip))
 
 /* Low level azx interface */
 void azx_init_chip(struct azx *chip, bool full_reset);
 void azx_stop_chip(struct azx *chip);
-void azx_enter_link_reset(struct azx *chip);
+#define azx_enter_link_reset(chip) \
+        snd_hdac_bus_enter_link_reset(azx_bus(chip))
 irqreturn_t azx_interrupt(int irq, void *dev_id);
 
 /* Codec interface */
-int azx_bus_create(struct azx *chip, const char *model);
+int azx_bus_init(struct azx *chip, const char *model,
+                 const struct hdac_io_ops *io_ops);
 int azx_probe_codecs(struct azx *chip, unsigned int max_slots);
 int azx_codec_configure(struct azx *chip);
-int azx_init_stream(struct azx *chip);
+int azx_init_streams(struct azx *chip);
+void azx_free_streams(struct azx *chip);
 
 #endif /* __SOUND_HDA_CONTROLLER_H */
diff --git a/sound/pci/hda/hda_controller_trace.h b/sound/pci/hda/hda_controller_trace.h
new file mode 100644
index 000000000000..3e18d99bfb70
--- /dev/null
+++ b/sound/pci/hda/hda_controller_trace.h
@@ -0,0 +1,98 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM hda_controller
+#define TRACE_INCLUDE_FILE hda_controller_trace
+
+#if !defined(_TRACE_HDA_CONTROLLER_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_HDA_CONTROLLER_H
+
+#include <linux/tracepoint.h>
+
+struct azx;
+struct azx_dev;
+
+TRACE_EVENT(azx_pcm_trigger,
+
+        TP_PROTO(struct azx *chip, struct azx_dev *dev, int cmd),
+
+        TP_ARGS(chip, dev, cmd),
+
+        TP_STRUCT__entry(
+                __field( int, card )
+                __field( int, idx )
+                __field( int, cmd )
+        ),
+
+        TP_fast_assign(
+                __entry->card = (chip)->card->number;
+                __entry->idx = (dev)->core.index;
+                __entry->cmd = cmd;
+        ),
+
+        TP_printk("[%d:%d] cmd=%d", __entry->card, __entry->idx, __entry->cmd)
+);
+
+TRACE_EVENT(azx_get_position,
+
+    TP_PROTO(struct azx *chip, struct azx_dev *dev, unsigned int pos, unsigned int delay),
+
+            TP_ARGS(chip, dev, pos, delay),
+
+        TP_STRUCT__entry(
+                __field( int, card )
+                __field( int, idx )
+                __field( unsigned int, pos )
+                __field( unsigned int, delay )
+        ),
+
+        TP_fast_assign(
+                __entry->card = (chip)->card->number;
+                __entry->idx = (dev)->core.index;
+                __entry->pos = pos;
+                __entry->delay = delay;
+        ),
+
+        TP_printk("[%d:%d] pos=%u, delay=%u", __entry->card, __entry->idx, __entry->pos, __entry->delay)
+);
+
+DECLARE_EVENT_CLASS(azx_pcm,
+        TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),
+
+        TP_ARGS(chip, azx_dev),
+
+        TP_STRUCT__entry(
+                __field( unsigned char, stream_tag )
+        ),
+
+        TP_fast_assign(
+                __entry->stream_tag = (azx_dev)->core.stream_tag;
+        ),
+
+        TP_printk("stream_tag: %d", __entry->stream_tag)
+);
+
+DEFINE_EVENT(azx_pcm, azx_pcm_open,
+        TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),
+        TP_ARGS(chip, azx_dev)
+);
+
+DEFINE_EVENT(azx_pcm, azx_pcm_close,
+        TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),
+        TP_ARGS(chip, azx_dev)
+);
+
+DEFINE_EVENT(azx_pcm, azx_pcm_hw_params,
+        TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),
+        TP_ARGS(chip, azx_dev)
+);
+
+DEFINE_EVENT(azx_pcm, azx_pcm_prepare,
+        TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),
+        TP_ARGS(chip, azx_dev)
+);
+
+#endif /* _TRACE_HDA_CONTROLLER_H */
+
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#include <trace/define_trace.h>
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 3d2597b7037b..788f969b1a68 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -3259,7 +3259,8 @@ static int create_input_ctls(struct hda_codec *codec)
                 val = PIN_IN;
                 if (cfg->inputs[i].type == AUTO_PIN_MIC)
                         val |= snd_hda_get_default_vref(codec, pin);
-                if (pin != spec->hp_mic_pin)
+                if (pin != spec->hp_mic_pin &&
+                    !snd_hda_codec_get_pin_target(codec, pin))
                         set_pin_target(codec, pin, val, false);
 
                 if (mixer) {
diff --git a/sound/pci/hda/hda_i915.c b/sound/pci/hda/hda_i915.c
deleted file mode 100644
index 3052a2b095f7..000000000000
--- a/sound/pci/hda/hda_i915.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  hda_i915.c - routines for Haswell HDA controller power well support
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the Free
- *  Software Foundation; either version 2 of the License, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/component.h>
-#include <drm/i915_component.h>
-#include <sound/core.h>
-#include "hda_controller.h"
-#include "hda_intel.h"
-
-/* Intel HSW/BDW display HDA controller Extended Mode registers.
- * EM4 (M value) and EM5 (N Value) are used to convert CDClk (Core Display
- * Clock) to 24MHz BCLK: BCLK = CDCLK * M / N
- * The values will be lost when the display power well is disabled.
- */
-#define AZX_REG_EM4                     0x100c
-#define AZX_REG_EM5                     0x1010
-
-int hda_display_power(struct hda_intel *hda, bool enable)
-{
-        struct i915_audio_component *acomp = &hda->audio_component;
-
-        if (!acomp->ops)
-                return -ENODEV;
-
-        dev_dbg(&hda->chip.pci->dev, "display power %s\n",
-                enable ? "enable" : "disable");
-        if (enable)
-                acomp->ops->get_power(acomp->dev);
-        else
-                acomp->ops->put_power(acomp->dev);
-
-        return 0;
-}
-
-void haswell_set_bclk(struct hda_intel *hda)
-{
-        int cdclk_freq;
-        unsigned int bclk_m, bclk_n;
-        struct i915_audio_component *acomp = &hda->audio_component;
-        struct pci_dev *pci = hda->chip.pci;
-
-        /* Only Haswell/Broadwell need set BCLK */
-        if (pci->device != 0x0a0c && pci->device != 0x0c0c
-           && pci->device != 0x0d0c && pci->device != 0x160c)
-                return;
-
-        if (!acomp->ops)
-                return;
-
-        cdclk_freq = acomp->ops->get_cdclk_freq(acomp->dev);
-        switch (cdclk_freq) {
-        case 337500:
-                bclk_m = 16;
-                bclk_n = 225;
-                break;
-
-        case 450000:
-        default: /* default CDCLK 450MHz */
-                bclk_m = 4;
-                bclk_n = 75;
-                break;
-
-        case 540000:
-                bclk_m = 4;
-                bclk_n = 90;
-                break;
-
-        case 675000:
-                bclk_m = 8;
-                bclk_n = 225;
-                break;
-        }
-
-        azx_writew(&hda->chip, EM4, bclk_m);
-        azx_writew(&hda->chip, EM5, bclk_n);
-}
-
-static int hda_component_master_bind(struct device *dev)
-{
-        struct snd_card *card = dev_get_drvdata(dev);
-        struct azx *chip = card->private_data;
-        struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
-        struct i915_audio_component *acomp = &hda->audio_component;
-        int ret;
-
-        ret = component_bind_all(dev, acomp);
-        if (ret < 0)
-                return ret;
-
-        if (WARN_ON(!(acomp->dev && acomp->ops && acomp->ops->get_power &&
-                      acomp->ops->put_power && acomp->ops->get_cdclk_freq))) {
-                ret = -EINVAL;
-                goto out_unbind;
-        }
-
-        /*
-         * Atm, we don't support dynamic unbinding initiated by the child
-         * component, so pin its containing module until we unbind.
-         */
-        if (!try_module_get(acomp->ops->owner)) {
-                ret = -ENODEV;
-                goto out_unbind;
-        }
-
-        return 0;
-
-out_unbind:
-        component_unbind_all(dev, acomp);
-
-        return ret;
-}
-
-static void hda_component_master_unbind(struct device *dev)
-{
-        struct snd_card *card = dev_get_drvdata(dev);
-        struct azx *chip = card->private_data;
-        struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
-        struct i915_audio_component *acomp = &hda->audio_component;
-
-        module_put(acomp->ops->owner);
-        component_unbind_all(dev, acomp);
-        WARN_ON(acomp->ops || acomp->dev);
-}
-
-static const struct component_master_ops hda_component_master_ops = {
-        .bind = hda_component_master_bind,
-        .unbind = hda_component_master_unbind,
-};
-
-static int hda_component_master_match(struct device *dev, void *data)
-{
-        /* i915 is the only supported component */
-        return !strcmp(dev->driver->name, "i915");
-}
-
-int hda_i915_init(struct hda_intel *hda)
-{
-        struct component_match *match = NULL;
-        struct device *dev = &hda->chip.pci->dev;
-        struct i915_audio_component *acomp = &hda->audio_component;
-        int ret;
-
-        component_match_add(dev, &match, hda_component_master_match, hda);
-        ret = component_master_add_with_match(dev, &hda_component_master_ops,
-                                              match);
-        if (ret < 0)
-                goto out_err;
-
-        /*
-         * Atm, we don't support deferring the component binding, so make sure
-         * i915 is loaded and that the binding successfully completes.
-         */
-        request_module("i915");
-
-        if (!acomp->ops) {
-                ret = -ENODEV;
-                goto out_master_del;
-        }
-
-        dev_dbg(dev, "bound to i915 component master\n");
-
-        return 0;
-out_master_del:
-        component_master_del(dev, &hda_component_master_ops);
-out_err:
-        dev_err(dev, "failed to add i915 component master (%d)\n", ret);
-
-        return ret;
-}
-
-int hda_i915_exit(struct hda_intel *hda)
-{
-        struct device *dev = &hda->chip.pci->dev;
-
-        component_master_del(dev, &hda_component_master_ops);
-
-        return 0;
-}
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 34040d26c94f..391e4f834436 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -57,6 +57,8 @@
 #endif
 #include <sound/core.h>
 #include <sound/initval.h>
+#include <sound/hdaudio.h>
+#include <sound/hda_i915.h>
 #include <linux/vgaarb.h>
 #include <linux/vga_switcheroo.h>
 #include <linux/firmware.h>
@@ -64,6 +66,9 @@
 #include "hda_controller.h"
 #include "hda_intel.h"
 
+#define CREATE_TRACE_POINTS
+#include "hda_intel_trace.h"
+
 /* position fix mode */
 enum {
         POS_FIX_AUTO,
@@ -491,11 +496,22 @@ static void azx_init_pci(struct azx *chip)
         }
 }
 
+static void hda_intel_init_chip(struct azx *chip, bool full_reset)
+{
+        struct hdac_bus *bus = azx_bus(chip);
+
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+                snd_hdac_set_codec_wakeup(bus, true);
+        azx_init_chip(chip, full_reset);
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+                snd_hdac_set_codec_wakeup(bus, false);
+}
+
 /* calculate runtime delay from LPIB */
 static int azx_get_delay_from_lpib(struct azx *chip, struct azx_dev *azx_dev,
                                    unsigned int pos)
 {
-        struct snd_pcm_substream *substream = azx_dev->substream;
+        struct snd_pcm_substream *substream = azx_dev->core.substream;
         int stream = substream->stream;
         unsigned int lpib_pos = azx_get_pos_lpib(chip, azx_dev);
         int delay;
@@ -505,16 +521,16 @@ static int azx_get_delay_from_lpib(struct azx *chip, struct azx_dev *azx_dev,
         else
                 delay = lpib_pos - pos;
         if (delay < 0) {
-                if (delay >= azx_dev->delay_negative_threshold)
+                if (delay >= azx_dev->core.delay_negative_threshold)
                         delay = 0;
                 else
-                        delay += azx_dev->bufsize;
+                        delay += azx_dev->core.bufsize;
         }
 
-        if (delay >= azx_dev->period_bytes) {
+        if (delay >= azx_dev->core.period_bytes) {
                 dev_info(chip->card->dev,
                          "Unstable LPIB (%d >= %d); disabling LPIB delay counting\n",
-                         delay, azx_dev->period_bytes);
+                         delay, azx_dev->core.period_bytes);
                 delay = 0;
                 chip->driver_caps &= ~AZX_DCAPS_COUNT_LPIB_DELAY;
                 chip->get_delay[stream] = NULL;
@@ -543,6 +559,14 @@ static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev)
         return 0;
 }
 
+/* Enable/disable i915 display power for the link */
+static int azx_intel_link_power(struct azx *chip, bool enable)
+{
+        struct hdac_bus *bus = azx_bus(chip);
+
+        return snd_hdac_display_power(bus, enable);
+}
+
 /*
  * Check whether the current DMA position is acceptable for updating
  * periods.  Returns non-zero if it's OK.
@@ -554,13 +578,13 @@ static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev)
  */
 static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 {
-        struct snd_pcm_substream *substream = azx_dev->substream;
+        struct snd_pcm_substream *substream = azx_dev->core.substream;
         int stream = substream->stream;
         u32 wallclk;
         unsigned int pos;
 
-        wallclk = azx_readl(chip, WALLCLK) - azx_dev->start_wallclk;
-        if (wallclk < (azx_dev->period_wallclk * 2) / 3)
+        wallclk = azx_readl(chip, WALLCLK) - azx_dev->core.start_wallclk;
+        if (wallclk < (azx_dev->core.period_wallclk * 2) / 3)
                 return -1;      /* bogus (too early) interrupt */
 
         if (chip->get_position[stream])
@@ -571,6 +595,9 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
                         dev_info(chip->card->dev,
                                  "Invalid position buffer, using LPIB read method instead.\n");
                         chip->get_position[stream] = azx_get_pos_lpib;
+                        if (chip->get_position[0] == azx_get_pos_lpib &&
+                            chip->get_position[1] == azx_get_pos_lpib)
+                                azx_bus(chip)->use_posbuf = false;
                         pos = azx_get_pos_lpib(chip, azx_dev);
                         chip->get_delay[stream] = NULL;
                 } else {
@@ -580,17 +607,17 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
                 }
         }
 
-        if (pos >= azx_dev->bufsize)
+        if (pos >= azx_dev->core.bufsize)
                 pos = 0;
 
-        if (WARN_ONCE(!azx_dev->period_bytes,
+        if (WARN_ONCE(!azx_dev->core.period_bytes,
                       "hda-intel: zero azx_dev->period_bytes"))
                 return -1; /* this shouldn't happen! */
-        if (wallclk < (azx_dev->period_wallclk * 5) / 4 &&
-            pos % azx_dev->period_bytes > azx_dev->period_bytes / 2)
+        if (wallclk < (azx_dev->core.period_wallclk * 5) / 4 &&
+            pos % azx_dev->core.period_bytes > azx_dev->core.period_bytes / 2)
                 /* NG - it's below the first next period boundary */
                 return chip->bdl_pos_adj[chip->dev_index] ? 0 : -1;
-        azx_dev->start_wallclk += wallclk;
+        azx_dev->core.start_wallclk += wallclk;
         return 1; /* OK, it's fine */
 }
 
@@ -601,7 +628,9 @@ static void azx_irq_pending_work(struct work_struct *work)
 {
         struct hda_intel *hda = container_of(work, struct hda_intel, irq_pending_work);
         struct azx *chip = &hda->chip;
-        int i, pending, ok;
+        struct hdac_bus *bus = azx_bus(chip);
+        struct hdac_stream *s;
+        int pending, ok;
 
         if (!hda->irq_pending_warned) {
                 dev_info(chip->card->dev,
@@ -612,25 +641,25 @@ static void azx_irq_pending_work(struct work_struct *work)
 
         for (;;) {
                 pending = 0;
-                spin_lock_irq(&chip->reg_lock);
-                for (i = 0; i < chip->num_streams; i++) {
-                        struct azx_dev *azx_dev = &chip->azx_dev[i];
+                spin_lock_irq(&bus->reg_lock);
+                list_for_each_entry(s, &bus->stream_list, list) {
+                        struct azx_dev *azx_dev = stream_to_azx_dev(s);
                         if (!azx_dev->irq_pending ||
-                            !azx_dev->substream ||
-                            !azx_dev->running)
+                            !s->substream ||
+                            !s->running)
                                 continue;
                         ok = azx_position_ok(chip, azx_dev);
                         if (ok > 0) {
                                 azx_dev->irq_pending = 0;
-                                spin_unlock(&chip->reg_lock);
-                                snd_pcm_period_elapsed(azx_dev->substream);
-                                spin_lock(&chip->reg_lock);
+                                spin_unlock(&bus->reg_lock);
+                                snd_pcm_period_elapsed(s->substream);
+                                spin_lock(&bus->reg_lock);
                         } else if (ok < 0) {
                                 pending = 0;    /* too early */
                         } else
                                 pending++;
                 }
-                spin_unlock_irq(&chip->reg_lock);
+                spin_unlock_irq(&bus->reg_lock);
                 if (!pending)
                         return;
                 msleep(1);
@@ -640,16 +669,21 @@ static void azx_irq_pending_work(struct work_struct *work)
 /* clear irq_pending flags and assure no on-going workq */
 static void azx_clear_irq_pending(struct azx *chip)
 {
-        int i;
+        struct hdac_bus *bus = azx_bus(chip);
+        struct hdac_stream *s;
 
-        spin_lock_irq(&chip->reg_lock);
-        for (i = 0; i < chip->num_streams; i++)
-                chip->azx_dev[i].irq_pending = 0;
-        spin_unlock_irq(&chip->reg_lock);
+        spin_lock_irq(&bus->reg_lock);
+        list_for_each_entry(s, &bus->stream_list, list) {
+                struct azx_dev *azx_dev = stream_to_azx_dev(s);
+                azx_dev->irq_pending = 0;
+        }
+        spin_unlock_irq(&bus->reg_lock);
 }
 
 static int azx_acquire_irq(struct azx *chip, int do_disconnect)
 {
+        struct hdac_bus *bus = azx_bus(chip);
+
         if (request_irq(chip->pci->irq, azx_interrupt,
                         chip->msi ? 0 : IRQF_SHARED,
                         KBUILD_MODNAME, chip)) {
@@ -660,7 +694,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
                         snd_card_disconnect(chip->card);
                 return -1;
         }
-        chip->irq = chip->pci->irq;
+        bus->irq = chip->pci->irq;
         pci_intx(chip->pci, !chip->msi);
         return 0;
 }
@@ -673,8 +707,8 @@ static unsigned int azx_via_get_position(struct azx *chip,
         unsigned int mod_link_pos, mod_dma_pos, mod_mini_pos;
         unsigned int fifo_size;
 
-        link_pos = azx_sd_readl(chip, azx_dev, SD_LPIB);
-        if (azx_dev->substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+        link_pos = snd_hdac_stream_get_pos_lpib(azx_stream(azx_dev));
+        if (azx_dev->core.substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 /* Playback, no problem using link position */
                 return link_pos;
         }
@@ -683,13 +717,14 @@ static unsigned int azx_via_get_position(struct azx *chip,
         /* For new chipset,
          * use mod to get the DMA position just like old chipset
          */
-        mod_dma_pos = le32_to_cpu(*azx_dev->posbuf);
-        mod_dma_pos %= azx_dev->period_bytes;
+        mod_dma_pos = le32_to_cpu(*azx_dev->core.posbuf);
+        mod_dma_pos %= azx_dev->core.period_bytes;
 
         /* azx_dev->fifo_size can't get FIFO size of in stream.
          * Get from base address + offset.
          */
-        fifo_size = readw(chip->remap_addr + VIA_IN_STREAM0_FIFO_SIZE_OFFSET);
+        fifo_size = readw(azx_bus(chip)->remap_addr +
+                          VIA_IN_STREAM0_FIFO_SIZE_OFFSET);
 
         if (azx_dev->insufficient) {
                 /* Link position never gather than FIFO size */
@@ -700,20 +735,20 @@ static unsigned int azx_via_get_position(struct azx *chip,
         }
 
         if (link_pos <= fifo_size)
-                mini_pos = azx_dev->bufsize + link_pos - fifo_size;
+                mini_pos = azx_dev->core.bufsize + link_pos - fifo_size;
         else
                 mini_pos = link_pos - fifo_size;
 
         /* Find nearest previous boudary */
-        mod_mini_pos = mini_pos % azx_dev->period_bytes;
-        mod_link_pos = link_pos % azx_dev->period_bytes;
+        mod_mini_pos = mini_pos % azx_dev->core.period_bytes;
+        mod_link_pos = link_pos % azx_dev->core.period_bytes;
         if (mod_link_pos >= fifo_size)
                 bound_pos = link_pos - mod_link_pos;
         else if (mod_dma_pos >= mod_mini_pos)
                 bound_pos = mini_pos - mod_mini_pos;
         else {
-                bound_pos = mini_pos - mod_mini_pos + azx_dev->period_bytes;
-                if (bound_pos >= azx_dev->bufsize)
+                bound_pos = mini_pos - mod_mini_pos + azx_dev->core.period_bytes;
+                if (bound_pos >= azx_dev->core.bufsize)
                         bound_pos = 0;
         }
 
@@ -755,9 +790,9 @@ static int param_set_xint(const char *val, const struct kernel_param *kp)
         mutex_lock(&card_list_lock);
         list_for_each_entry(hda, &card_list, list) {
                 chip = &hda->chip;
-                if (!chip->bus || chip->disabled)
+                if (!hda->probe_continued || chip->disabled)
                         continue;
-                snd_hda_set_power_save(chip->bus, power_save * 1000);
+                snd_hda_set_power_save(&chip->bus, power_save * 1000);
         }
         mutex_unlock(&card_list_lock);
         return 0;
@@ -767,6 +802,50 @@ static int param_set_xint(const char *val, const struct kernel_param *kp)
 #define azx_del_card_list(chip) /* NOP */
 #endif /* CONFIG_PM */
 
+/* Intel HSW/BDW display HDA controller is in GPU. Both its power and link BCLK
+ * depends on GPU. Two Extended Mode registers EM4 (M value) and EM5 (N Value)
+ * are used to convert CDClk (Core Display Clock) to 24MHz BCLK:
+ * BCLK = CDCLK * M / N
+ * The values will be lost when the display power well is disabled and need to
+ * be restored to avoid abnormal playback speed.
+ */
+static void haswell_set_bclk(struct hda_intel *hda)
+{
+        struct azx *chip = &hda->chip;
+        int cdclk_freq;
+        unsigned int bclk_m, bclk_n;
+
+        if (!hda->need_i915_power)
+                return;
+
+        cdclk_freq = snd_hdac_get_display_clk(azx_bus(chip));
+        switch (cdclk_freq) {
+        case 337500:
+                bclk_m = 16;
+                bclk_n = 225;
+                break;
+
+        case 450000:
+        default: /* default CDCLK 450MHz */
+                bclk_m = 4;
+                bclk_n = 75;
+                break;
+
+        case 540000:
+                bclk_m = 4;
+                bclk_n = 90;
+                break;
+
+        case 675000:
+                bclk_m = 8;
+                bclk_n = 225;
+                break;
+        }
+
+        azx_writew(chip, HSW_EM4, bclk_m);
+        azx_writew(chip, HSW_EM5, bclk_n);
+}
+
 #if defined(CONFIG_PM_SLEEP) || defined(SUPPORT_VGA_SWITCHEROO)
 /*
  * power management
@@ -776,6 +855,7 @@ static int azx_suspend(struct device *dev)
         struct snd_card *card = dev_get_drvdata(dev);
         struct azx *chip;
         struct hda_intel *hda;
+        struct hdac_bus *bus;
 
         if (!card)
                 return 0;
@@ -785,19 +865,23 @@ static int azx_suspend(struct device *dev)
         if (chip->disabled || hda->init_failed)
                 return 0;
 
+        bus = azx_bus(chip);
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         azx_clear_irq_pending(chip);
         azx_stop_chip(chip);
         azx_enter_link_reset(chip);
-        if (chip->irq >= 0) {
-                free_irq(chip->irq, chip);
-                chip->irq = -1;
+        if (bus->irq >= 0) {
+                free_irq(bus->irq, chip);
+                bus->irq = -1;
         }
 
         if (chip->msi)
                 pci_disable_msi(chip->pci);
-        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
-                hda_display_power(hda, false);
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL
+                && hda->need_i915_power)
+                snd_hdac_display_power(bus, false);
+
+        trace_azx_suspend(chip);
         return 0;
 }
 
@@ -816,8 +900,9 @@ static int azx_resume(struct device *dev)
         if (chip->disabled || hda->init_failed)
                 return 0;
 
-        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
-                hda_display_power(hda, true);
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL
+                && hda->need_i915_power) {
+                snd_hdac_display_power(azx_bus(chip), true);
                 haswell_set_bclk(hda);
         }
         if (chip->msi)
@@ -827,9 +912,11 @@ static int azx_resume(struct device *dev)
                 return -EIO;
         azx_init_pci(chip);
 
-        azx_init_chip(chip, true);
+        hda_intel_init_chip(chip, true);
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+
+        trace_azx_resume(chip);
         return 0;
 }
 #endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */
@@ -859,9 +946,11 @@ static int azx_runtime_suspend(struct device *dev)
         azx_stop_chip(chip);
         azx_enter_link_reset(chip);
         azx_clear_irq_pending(chip);
-        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
-                hda_display_power(hda, false);
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL
+                && hda->need_i915_power)
+                snd_hdac_display_power(azx_bus(chip), false);
 
+        trace_azx_runtime_suspend(chip);
         return 0;
 }
 
@@ -870,7 +959,7 @@ static int azx_runtime_resume(struct device *dev)
         struct snd_card *card = dev_get_drvdata(dev);
         struct azx *chip;
         struct hda_intel *hda;
-        struct hda_bus *bus;
+        struct hdac_bus *bus;
         struct hda_codec *codec;
         int status;
 
@@ -885,20 +974,24 @@ static int azx_runtime_resume(struct device *dev)
         if (!azx_has_pm_runtime(chip))
                 return 0;
 
-        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
-                hda_display_power(hda, true);
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL
+                && hda->need_i915_power) {
+                bus =  azx_bus(chip);
+                snd_hdac_display_power(bus, true);
                 haswell_set_bclk(hda);
+                /* toggle codec wakeup bit for STATESTS read */
+                snd_hdac_set_codec_wakeup(bus, true);
+                snd_hdac_set_codec_wakeup(bus, false);
         }
 
         /* Read STATESTS before controller reset */
         status = azx_readw(chip, STATESTS);
 
         azx_init_pci(chip);
-        azx_init_chip(chip, true);
+        hda_intel_init_chip(chip, true);
 
-        bus = chip->bus;
-        if (status && bus) {
-                list_for_each_codec(codec, bus)
+        if (status) {
+                list_for_each_codec(codec, &chip->bus)
                         if (status & (1 << codec->addr))
                                 schedule_delayed_work(&codec->jackpoll_work,
                                                       codec->jackpoll_interval);
@@ -908,6 +1001,7 @@ static int azx_runtime_resume(struct device *dev)
         azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) &
                         ~STATESTS_INT_MASK);
 
+        trace_azx_runtime_resume(chip);
         return 0;
 }
 
@@ -926,7 +1020,7 @@ static int azx_runtime_idle(struct device *dev)
                 return 0;
 
         if (!power_save_controller || !azx_has_pm_runtime(chip) ||
-            chip->bus->core.codec_powered)
+            azx_bus(chip)->codec_powered)
                 return -EBUSY;
 
         return 0;
@@ -964,7 +1058,7 @@ static void azx_vs_set_state(struct pci_dev *pci,
         if (chip->disabled == disabled)
                 return;
 
-        if (!chip->bus) {
+        if (!hda->probe_continued) {
                 chip->disabled = disabled;
                 if (!disabled) {
                         dev_info(chip->card->dev,
@@ -985,11 +1079,11 @@ static void azx_vs_set_state(struct pci_dev *pci,
                          * put ourselves there */
                         pci->current_state = PCI_D3cold;
                         chip->disabled = true;
-                        if (snd_hda_lock_devices(chip->bus))
+                        if (snd_hda_lock_devices(&chip->bus))
                                 dev_warn(chip->card->dev,
                                          "Cannot lock devices!\n");
                 } else {
-                        snd_hda_unlock_devices(chip->bus);
+                        snd_hda_unlock_devices(&chip->bus);
                         pm_runtime_get_noresume(card->dev);
                         chip->disabled = false;
                         azx_resume(card->dev);
@@ -1006,11 +1100,11 @@ static bool azx_vs_can_switch(struct pci_dev *pci)
         wait_for_completion(&hda->probe_wait);
         if (hda->init_failed)
                 return false;
-        if (chip->disabled || !chip->bus)
+        if (chip->disabled || !hda->probe_continued)
                 return true;
-        if (snd_hda_lock_devices(chip->bus))
+        if (snd_hda_lock_devices(&chip->bus))
                 return false;
-        snd_hda_unlock_devices(chip->bus);
+        snd_hda_unlock_devices(&chip->bus);
         return true;
 }
 
@@ -1043,7 +1137,7 @@ static int register_vga_switcheroo(struct azx *chip)
          */
         err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops,
                                                     VGA_SWITCHEROO_DIS,
-                                                    chip->bus != NULL);
+                                                    hda->probe_continued);
         if (err < 0)
                 return err;
         hda->vga_switcheroo_registered = 1;
@@ -1066,7 +1160,7 @@ static int azx_free(struct azx *chip)
 {
         struct pci_dev *pci = chip->pci;
         struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
-        int i;
+        struct hdac_bus *bus = azx_bus(chip);
 
         if (azx_has_pm_runtime(chip) && chip->running)
                 pm_runtime_get_noresume(&pci->dev);
@@ -1077,42 +1171,54 @@ static int azx_free(struct azx *chip)
         complete_all(&hda->probe_wait);
 
         if (use_vga_switcheroo(hda)) {
-                if (chip->disabled && chip->bus)
-                        snd_hda_unlock_devices(chip->bus);
+                if (chip->disabled && hda->probe_continued)
+                        snd_hda_unlock_devices(&chip->bus);
                 if (hda->vga_switcheroo_registered)
                         vga_switcheroo_unregister_client(chip->pci);
         }
 
-        if (chip->initialized) {
+        if (bus->chip_init) {
                 azx_clear_irq_pending(chip);
-                for (i = 0; i < chip->num_streams; i++)
-                        azx_stream_stop(chip, &chip->azx_dev[i]);
+                azx_stop_all_streams(chip);
                 azx_stop_chip(chip);
         }
 
-        if (chip->irq >= 0)
-                free_irq(chip->irq, (void*)chip);
+        if (bus->irq >= 0)
+                free_irq(bus->irq, (void*)chip);
         if (chip->msi)
                 pci_disable_msi(chip->pci);
-        iounmap(chip->remap_addr);
+        iounmap(bus->remap_addr);
 
         azx_free_stream_pages(chip);
+        azx_free_streams(chip);
+        snd_hdac_bus_exit(bus);
+
         if (chip->region_requested)
                 pci_release_regions(chip->pci);
+
         pci_disable_device(chip->pci);
-        kfree(chip->azx_dev);
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
         release_firmware(chip->fw);
 #endif
+
         if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
-                hda_display_power(hda, false);
-                hda_i915_exit(hda);
+                if (hda->need_i915_power)
+                        snd_hdac_display_power(bus, false);
+                snd_hdac_i915_exit(bus);
         }
         kfree(hda);
 
         return 0;
 }
 
+static int azx_dev_disconnect(struct snd_device *device)
+{
+        struct azx *chip = device->device_data;
+
+        chip->bus.shutdown = 1;
+        return 0;
+}
+
 static int azx_dev_free(struct snd_device *device)
 {
         return azx_free(device->device_data);
@@ -1279,9 +1385,9 @@ static void check_probe_mask(struct azx *chip, int dev)
         /* check forced option */
         if (chip->codec_probe_mask != -1 &&
             (chip->codec_probe_mask & AZX_FORCE_CODEC_MASK)) {
-                chip->codec_mask = chip->codec_probe_mask & 0xff;
+                azx_bus(chip)->codec_mask = chip->codec_probe_mask & 0xff;
                 dev_info(chip->card->dev, "codec_mask forced to 0x%x\n",
-                         chip->codec_mask);
+                         (int)azx_bus(chip)->codec_mask);
         }
 }
 
@@ -1368,12 +1474,15 @@ static void azx_probe_work(struct work_struct *work)
 /*
  * constructor
  */
+static const struct hdac_io_ops pci_hda_io_ops;
+static const struct hda_controller_ops pci_hda_ops;
+
 static int azx_create(struct snd_card *card, struct pci_dev *pci,
                       int dev, unsigned int driver_caps,
-                      const struct hda_controller_ops *hda_ops,
                       struct azx **rchip)
 {
         static struct snd_device_ops ops = {
+                .dev_disconnect = azx_dev_disconnect,
                 .dev_free = azx_dev_free,
         };
         struct hda_intel *hda;
@@ -1393,12 +1502,10 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
         }
 
         chip = &hda->chip;
-        spin_lock_init(&chip->reg_lock);
         mutex_init(&chip->open_mutex);
         chip->card = card;
         chip->pci = pci;
-        chip->ops = hda_ops;
-        chip->irq = -1;
+        chip->ops = &pci_hda_ops;
         chip->driver_caps = driver_caps;
         chip->driver_type = driver_caps & 0xff;
         check_msi(chip);
@@ -1430,6 +1537,13 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
         }
         chip->bdl_pos_adj = bdl_pos_adj;
 
+        err = azx_bus_init(chip, model[dev], &pci_hda_io_ops);
+        if (err < 0) {
+                kfree(hda);
+                pci_disable_device(pci);
+                return err;
+        }
+
         err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
         if (err < 0) {
                 dev_err(card->dev, "Error creating device [card]!\n");
@@ -1450,6 +1564,7 @@ static int azx_first_init(struct azx *chip)
         int dev = chip->dev_index;
         struct pci_dev *pci = chip->pci;
         struct snd_card *card = chip->card;
+        struct hdac_bus *bus = azx_bus(chip);
         int err;
         unsigned short gcap;
         unsigned int dma_bits = 64;
@@ -1469,9 +1584,9 @@ static int azx_first_init(struct azx *chip)
                 return err;
         chip->region_requested = 1;
 
-        chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = pci_ioremap_bar(pci, 0);
-        if (chip->remap_addr == NULL) {
+        bus->addr = pci_resource_start(pci, 0);
+        bus->remap_addr = pci_ioremap_bar(pci, 0);
+        if (bus->remap_addr == NULL) {
                 dev_err(card->dev, "ioremap error\n");
                 return -ENXIO;
         }
@@ -1489,7 +1604,7 @@ static int azx_first_init(struct azx *chip)
                 return -EBUSY;
 
         pci_set_master(pci);
-        synchronize_irq(chip->irq);
+        synchronize_irq(bus->irq);
 
         gcap = azx_readw(chip, GCAP);
         dev_dbg(card->dev, "chipset global capabilities = 0x%x\n", gcap);
@@ -1531,11 +1646,11 @@ static int azx_first_init(struct azx *chip)
         /* 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
@@ -1566,17 +1681,15 @@ static int azx_first_init(struct azx *chip)
         chip->capture_index_offset = 0;
         chip->playback_index_offset = chip->capture_streams;
         chip->num_streams = chip->playback_streams + chip->capture_streams;
-        chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev),
-                                GFP_KERNEL);
-        if (!chip->azx_dev)
-                return -ENOMEM;
 
-        err = azx_alloc_stream_pages(chip);
+        /* initialize streams */
+        err = azx_init_streams(chip);
         if (err < 0)
                 return err;
 
-        /* initialize streams */
-        azx_init_stream(chip);
+        err = azx_alloc_stream_pages(chip);
+        if (err < 0)
+                return err;
 
         /* initialize chip */
         azx_init_pci(chip);
@@ -1588,10 +1701,10 @@ static int azx_first_init(struct azx *chip)
                 haswell_set_bclk(hda);
         }
 
-        azx_init_chip(chip, (probe_only[dev] & 2) == 0);
+        hda_intel_init_chip(chip, (probe_only[dev] & 2) == 0);
 
         /* codec detection */
-        if (!chip->codec_mask) {
+        if (!azx_bus(chip)->codec_mask) {
                 dev_err(card->dev, "no codecs found!\n");
                 return -ENODEV;
         }
@@ -1601,7 +1714,7 @@ static int azx_first_init(struct azx *chip)
                 sizeof(card->shortname));
         snprintf(card->longname, sizeof(card->longname),
                  "%s at 0x%lx irq %i",
-                 card->shortname, chip->addr, chip->irq);
+                 card->shortname, bus->addr, bus->irq);
 
         return 0;
 }
@@ -1670,10 +1783,11 @@ static u8 pci_azx_readb(u8 __iomem *addr)
 
 static int disable_msi_reset_irq(struct azx *chip)
 {
+        struct hdac_bus *bus = azx_bus(chip);
         int err;
 
-        free_irq(chip->irq, chip);
-        chip->irq = -1;
+        free_irq(bus->irq, chip);
+        bus->irq = -1;
         pci_disable_msi(chip->pci);
         chip->msi = 0;
         err = azx_acquire_irq(chip, 1);
@@ -1684,15 +1798,16 @@ static int disable_msi_reset_irq(struct azx *chip)
 }
 
 /* DMA page allocation helpers.  */
-static int dma_alloc_pages(struct azx *chip,
+static int dma_alloc_pages(struct hdac_bus *bus,
                            int type,
                            size_t size,
                            struct snd_dma_buffer *buf)
 {
+        struct azx *chip = bus_to_azx(bus);
         int err;
 
         err = snd_dma_alloc_pages(type,
-                                  chip->card->dev,
+                                  bus->dev,
                                   size, buf);
         if (err < 0)
                 return err;
@@ -1700,8 +1815,10 @@ static int dma_alloc_pages(struct azx *chip,
         return 0;
 }
 
-static void dma_free_pages(struct azx *chip, struct snd_dma_buffer *buf)
+static void dma_free_pages(struct hdac_bus *bus, struct snd_dma_buffer *buf)
 {
+        struct azx *chip = bus_to_azx(bus);
+
         mark_pages_wc(chip, buf, false);
         snd_dma_free_pages(buf);
 }
@@ -1714,9 +1831,6 @@ static int substream_alloc_pages(struct azx *chip,
         int ret;
 
         mark_runtime_wc(chip, azx_dev, substream, false);
-        azx_dev->bufsize = 0;
-        azx_dev->period_bytes = 0;
-        azx_dev->format_val = 0;
         ret = snd_pcm_lib_malloc_pages(substream, size);
         if (ret < 0)
                 return ret;
@@ -1743,20 +1857,24 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream,
 #endif
 }
 
-static const struct hda_controller_ops pci_hda_ops = {
+static const struct hdac_io_ops pci_hda_io_ops = {
         .reg_writel = pci_azx_writel,
         .reg_readl = pci_azx_readl,
         .reg_writew = pci_azx_writew,
         .reg_readw = pci_azx_readw,
         .reg_writeb = pci_azx_writeb,
         .reg_readb = pci_azx_readb,
-        .disable_msi_reset_irq = disable_msi_reset_irq,
         .dma_alloc_pages = dma_alloc_pages,
         .dma_free_pages = dma_free_pages,
+};
+
+static const struct hda_controller_ops pci_hda_ops = {
+        .disable_msi_reset_irq = disable_msi_reset_irq,
         .substream_alloc_pages = substream_alloc_pages,
         .substream_free_pages = substream_free_pages,
         .pcm_mmap_prepare = pcm_mmap_prepare,
         .position_check = azx_position_check,
+        .link_power = azx_intel_link_power,
 };
 
 static int azx_probe(struct pci_dev *pci,
@@ -1783,8 +1901,7 @@ static int azx_probe(struct pci_dev *pci,
                 return err;
         }
 
-        err = azx_create(card, pci, dev, pci_id->driver_data,
-                         &pci_hda_ops, &chip);
+        err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
         if (err < 0)
                 goto out_free;
         card->private_data = chip;
@@ -1846,23 +1963,33 @@ static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = {
 static int azx_probe_continue(struct azx *chip)
 {
         struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
+        struct hdac_bus *bus = azx_bus(chip);
         struct pci_dev *pci = chip->pci;
         int dev = chip->dev_index;
         int err;
 
-        /* Request power well for Haswell HDA controller and codec */
+        hda->probe_continued = 1;
+
+        /* Request display power well for the HDA controller or codec. For
+         * Haswell/Broadwell, both the display HDA controller and codec need
+         * this power. For other platforms, like Baytrail/Braswell, only the
+         * display codec needs the power and it can be released after probe.
+         */
         if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
-#ifdef CONFIG_SND_HDA_I915
-                err = hda_i915_init(hda);
+                /* Baytral/Braswell controllers don't need this power */
+                if (pci->device != 0x0f04 && pci->device != 0x2284)
+                        hda->need_i915_power = 1;
+
+                err = snd_hdac_i915_init(bus);
                 if (err < 0)
-                        goto out_free;
-                err = hda_display_power(hda, true);
+                        goto i915_power_fail;
+
+                err = snd_hdac_display_power(bus, true);
                 if (err < 0) {
                         dev_err(chip->card->dev,
                                 "Cannot turn on display power on i915\n");
-                        goto out_free;
+                        goto i915_power_fail;
                 }
-#endif
         }
 
         err = azx_first_init(chip);
@@ -1874,17 +2001,13 @@ static int azx_probe_continue(struct azx *chip)
 #endif
 
         /* create codec instances */
-        err = azx_bus_create(chip, model[dev]);
-        if (err < 0)
-                goto out_free;
-
         err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]);
         if (err < 0)
                 goto out_free;
 
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
         if (chip->fw) {
-                err = snd_hda_load_patch(chip->bus, chip->fw->size,
+                err = snd_hda_load_patch(&chip->bus, chip->fw->size,
                                          chip->fw->data);
                 if (err < 0)
                         goto out_free;
@@ -1906,11 +2029,16 @@ static int azx_probe_continue(struct azx *chip)
 
         chip->running = 1;
         azx_add_card_list(chip);
-        snd_hda_set_power_save(chip->bus, power_save * 1000);
+        snd_hda_set_power_save(&chip->bus, power_save * 1000);
         if (azx_has_pm_runtime(chip) || hda->use_vga_switcheroo)
                 pm_runtime_put_noidle(&pci->dev);
 
 out_free:
+        if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL
+                && !hda->need_i915_power)
+                snd_hdac_display_power(bus, false);
+
+i915_power_fail:
         if (err < 0)
                 hda->init_failed = 1;
         complete_all(&hda->probe_wait);
diff --git a/sound/pci/hda/hda_intel.h b/sound/pci/hda/hda_intel.h
index d5231f7216a7..354f0bbed833 100644
--- a/sound/pci/hda/hda_intel.h
+++ b/sound/pci/hda/hda_intel.h
@@ -16,7 +16,6 @@
 #ifndef __SOUND_HDA_INTEL_H
 #define __SOUND_HDA_INTEL_H
 
-#include <drm/i915_component.h>
 #include "hda_controller.h"
 
 struct hda_intel {
@@ -34,6 +33,7 @@ struct hda_intel {
 
         /* extra flags */
         unsigned int irq_pending_warned:1;
+        unsigned int probe_continued:1;
 
         /* VGA-switcheroo setup */
         unsigned int use_vga_switcheroo:1;
@@ -43,29 +43,7 @@ struct hda_intel {
         /* secondary power domain for hdmi audio under vga device */
         struct dev_pm_domain hdmi_pm_domain;
 
-        /* i915 component interface */
-        struct i915_audio_component audio_component;
+        bool need_i915_power:1; /* the hda controller needs i915 power */
 };
 
-#ifdef CONFIG_SND_HDA_I915
-int hda_display_power(struct hda_intel *hda, bool enable);
-void haswell_set_bclk(struct hda_intel *hda);
-int hda_i915_init(struct hda_intel *hda);
-int hda_i915_exit(struct hda_intel *hda);
-#else
-static inline int hda_display_power(struct hda_intel *hda, bool enable)
-{
-        return 0;
-}
-static inline void haswell_set_bclk(struct hda_intel *hda) { return; }
-static inline int hda_i915_init(struct hda_intel *hda)
-{
-        return -ENODEV;
-}
-static inline int hda_i915_exit(struct hda_intel *hda)
-{
-        return 0;
-}
-#endif
-
 #endif
diff --git a/sound/pci/hda/hda_intel_trace.h b/sound/pci/hda/hda_intel_trace.h
index 7b5e4c2cf9d5..0922d8b1b17d 100644
--- a/sound/pci/hda/hda_intel_trace.h
+++ b/sound/pci/hda/hda_intel_trace.h
@@ -7,52 +7,43 @@
 
 #include <linux/tracepoint.h>
 
-struct azx;
-struct azx_dev;
+DECLARE_EVENT_CLASS(hda_pm,
+        TP_PROTO(struct azx *chip),
 
-TRACE_EVENT(azx_pcm_trigger,
-
-        TP_PROTO(struct azx *chip, struct azx_dev *dev, int cmd),
-
-        TP_ARGS(chip, dev, cmd),
+        TP_ARGS(chip),
 
         TP_STRUCT__entry(
-                __field( int, card )
-                __field( int, idx )
-                __field( int, cmd )
+                __field(int, dev_index)
         ),
 
         TP_fast_assign(
-                __entry->card = (chip)->card->number;
-                __entry->idx = (dev)->index;
-                __entry->cmd = cmd;
+                __entry->dev_index = (chip)->dev_index;
         ),
 
-        TP_printk("[%d:%d] cmd=%d", __entry->card, __entry->idx, __entry->cmd)
+        TP_printk("card index: %d", __entry->dev_index)
 );
 
-TRACE_EVENT(azx_get_position,
-
-    TP_PROTO(struct azx *chip, struct azx_dev *dev, unsigned int pos, unsigned int delay),
-
-            TP_ARGS(chip, dev, pos, delay),
+DEFINE_EVENT(hda_pm, azx_suspend,
+        TP_PROTO(struct azx *chip),
+        TP_ARGS(chip)
+);
 
-        TP_STRUCT__entry(
-                __field( int, card )
-                __field( int, idx )
-                __field( unsigned int, pos )
-                __field( unsigned int, delay )
-        ),
+DEFINE_EVENT(hda_pm, azx_resume,
+        TP_PROTO(struct azx *chip),
+        TP_ARGS(chip)
+);
 
-        TP_fast_assign(
-                __entry->card = (chip)->card->number;
-                __entry->idx = (dev)->index;
-                __entry->pos = pos;
-                __entry->delay = delay;
-        ),
+#ifdef CONFIG_PM
+DEFINE_EVENT(hda_pm, azx_runtime_suspend,
+        TP_PROTO(struct azx *chip),
+        TP_ARGS(chip)
+);
 
-        TP_printk("[%d:%d] pos=%u, delay=%u", __entry->card, __entry->idx, __entry->pos, __entry->delay)
+DEFINE_EVENT(hda_pm, azx_runtime_resume,
+        TP_PROTO(struct azx *chip),
+        TP_ARGS(chip)
 );
+#endif
 
 #endif /* _TRACE_HDA_INTEL_H */
 
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index d7cfe7b8c32b..366efbf87d41 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -132,11 +132,11 @@ void snd_hda_jack_tbl_clear(struct hda_codec *codec)
 
         for (i = 0; i < codec->jacktbl.used; i++, jack++) {
                 struct hda_jack_callback *cb, *next;
-#ifdef CONFIG_SND_HDA_INPUT_JACK
+
                 /* free jack instances manually when clearing/reconfiguring */
                 if (!codec->bus->shutdown && jack->jack)
                         snd_device_free(codec->card, jack->jack);
-#endif
+
                 for (cb = jack->callback; cb; cb = next) {
                         next = cb->next;
                         kfree(cb);
@@ -337,20 +337,15 @@ void snd_hda_jack_report_sync(struct hda_codec *codec)
         jack = codec->jacktbl.list;
         for (i = 0; i < codec->jacktbl.used; i++, jack++)
                 if (jack->nid) {
-                        if (!jack->kctl || jack->block_report)
+                        if (!jack->jack || jack->block_report)
                                 continue;
                         state = get_jack_plug_state(jack->pin_sense);
-                        snd_kctl_jack_report(codec->card, jack->kctl, state);
-#ifdef CONFIG_SND_HDA_INPUT_JACK
-                        if (jack->jack)
-                                snd_jack_report(jack->jack,
-                                                state ? jack->type : 0);
-#endif
+                        snd_jack_report(jack->jack,
+                                        state ? jack->type : 0);
                 }
 }
 EXPORT_SYMBOL_GPL(snd_hda_jack_report_sync);
 
-#ifdef CONFIG_SND_HDA_INPUT_JACK
 /* guess the jack type from the pin-config */
 static int get_input_jack_type(struct hda_codec *codec, hda_nid_t nid)
 {
@@ -377,54 +372,42 @@ static void hda_free_jack_priv(struct snd_jack *jack)
         jacks->nid = 0;
         jacks->jack = NULL;
 }
-#endif
 
 /**
  * snd_hda_jack_add_kctl - Add a kctl for the given pin
  * @codec: the HDA codec
  * @nid: pin NID to assign
  * @name: string name for the jack
- * @idx: index number for the jack
  * @phantom_jack: flag to deal as a phantom jack
  *
  * This assigns a jack-detection kctl to the given pin.  The kcontrol
  * will have the given name and index.
  */
 static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
-                          const char *name, int idx, bool phantom_jack)
+                          const char *name, bool phantom_jack)
 {
         struct hda_jack_tbl *jack;
-        struct snd_kcontrol *kctl;
-        int err, state;
+        int err, state, type;
 
         jack = snd_hda_jack_tbl_new(codec, nid);
         if (!jack)
                 return 0;
-        if (jack->kctl)
+        if (jack->jack)
                 return 0; /* already created */
-        kctl = snd_kctl_jack_new(name, idx, codec);
-        if (!kctl)
-                return -ENOMEM;
-        err = snd_hda_ctl_add(codec, nid, kctl);
+
+        type = get_input_jack_type(codec, nid);
+        err = snd_jack_new(codec->card, name, type,
+                           &jack->jack, true, phantom_jack);
         if (err < 0)
                 return err;
-        jack->kctl = kctl;
-        jack->phantom_jack = !!phantom_jack;
 
+        jack->phantom_jack = !!phantom_jack;
+        jack->type = type;
+        jack->jack->private_data = jack;
+        jack->jack->private_free = hda_free_jack_priv;
         state = snd_hda_jack_detect(codec, nid);
-        snd_kctl_jack_report(codec->card, kctl, state);
-#ifdef CONFIG_SND_HDA_INPUT_JACK
-        if (!phantom_jack) {
-                jack->type = get_input_jack_type(codec, nid);
-                err = snd_jack_new(codec->card, name, jack->type,
-                                   &jack->jack);
-                if (err < 0)
-                        return err;
-                jack->jack->private_data = jack;
-                jack->jack->private_free = hda_free_jack_priv;
-                snd_jack_report(jack->jack, state ? jack->type : 0);
-        }
-#endif
+        snd_jack_report(jack->jack, state ? jack->type : 0);
+
         return 0;
 }
 
@@ -433,44 +416,23 @@ static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
  * @codec: the HDA codec
  * @nid: pin NID
  * @name: the name string for the jack ctl
- * @idx: the ctl index for the jack ctl
  *
  * This is a simple helper calling __snd_hda_jack_add_kctl().
  */
 int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
-                          const char *name, int idx)
+                          const char *name)
 {
-        return __snd_hda_jack_add_kctl(codec, nid, name, idx, false);
+        return __snd_hda_jack_add_kctl(codec, nid, name, false);
 }
 EXPORT_SYMBOL_GPL(snd_hda_jack_add_kctl);
 
-/* get the unique index number for the given kctl name */
-static int get_unique_index(struct hda_codec *codec, const char *name, int idx)
-{
-        struct hda_jack_tbl *jack;
-        int i, len = strlen(name);
- again:
-        jack = codec->jacktbl.list;
-        for (i = 0; i < codec->jacktbl.used; i++, jack++) {
-                /* jack->kctl.id contains "XXX Jack" name string with index */
-                if (jack->kctl &&
-                    !strncmp(name, jack->kctl->id.name, len) &&
-                    !strcmp(" Jack", jack->kctl->id.name + len) &&
-                    jack->kctl->id.index == idx) {
-                        idx++;
-                        goto again;
-                }
-        }
-        return idx;
-}
-
 static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
                          const struct auto_pin_cfg *cfg,
                          const char *base_name)
 {
         unsigned int def_conf, conn;
         char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        int idx, err;
+        int err;
         bool phantom_jack;
 
         if (!nid)
@@ -482,16 +444,14 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
         phantom_jack = (conn != AC_JACK_PORT_COMPLEX) ||
                        !is_jack_detectable(codec, nid);
 
-        if (base_name) {
+        if (base_name)
                 strlcpy(name, base_name, sizeof(name));
-                idx = 0;
-        } else
-                snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx);
+        else
+                snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), NULL);
         if (phantom_jack)
                 /* Example final name: "Internal Mic Phantom Jack" */
                 strncat(name, " Phantom", sizeof(name) - strlen(name) - 1);
-        idx = get_unique_index(codec, name, idx);
-        err = __snd_hda_jack_add_kctl(codec, nid, name, idx, phantom_jack);
+        err = __snd_hda_jack_add_kctl(codec, nid, name, phantom_jack);
         if (err < 0)
                 return err;
 
diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h
index b279e327a23b..387d30984dfe 100644
--- a/sound/pci/hda/hda_jack.h
+++ b/sound/pci/hda/hda_jack.h
@@ -39,11 +39,8 @@ struct hda_jack_tbl {
         unsigned int block_report:1;    /* in a transitional state - do not report to userspace */
         hda_nid_t gating_jack;          /* valid when gating jack plugged */
         hda_nid_t gated_jack;           /* gated is dependent on this jack */
-        struct snd_kcontrol *kctl;      /* assigned kctl for jack-detection */
-#ifdef CONFIG_SND_HDA_INPUT_JACK
         int type;
         struct snd_jack *jack;
-#endif
 };
 
 struct hda_jack_tbl *
@@ -85,7 +82,7 @@ static inline bool snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid)
 bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid);
 
 int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
-                          const char *name, int idx);
+                          const char *name);
 int snd_hda_jack_add_kctls(struct hda_codec *codec,
                            const struct auto_pin_cfg *cfg);
 
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
index 2e4fd5c56d3b..477742cb70a2 100644
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@ -87,13 +87,13 @@ MODULE_PARM_DESC(power_save,
 /*
  * DMA page allocation ops.
  */
-static int dma_alloc_pages(struct azx *chip, int type, size_t size,
+static int dma_alloc_pages(struct hdac_bus *bus, int type, size_t size,
                            struct snd_dma_buffer *buf)
 {
-        return snd_dma_alloc_pages(type, chip->card->dev, size, buf);
+        return snd_dma_alloc_pages(type, bus->dev, size, buf);
 }
 
-static void dma_free_pages(struct azx *chip, struct snd_dma_buffer *buf)
+static void dma_free_pages(struct hdac_bus *bus, struct snd_dma_buffer *buf)
 {
         snd_dma_free_pages(buf);
 }
@@ -102,11 +102,6 @@ static int substream_alloc_pages(struct azx *chip,
                                  struct snd_pcm_substream *substream,
                                  size_t size)
 {
-        struct azx_dev *azx_dev = get_azx_dev(substream);
-
-        azx_dev->bufsize = 0;
-        azx_dev->period_bytes = 0;
-        azx_dev->format_val = 0;
         return snd_pcm_lib_malloc_pages(substream, size);
 }
 
@@ -173,7 +168,7 @@ static u8 hda_tegra_readb(u8 *addr)
         return (v >> shift) & 0xff;
 }
 
-static const struct hda_controller_ops hda_tegra_ops = {
+static const struct hdac_io_ops hda_tegra_io_ops = {
         .reg_writel = hda_tegra_writel,
         .reg_readl = hda_tegra_readl,
         .reg_writew = hda_tegra_writew,
@@ -182,6 +177,9 @@ static const struct hda_controller_ops hda_tegra_ops = {
         .reg_readb = hda_tegra_readb,
         .dma_alloc_pages = dma_alloc_pages,
         .dma_free_pages = dma_free_pages,
+};
+
+static const struct hda_controller_ops hda_tegra_ops = {
         .substream_alloc_pages = substream_alloc_pages,
         .substream_free_pages = substream_free_pages,
 };
@@ -282,21 +280,29 @@ static const struct dev_pm_ops hda_tegra_pm = {
         SET_SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume)
 };
 
+static int hda_tegra_dev_disconnect(struct snd_device *device)
+{
+        struct azx *chip = device->device_data;
+
+        chip->bus.shutdown = 1;
+        return 0;
+}
+
 /*
  * destructor
  */
 static int hda_tegra_dev_free(struct snd_device *device)
 {
-        int i;
         struct azx *chip = device->device_data;
 
-        if (chip->initialized) {
-                for (i = 0; i < chip->num_streams; i++)
-                        azx_stream_stop(chip, &chip->azx_dev[i]);
+        if (azx_bus(chip)->chip_init) {
+                azx_stop_all_streams(chip);
                 azx_stop_chip(chip);
         }
 
         azx_free_stream_pages(chip);
+        azx_free_streams(chip);
+        snd_hdac_bus_exit(azx_bus(chip));
 
         return 0;
 }
@@ -304,31 +310,40 @@ static int hda_tegra_dev_free(struct snd_device *device)
 static int hda_tegra_init_chip(struct azx *chip, struct platform_device *pdev)
 {
         struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);
+        struct hdac_bus *bus = azx_bus(chip);
         struct device *dev = hda->dev;
         struct resource *res;
         int err;
 
         hda->hda_clk = devm_clk_get(dev, "hda");
-        if (IS_ERR(hda->hda_clk))
+        if (IS_ERR(hda->hda_clk)) {
+                dev_err(dev, "failed to get hda clock\n");
                 return PTR_ERR(hda->hda_clk);
+        }
         hda->hda2codec_2x_clk = devm_clk_get(dev, "hda2codec_2x");
-        if (IS_ERR(hda->hda2codec_2x_clk))
+        if (IS_ERR(hda->hda2codec_2x_clk)) {
+                dev_err(dev, "failed to get hda2codec_2x clock\n");
                 return PTR_ERR(hda->hda2codec_2x_clk);
+        }
         hda->hda2hdmi_clk = devm_clk_get(dev, "hda2hdmi");
-        if (IS_ERR(hda->hda2hdmi_clk))
+        if (IS_ERR(hda->hda2hdmi_clk)) {
+                dev_err(dev, "failed to get hda2hdmi clock\n");
                 return PTR_ERR(hda->hda2hdmi_clk);
+        }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         hda->regs = devm_ioremap_resource(dev, res);
         if (IS_ERR(hda->regs))
                 return PTR_ERR(hda->regs);
 
-        chip->remap_addr = hda->regs + HDA_BAR0;
-        chip->addr = res->start + HDA_BAR0;
+        bus->remap_addr = hda->regs + HDA_BAR0;
+        bus->addr = res->start + HDA_BAR0;
 
         err = hda_tegra_enable_clocks(hda);
-        if (err)
+        if (err) {
+                dev_err(dev, "failed to get enable clocks\n");
                 return err;
+        }
 
         hda_tegra_init(hda);
 
@@ -337,6 +352,7 @@ static int hda_tegra_init_chip(struct azx *chip, struct platform_device *pdev)
 
 static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
 {
+        struct hdac_bus *bus = azx_bus(chip);
         struct snd_card *card = chip->card;
         int err;
         unsigned short gcap;
@@ -354,9 +370,9 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
                         irq_id);
                 return err;
         }
-        chip->irq = irq_id;
+        bus->irq = irq_id;
 
-        synchronize_irq(chip->irq);
+        synchronize_irq(bus->irq);
 
         gcap = azx_readw(chip, GCAP);
         dev_dbg(card->dev, "chipset global capabilities = 0x%x\n", gcap);
@@ -374,23 +390,26 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
         chip->capture_index_offset = 0;
         chip->playback_index_offset = chip->capture_streams;
         chip->num_streams = chip->playback_streams + chip->capture_streams;
-        chip->azx_dev = devm_kcalloc(card->dev, chip->num_streams,
-                                     sizeof(*chip->azx_dev), GFP_KERNEL);
-        if (!chip->azx_dev)
-                return -ENOMEM;
 
-        err = azx_alloc_stream_pages(chip);
-        if (err < 0)
+        /* initialize streams */
+        err = azx_init_streams(chip);
+        if (err < 0) {
+                dev_err(card->dev, "failed to initialize streams: %d\n", err);
                 return err;
+        }
 
-        /* initialize streams */
-        azx_init_stream(chip);
+        err = azx_alloc_stream_pages(chip);
+        if (err < 0) {
+                dev_err(card->dev, "failed to allocate stream pages: %d\n",
+                        err);
+                return err;
+        }
 
         /* initialize chip */
         azx_init_chip(chip, 1);
 
         /* codec detection */
-        if (!chip->codec_mask) {
+        if (!bus->codec_mask) {
                 dev_err(card->dev, "no codecs found!\n");
                 return -ENODEV;
         }
@@ -399,7 +418,7 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
         strcpy(card->shortname, "tegra-hda");
         snprintf(card->longname, sizeof(card->longname),
                  "%s at 0x%lx irq %i",
-                 card->shortname, chip->addr, chip->irq);
+                 card->shortname, bus->addr, bus->irq);
 
         return 0;
 }
@@ -409,10 +428,10 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
  */
 static int hda_tegra_create(struct snd_card *card,
                             unsigned int driver_caps,
-                            const struct hda_controller_ops *hda_ops,
                             struct hda_tegra *hda)
 {
         static struct snd_device_ops ops = {
+                .dev_disconnect = hda_tegra_dev_disconnect,
                 .dev_free = hda_tegra_dev_free,
         };
         struct azx *chip;
@@ -420,11 +439,9 @@ static int hda_tegra_create(struct snd_card *card,
 
         chip = &hda->chip;
 
-        spin_lock_init(&chip->reg_lock);
         mutex_init(&chip->open_mutex);
         chip->card = card;
-        chip->ops = hda_ops;
-        chip->irq = -1;
+        chip->ops = &hda_tegra_ops;
         chip->driver_caps = driver_caps;
         chip->driver_type = driver_caps & 0xff;
         chip->dev_index = 0;
@@ -435,6 +452,10 @@ static int hda_tegra_create(struct snd_card *card,
         chip->single_cmd = false;
         chip->snoop = true;
 
+        err = azx_bus_init(chip, NULL, &hda_tegra_io_ops);
+        if (err < 0)
+                return err;
+
         err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
         if (err < 0) {
                 dev_err(card->dev, "Error creating device\n");
@@ -452,11 +473,12 @@ MODULE_DEVICE_TABLE(of, hda_tegra_match);
 
 static int hda_tegra_probe(struct platform_device *pdev)
 {
+        const unsigned int driver_flags = AZX_DCAPS_RIRB_DELAY |
+                                          AZX_DCAPS_CORBRP_SELF_CLEAR;
         struct snd_card *card;
         struct azx *chip;
         struct hda_tegra *hda;
         int err;
-        const unsigned int driver_flags = AZX_DCAPS_RIRB_DELAY;
 
         hda = devm_kzalloc(&pdev->dev, sizeof(*hda), GFP_KERNEL);
         if (!hda)
@@ -471,7 +493,7 @@ static int hda_tegra_probe(struct platform_device *pdev)
                 return err;
         }
 
-        err = hda_tegra_create(card, driver_flags, &hda_tegra_ops, hda);
+        err = hda_tegra_create(card, driver_flags, hda);
         if (err < 0)
                 goto out_free;
         card->private_data = chip;
@@ -483,10 +505,6 @@ static int hda_tegra_probe(struct platform_device *pdev)
                 goto out_free;
 
         /* create codec instances */
-        err = azx_bus_create(chip, NULL);
-        if (err < 0)
-                goto out_free;
-
         err = azx_probe_codecs(chip, 0);
         if (err < 0)
                 goto out_free;
@@ -500,7 +518,7 @@ static int hda_tegra_probe(struct platform_device *pdev)
                 goto out_free;
 
         chip->running = 1;
-        snd_hda_set_power_save(chip->bus, power_save * 1000);
+        snd_hda_set_power_save(&chip->bus, power_save * 1000);
 
         return 0;
 
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 4a4e7b282e4f..8dec790dae45 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -43,8 +43,6 @@
 #define FLOAT_TWO       0x40000000
 #define FLOAT_MINUS_5   0xc0a00000
 
-#define UNSOL_TAG_HP    0x10
-#define UNSOL_TAG_AMIC1 0x12
 #define UNSOL_TAG_DSP   0x16
 
 #define DSP_DMA_WRITE_BUFLEN_INIT (1UL<<18)
@@ -703,8 +701,8 @@ struct ca0132_spec {
         unsigned int num_mixers;
         const struct hda_verb *base_init_verbs;
         const struct hda_verb *base_exit_verbs;
-        const struct hda_verb *init_verbs[5];
-        unsigned int num_init_verbs;  /* exclude base init verbs */
+        const struct hda_verb *chip_init_verbs;
+        struct hda_verb *spec_init_verbs;
         struct auto_pin_cfg autocfg;
 
         /* Nodes configurations */
@@ -719,6 +717,8 @@ struct ca0132_spec {
         unsigned int num_inputs;
         hda_nid_t shared_mic_nid;
         hda_nid_t shared_out_nid;
+        hda_nid_t unsol_tag_hp;
+        hda_nid_t unsol_tag_amic1;
 
         /* chip access */
         struct mutex chipio_mutex; /* chip access mutex */
@@ -748,6 +748,7 @@ struct ca0132_spec {
 
         struct hda_codec *codec;
         struct delayed_work unsol_hp_work;
+        int quirk;
 
 #ifdef ENABLE_TUNING_CONTROLS
         long cur_ctl_vals[TUNING_CTLS_COUNT];
@@ -755,6 +756,19 @@ struct ca0132_spec {
 };
 
 /*
+ * CA0132 quirks table
+ */
+enum {
+        QUIRK_NONE,
+        QUIRK_ALIENWARE,
+};
+
+static const struct snd_pci_quirk ca0132_quirks[] = {
+        SND_PCI_QUIRK(0x1028, 0x0685, "Alienware 15", QUIRK_ALIENWARE),
+        {}
+};
+
+/*
  * CA0132 codec access
  */
 static unsigned int codec_send_command(struct hda_codec *codec, hda_nid_t nid,
@@ -2052,11 +2066,8 @@ static int dma_convert_to_hda_format(struct hda_codec *codec,
 {
         unsigned int format_val;
 
-        format_val = snd_hda_calc_stream_format(codec,
-                                sample_rate,
-                                channels,
-                                SNDRV_PCM_FORMAT_S32_LE,
-                                32, 0);
+        format_val = snd_hdac_calc_stream_format(sample_rate,
+                                channels, SNDRV_PCM_FORMAT_S32_LE, 32, 0);
 
         if (hda_format)
                 *hda_format = (unsigned short)format_val;
@@ -3227,7 +3238,7 @@ static void ca0132_unsol_hp_delayed(struct work_struct *work)
         struct hda_jack_tbl *jack;
 
         ca0132_select_out(spec->codec);
-        jack = snd_hda_jack_tbl_get(spec->codec, UNSOL_TAG_HP);
+        jack = snd_hda_jack_tbl_get(spec->codec, spec->unsol_tag_hp);
         if (jack) {
                 jack->block_report = 0;
                 snd_hda_jack_report_sync(spec->codec);
@@ -4417,8 +4428,9 @@ static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
 
 static void ca0132_init_unsol(struct hda_codec *codec)
 {
-        snd_hda_jack_detect_enable_callback(codec, UNSOL_TAG_HP, hp_callback);
-        snd_hda_jack_detect_enable_callback(codec, UNSOL_TAG_AMIC1,
+        struct ca0132_spec *spec = codec->spec;
+        snd_hda_jack_detect_enable_callback(codec, spec->unsol_tag_hp, hp_callback);
+        snd_hda_jack_detect_enable_callback(codec, spec->unsol_tag_amic1,
                                             amic_callback);
         snd_hda_jack_detect_enable_callback(codec, UNSOL_TAG_DSP,
                                             ca0132_process_dsp_response);
@@ -4479,17 +4491,6 @@ static struct hda_verb ca0132_init_verbs0[] = {
         {}
 };
 
-static struct hda_verb ca0132_init_verbs1[] = {
-        {0x10, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | UNSOL_TAG_HP},
-        {0x12, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | UNSOL_TAG_AMIC1},
-        /* config EAPD */
-        {0x0b, 0x78D, 0x00},
-        /*{0x0b, AC_VERB_SET_EAPD_BTLENABLE, 0x02},*/
-        /*{0x10, 0x78D, 0x02},*/
-        /*{0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x02},*/
-        {}
-};
-
 static void ca0132_init_chip(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
@@ -4569,8 +4570,8 @@ static int ca0132_init(struct hda_codec *codec)
 
         init_input(codec, cfg->dig_in_pin, spec->dig_in);
 
-        for (i = 0; i < spec->num_init_verbs; i++)
-                snd_hda_sequence_write(codec, spec->init_verbs[i]);
+        snd_hda_sequence_write(codec, spec->chip_init_verbs);
+        snd_hda_sequence_write(codec, spec->spec_init_verbs);
 
         ca0132_select_out(codec);
         ca0132_select_mic(codec);
@@ -4591,6 +4592,7 @@ static void ca0132_free(struct hda_codec *codec)
         snd_hda_sequence_write(codec, spec->base_exit_verbs);
         ca0132_exit_chip(codec);
         snd_hda_power_down(codec);
+        kfree(spec->spec_init_verbs);
         kfree(codec->spec);
 }
 
@@ -4617,18 +4619,25 @@ static void ca0132_config(struct hda_codec *codec)
 
         spec->num_outputs = 2;
         spec->out_pins[0] = 0x0b; /* speaker out */
-        spec->out_pins[1] = 0x10; /* headphone out */
+        if (spec->quirk == QUIRK_ALIENWARE) {
+                codec_dbg(codec, "ca0132_config: QUIRK_ALIENWARE applied.\n");
+                spec->out_pins[1] = 0x0f;
+        } else{
+                spec->out_pins[1] = 0x10; /* headphone out */
+        }
         spec->shared_out_nid = 0x2;
+        spec->unsol_tag_hp = spec->out_pins[1];
 
-        spec->num_inputs = 3;
         spec->adcs[0] = 0x7; /* digital mic / analog mic1 */
         spec->adcs[1] = 0x8; /* analog mic2 */
         spec->adcs[2] = 0xa; /* what u hear */
-        spec->shared_mic_nid = 0x7;
 
+        spec->num_inputs = 3;
         spec->input_pins[0] = 0x12;
         spec->input_pins[1] = 0x11;
         spec->input_pins[2] = 0x13;
+        spec->shared_mic_nid = 0x7;
+        spec->unsol_tag_amic1 = spec->input_pins[0];
 
         /* SPDIF I/O */
         spec->dig_out = 0x05;
@@ -4641,10 +4650,56 @@ static void ca0132_config(struct hda_codec *codec)
         cfg->dig_in_type = HDA_PCM_TYPE_SPDIF;
 }
 
+static int ca0132_prepare_verbs(struct hda_codec *codec)
+{
+/* Verbs + terminator (an empty element) */
+#define NUM_SPEC_VERBS 4
+        struct ca0132_spec *spec = codec->spec;
+
+        spec->chip_init_verbs = ca0132_init_verbs0;
+        spec->spec_init_verbs = kzalloc(sizeof(struct hda_verb) * NUM_SPEC_VERBS, GFP_KERNEL);
+        if (!spec->spec_init_verbs)
+                return -ENOMEM;
+
+        /* HP jack autodetection */
+        spec->spec_init_verbs[0].nid = spec->unsol_tag_hp;
+        spec->spec_init_verbs[0].param = AC_VERB_SET_UNSOLICITED_ENABLE;
+        spec->spec_init_verbs[0].verb = AC_USRSP_EN | spec->unsol_tag_hp;
+
+        /* MIC1 jack autodetection */
+        spec->spec_init_verbs[1].nid = spec->unsol_tag_amic1;
+        spec->spec_init_verbs[1].param = AC_VERB_SET_UNSOLICITED_ENABLE;
+        spec->spec_init_verbs[1].verb = AC_USRSP_EN | spec->unsol_tag_amic1;
+
+        /* config EAPD */
+        spec->spec_init_verbs[2].nid = 0x0b;
+        spec->spec_init_verbs[2].param = 0x78D;
+        spec->spec_init_verbs[2].verb = 0x00;
+
+        /* Previously commented configuration */
+        /*
+        spec->spec_init_verbs[3].nid = 0x0b;
+        spec->spec_init_verbs[3].param = AC_VERB_SET_EAPD_BTLENABLE;
+        spec->spec_init_verbs[3].verb = 0x02;
+
+        spec->spec_init_verbs[4].nid = 0x10;
+        spec->spec_init_verbs[4].param = 0x78D;
+        spec->spec_init_verbs[4].verb = 0x02;
+
+        spec->spec_init_verbs[5].nid = 0x10;
+        spec->spec_init_verbs[5].param = AC_VERB_SET_EAPD_BTLENABLE;
+        spec->spec_init_verbs[5].verb = 0x02;
+        */
+
+        /* Terminator: spec->spec_init_verbs[NUM_SPEC_VERBS-1] */
+        return 0;
+}
+
 static int patch_ca0132(struct hda_codec *codec)
 {
         struct ca0132_spec *spec;
         int err;
+        const struct snd_pci_quirk *quirk;
 
         codec_dbg(codec, "patch_ca0132\n");
 
@@ -4654,15 +4709,19 @@ static int patch_ca0132(struct hda_codec *codec)
         codec->spec = spec;
         spec->codec = codec;
 
+        /* Detect codec quirk */
+        quirk = snd_pci_quirk_lookup(codec->bus->pci, ca0132_quirks);
+        if (quirk)
+                spec->quirk = quirk->value;
+        else
+                spec->quirk = QUIRK_NONE;
+
         spec->dsp_state = DSP_DOWNLOAD_INIT;
         spec->num_mixers = 1;
         spec->mixers[0] = ca0132_mixer;
 
         spec->base_init_verbs = ca0132_base_init_verbs;
         spec->base_exit_verbs = ca0132_base_exit_verbs;
-        spec->init_verbs[0] = ca0132_init_verbs0;
-        spec->init_verbs[1] = ca0132_init_verbs1;
-        spec->num_init_verbs = 2;
 
         INIT_DELAYED_WORK(&spec->unsol_hp_work, ca0132_unsol_hp_delayed);
 
@@ -4670,6 +4729,10 @@ static int patch_ca0132(struct hda_codec *codec)
 
         ca0132_config(codec);
 
+        err = ca0132_prepare_verbs(codec);
+        if (err < 0)
+                return err;
+
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL);
         if (err < 0)
                 return err;
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 5f44f60a6389..ef8a5627a281 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -592,7 +592,7 @@ static int eld_proc_new(struct hdmi_spec_per_pin *per_pin, int index)
 static void eld_proc_free(struct hdmi_spec_per_pin *per_pin)
 {
         if (!per_pin->codec->bus->shutdown && per_pin->proc_entry) {
-                snd_device_free(per_pin->codec->card, per_pin->proc_entry);
+                snd_info_free_entry(per_pin->proc_entry);
                 per_pin->proc_entry = NULL;
         }
 }
@@ -2049,9 +2049,7 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec)
         for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
                 struct hda_pcm *info;
                 struct hda_pcm_stream *pstr;
-                struct hdmi_spec_per_pin *per_pin;
 
-                per_pin = get_pin(spec, pin_idx);
                 info = snd_hda_codec_pcm_new(codec, "HDMI %d", pin_idx);
                 if (!info)
                         return -ENOMEM;
@@ -2081,7 +2079,7 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx)
                 strncat(hdmi_str, " Phantom",
                         sizeof(hdmi_str) - strlen(hdmi_str) - 1);
 
-        return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0);
+        return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str);
 }
 
 static int generic_hdmi_build_controls(struct hda_codec *codec)
@@ -2335,6 +2333,15 @@ static int patch_generic_hdmi(struct hda_codec *codec)
                 intel_haswell_fixup_enable_dp12(codec);
         }
 
+        /* For Valleyview/Cherryview, only the display codec is in the display
+         * power well and can use link_power ops to request/release the power.
+         * For Haswell/Broadwell, the controller is also in the power well and
+         * can cover the codec power request, and so need not set this flag.
+         * For previous platforms, there is no such power well feature.
+         */
+        if (is_valleyview_plus(codec))
+                codec->core.link_power_control = 1;
+
         if (is_haswell_plus(codec) || is_valleyview_plus(codec))
                 codec->depop_delay = 0;
 
@@ -2923,6 +2930,171 @@ static int patch_nvhdmi(struct hda_codec *codec)
 }
 
 /*
+ * The HDA codec on NVIDIA Tegra contains two scratch registers that are
+ * accessed using vendor-defined verbs. These registers can be used for
+ * interoperability between the HDA and HDMI drivers.
+ */
+
+/* Audio Function Group node */
+#define NVIDIA_AFG_NID 0x01
+
+/*
+ * The SCRATCH0 register is used to notify the HDMI codec of changes in audio
+ * format. On Tegra, bit 31 is used as a trigger that causes an interrupt to
+ * be raised in the HDMI codec. The remainder of the bits is arbitrary. This
+ * implementation stores the HDA format (see AC_FMT_*) in bits [15:0] and an
+ * additional bit (at position 30) to signal the validity of the format.
+ *
+ * | 31      | 30    | 29  16 | 15   0 |
+ * +---------+-------+--------+--------+
+ * | TRIGGER | VALID | UNUSED | FORMAT |
+ * +-----------------------------------|
+ *
+ * Note that for the trigger bit to take effect it needs to change value
+ * (i.e. it needs to be toggled).
+ */
+#define NVIDIA_GET_SCRATCH0             0xfa6
+#define NVIDIA_SET_SCRATCH0_BYTE0       0xfa7
+#define NVIDIA_SET_SCRATCH0_BYTE1       0xfa8
+#define NVIDIA_SET_SCRATCH0_BYTE2       0xfa9
+#define NVIDIA_SET_SCRATCH0_BYTE3       0xfaa
+#define NVIDIA_SCRATCH_TRIGGER (1 << 7)
+#define NVIDIA_SCRATCH_VALID   (1 << 6)
+
+#define NVIDIA_GET_SCRATCH1             0xfab
+#define NVIDIA_SET_SCRATCH1_BYTE0       0xfac
+#define NVIDIA_SET_SCRATCH1_BYTE1       0xfad
+#define NVIDIA_SET_SCRATCH1_BYTE2       0xfae
+#define NVIDIA_SET_SCRATCH1_BYTE3       0xfaf
+
+/*
+ * The format parameter is the HDA audio format (see AC_FMT_*). If set to 0,
+ * the format is invalidated so that the HDMI codec can be disabled.
+ */
+static void tegra_hdmi_set_format(struct hda_codec *codec, unsigned int format)
+{
+        unsigned int value;
+
+        /* bits [31:30] contain the trigger and valid bits */
+        value = snd_hda_codec_read(codec, NVIDIA_AFG_NID, 0,
+                                   NVIDIA_GET_SCRATCH0, 0);
+        value = (value >> 24) & 0xff;
+
+        /* bits [15:0] are used to store the HDA format */
+        snd_hda_codec_write(codec, NVIDIA_AFG_NID, 0,
+                            NVIDIA_SET_SCRATCH0_BYTE0,
+                            (format >> 0) & 0xff);
+        snd_hda_codec_write(codec, NVIDIA_AFG_NID, 0,
+                            NVIDIA_SET_SCRATCH0_BYTE1,
+                            (format >> 8) & 0xff);
+
+        /* bits [16:24] are unused */
+        snd_hda_codec_write(codec, NVIDIA_AFG_NID, 0,
+                            NVIDIA_SET_SCRATCH0_BYTE2, 0);
+
+        /*
+         * Bit 30 signals that the data is valid and hence that HDMI audio can
+         * be enabled.
+         */
+        if (format == 0)
+                value &= ~NVIDIA_SCRATCH_VALID;
+        else
+                value |= NVIDIA_SCRATCH_VALID;
+
+        /*
+         * Whenever the trigger bit is toggled, an interrupt is raised in the
+         * HDMI codec. The HDMI driver will use that as trigger to update its
+         * configuration.
+         */
+        value ^= NVIDIA_SCRATCH_TRIGGER;
+
+        snd_hda_codec_write(codec, NVIDIA_AFG_NID, 0,
+                            NVIDIA_SET_SCRATCH0_BYTE3, value);
+}
+
+static int tegra_hdmi_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                  struct hda_codec *codec,
+                                  unsigned int stream_tag,
+                                  unsigned int format,
+                                  struct snd_pcm_substream *substream)
+{
+        int err;
+
+        err = generic_hdmi_playback_pcm_prepare(hinfo, codec, stream_tag,
+                                                format, substream);
+        if (err < 0)
+                return err;
+
+        /* notify the HDMI codec of the format change */
+        tegra_hdmi_set_format(codec, format);
+
+        return 0;
+}
+
+static int tegra_hdmi_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                  struct hda_codec *codec,
+                                  struct snd_pcm_substream *substream)
+{
+        /* invalidate the format in the HDMI codec */
+        tegra_hdmi_set_format(codec, 0);
+
+        return generic_hdmi_playback_pcm_cleanup(hinfo, codec, substream);
+}
+
+static struct hda_pcm *hda_find_pcm_by_type(struct hda_codec *codec, int type)
+{
+        struct hdmi_spec *spec = codec->spec;
+        unsigned int i;
+
+        for (i = 0; i < spec->num_pins; i++) {
+                struct hda_pcm *pcm = get_pcm_rec(spec, i);
+
+                if (pcm->pcm_type == type)
+                        return pcm;
+        }
+
+        return NULL;
+}
+
+static int tegra_hdmi_build_pcms(struct hda_codec *codec)
+{
+        struct hda_pcm_stream *stream;
+        struct hda_pcm *pcm;
+        int err;
+
+        err = generic_hdmi_build_pcms(codec);
+        if (err < 0)
+                return err;
+
+        pcm = hda_find_pcm_by_type(codec, HDA_PCM_TYPE_HDMI);
+        if (!pcm)
+                return -ENODEV;
+
+        /*
+         * Override ->prepare() and ->cleanup() operations to notify the HDMI
+         * codec about format changes.
+         */
+        stream = &pcm->stream[SNDRV_PCM_STREAM_PLAYBACK];
+        stream->ops.prepare = tegra_hdmi_pcm_prepare;
+        stream->ops.cleanup = tegra_hdmi_pcm_cleanup;
+
+        return 0;
+}
+
+static int patch_tegra_hdmi(struct hda_codec *codec)
+{
+        int err;
+
+        err = patch_generic_hdmi(codec);
+        if (err)
+                return err;
+
+        codec->patch_ops.build_pcms = tegra_hdmi_build_pcms;
+
+        return 0;
+}
+
+/*
  * ATI/AMD-specific implementations
  */
 
@@ -3321,7 +3493,10 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
 { .id = 0x10de001a, .name = "GPU 1a HDMI/DP",   .patch = patch_nvhdmi },
 { .id = 0x10de001b, .name = "GPU 1b HDMI/DP",   .patch = patch_nvhdmi },
 { .id = 0x10de001c, .name = "GPU 1c HDMI/DP",   .patch = patch_nvhdmi },
-{ .id = 0x10de0028, .name = "Tegra12x HDMI",    .patch = patch_nvhdmi },
+{ .id = 0x10de0020, .name = "Tegra30 HDMI",     .patch = patch_tegra_hdmi },
+{ .id = 0x10de0022, .name = "Tegra114 HDMI",    .patch = patch_tegra_hdmi },
+{ .id = 0x10de0028, .name = "Tegra124 HDMI",    .patch = patch_tegra_hdmi },
+{ .id = 0x10de0029, .name = "Tegra210 HDMI/DP", .patch = patch_tegra_hdmi },
 { .id = 0x10de0040, .name = "GPU 40 HDMI/DP",   .patch = patch_nvhdmi },
 { .id = 0x10de0041, .name = "GPU 41 HDMI/DP",   .patch = patch_nvhdmi },
 { .id = 0x10de0042, .name = "GPU 42 HDMI/DP",   .patch = patch_nvhdmi },
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 06199e4e930f..4d11fbfca5e2 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3583,6 +3583,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
                 break;
         case 0x10ec0286:
         case 0x10ec0288:
+        case 0x10ec0298:
                 alc_process_coef_fw(codec, coef0288);
                 break;
         case 0x10ec0292:
@@ -3657,6 +3658,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
                 break;
         case 0x10ec0286:
         case 0x10ec0288:
+        case 0x10ec0298:
                 alc_update_coef_idx(codec, 0x4f, 0x000c, 0);
                 snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
                 alc_process_coef_fw(codec, coef0288);
@@ -3736,6 +3738,7 @@ static void alc_headset_mode_default(struct hda_codec *codec)
                 break;
         case 0x10ec0286:
         case 0x10ec0288:
+        case 0x10ec0298:
                 alc_process_coef_fw(codec, coef0288);
                 break;
                 break;
@@ -3801,6 +3804,9 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
         case 0x10ec0283:
                 alc_process_coef_fw(codec, coef0233);
                 break;
+        case 0x10ec0298:
+                alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020);/* Headset output enable */
+                /* ALC298 jack type setting is the same with ALC286/ALC288 */
         case 0x10ec0286:
         case 0x10ec0288:
                 alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400);
@@ -3869,6 +3875,9 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
         case 0x10ec0283:
                 alc_process_coef_fw(codec, coef0233);
                 break;
+        case 0x10ec0298:
+                alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0010);/* Headset output enable */
+                /* ALC298 jack type setting is the same with ALC286/ALC288 */
         case 0x10ec0286:
         case 0x10ec0288:
                 alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xe400);
@@ -3931,6 +3940,9 @@ static void alc_determine_headset_type(struct hda_codec *codec)
                 val = alc_read_coef_idx(codec, 0x46);
                 is_ctia = (val & 0x0070) == 0x0070;
                 break;
+        case 0x10ec0298:
+                alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020); /* Headset output enable */
+                /* ALC298 check jack type is the same with ALC286/ALC288 */
         case 0x10ec0286:
         case 0x10ec0288:
                 alc_process_coef_fw(codec, coef0288);
@@ -4190,11 +4202,18 @@ static void alc_shutup_dell_xps13(struct hda_codec *codec)
 static void alc_fixup_dell_xps13(struct hda_codec *codec,
                                 const struct hda_fixup *fix, int action)
 {
-        if (action == HDA_FIXUP_ACT_PROBE) {
-                struct alc_spec *spec = codec->spec;
-                struct hda_input_mux *imux = &spec->gen.input_mux;
-                int i;
+        struct alc_spec *spec = codec->spec;
+        struct hda_input_mux *imux = &spec->gen.input_mux;
+        int i;
 
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                /* mic pin 0x19 must be initialized with Vref Hi-Z, otherwise
+                 * it causes a click noise at start up
+                 */
+                snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);
+                break;
+        case HDA_FIXUP_ACT_PROBE:
                 spec->shutup = alc_shutup_dell_xps13;
 
                 /* Make the internal mic the default input source. */
@@ -4204,6 +4223,7 @@ static void alc_fixup_dell_xps13(struct hda_codec *codec,
                                 break;
                         }
                 }
+                break;
         }
 }
 
@@ -4484,6 +4504,7 @@ enum {
         ALC288_FIXUP_DELL_HEADSET_MODE,
         ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
         ALC288_FIXUP_DELL_XPS_13_GPIO6,
+        ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -5006,6 +5027,16 @@ static const struct hda_fixup alc269_fixups[] = {
                 .chained = true,
                 .chain_id = ALC288_FIXUP_DELL1_MIC_NO_PRESENCE
         },
+        [ALC298_FIXUP_DELL1_MIC_NO_PRESENCE] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+                        { 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_HEADSET_MODE
+        },
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -5211,6 +5242,8 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
         {.id = ALC271_FIXUP_DMIC, .name = "alc271-dmic"},
         {.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"},
         {.id = ALC269_FIXUP_HEADSET_MIC, .name = "headset-mic"},
+        {.id = ALC269_FIXUP_HEADSET_MODE, .name = "headset-mode"},
+        {.id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, .name = "headset-mode-no-hp-mic"},
         {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},
         {.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
         {.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
@@ -5269,6 +5302,13 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
         {0x1d, 0x40700001}, \
         {0x1e, 0x411111f0}
 
+#define ALC298_STANDARD_PINS \
+        {0x18, 0x411111f0}, \
+        {0x19, 0x411111f0}, \
+        {0x1a, 0x411111f0}, \
+        {0x1e, 0x411111f0}, \
+        {0x1f, 0x411111f0}
+
 static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
         SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
                 ALC255_STANDARD_PINS,
@@ -5534,6 +5574,14 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                 {0x16, 0x411111f0},
                 {0x18, 0x411111f0},
                 {0x19, 0x411111f0}),
+        SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
+                ALC298_STANDARD_PINS,
+                {0x12, 0x90a60130},
+                {0x13, 0x40000000},
+                {0x14, 0x411111f0},
+                {0x17, 0x90170140},
+                {0x1d, 0x4068a36d},
+                {0x21, 0x03211020}),
         {}
 };
 
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c
index 0a4ad5feb82e..d51703e30523 100644
--- a/sound/pci/hda/thinkpad_helper.c
+++ b/sound/pci/hda/thinkpad_helper.c
@@ -72,6 +72,7 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,
                 if (led_set_func(TPACPI_LED_MUTE, false) >= 0) {
                         old_vmaster_hook = spec->vmaster_mute.hook;
                         spec->vmaster_mute.hook = update_tpacpi_mute_led;
+                        spec->vmaster_mute_enum = 1;
                         removefunc = false;
                 }
                 if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) {
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index f7b1523e8a82..8ae3bb7975d1 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2530,8 +2530,8 @@ static int snd_ice1712_create(struct snd_card *card,
         if (err < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                 dev_err(card->dev,
                         "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index 601315a1f58f..32c6f6ba1442 100644
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
@@ -981,7 +981,7 @@ static int snd_lx6464es_create(struct snd_card *card,
         pci_set_master(pci);
 
         /* check if we can restrict PCI DMA transfers to 32 bits */
-        err = pci_set_dma_mask(pci, DMA_BIT_MASK(32));
+        err = dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
         if (err < 0) {
                 dev_err(card->dev,
                         "architecture does not support 32bit PCI busmaster DMA\n");
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 9be660993bd0..72e89cedc52d 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2537,8 +2537,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
                 return -EIO;
 
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                 dev_err(card->dev,
                         "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index c3a9f39f8d61..bc81b9f75ed0 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1269,7 +1269,7 @@ static int snd_mixart_probe(struct pci_dev *pci,
         pci_set_master(pci);
 
         /* check if we can restrict PCI DMA transfers to 32 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                 dev_err(&pci->dev,
                         "architecture does not support 32bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index 6ce68604c25e..90ac479f389f 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -286,7 +286,7 @@ static void xonar_ds_init(struct oxygen *chip)
         xonar_enable_output(chip);
 
         snd_jack_new(chip->card, "Headphone",
-                     SND_JACK_HEADPHONE, &data->hp_jack);
+                     SND_JACK_HEADPHONE, &data->hp_jack, false, false);
         xonar_ds_handle_hp_jack(chip);
 
         snd_component_add(chip->card, "WM8776");
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index c6092e48ceb6..9293235281dc 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1537,7 +1537,7 @@ static int pcxhr_probe(struct pci_dev *pci,
         pci_set_master(pci);
 
         /* check if we can restrict PCI DMA transfers to 32 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                 dev_err(&pci->dev,
                         "architecture does not support 32bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index efe669b80256..f3860b850210 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -383,9 +383,9 @@ static void __sis_map_silence(struct sis7019 *sis)
 {
         /* Helper function: must hold sis->voice_lock on entry */
         if (!sis->silence_users)
-                sis->silence_dma_addr = pci_map_single(sis->pci,
+                sis->silence_dma_addr = dma_map_single(&sis->pci->dev,
                                                 sis->suspend_state[0],
-                                                4096, PCI_DMA_TODEVICE);
+                                                4096, DMA_TO_DEVICE);
         sis->silence_users++;
 }
 
@@ -394,8 +394,8 @@ static void __sis_unmap_silence(struct sis7019 *sis)
         /* Helper function: must hold sis->voice_lock on entry */
         sis->silence_users--;
         if (!sis->silence_users)
-                pci_unmap_single(sis->pci, sis->silence_dma_addr, 4096,
-                                        PCI_DMA_TODEVICE);
+                dma_unmap_single(&sis->pci->dev, sis->silence_dma_addr, 4096,
+                                        DMA_TO_DEVICE);
 }
 
 static void sis_free_voice(struct sis7019 *sis, struct voice *voice)
@@ -1325,7 +1325,7 @@ static int sis_chip_create(struct snd_card *card,
         if (rc)
                 goto error_out;
 
-        rc = pci_set_dma_mask(pci, DMA_BIT_MASK(30));
+        rc = dma_set_mask(&pci->dev, DMA_BIT_MASK(30));
         if (rc < 0) {
                 dev_err(&pci->dev, "architecture does not support 30-bit PCI busmaster DMA");
                 goto error_out_enabled;
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 0f40624a4275..1b6fad7d4d56 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1259,8 +1259,8 @@ static int snd_sonicvibes_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                 dev_err(card->dev,
                         "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index b72be035f785..599d2b7eb5b8 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3551,8 +3551,8 @@ int snd_trident_create(struct snd_card *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 30 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(30)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(30)) < 0) {
                 dev_err(card->dev,
                         "architecture does not support 30bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 0d1c27e911b8..d7627bae0836 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -52,7 +52,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
                 return -EINVAL;
 
         if (strncmp(adapter->name, "mac-io", 6))
-                return 0; /* ignored */
+                return -EINVAL; /* ignored */
 
         memset(&info, 0, sizeof(struct i2c_board_info));
         strlcpy(info.type, "keywest", I2C_NAME_SIZE);
@@ -100,7 +100,6 @@ static struct i2c_driver keywest_driver = {
         .driver = {
                 .name = "PMac Keywest Audio",
         },
-        .attach_adapter = keywest_attach_adapter,
         .probe = keywest_probe,
         .remove = keywest_remove,
         .id_table = keywest_i2c_id,
@@ -132,16 +131,32 @@ int snd_pmac_tumbler_post_init(void)
 /* exported */
 int snd_pmac_keywest_init(struct pmac_keywest *i2c)
 {
-        int err;
+        struct i2c_adapter *adap;
+        int err, i = 0;
 
         if (keywest_ctx)
                 return -EBUSY;
 
+        adap = i2c_get_adapter(0);
+        if (!adap)
+                return -EPROBE_DEFER;
+
         keywest_ctx = i2c;
 
         if ((err = i2c_add_driver(&keywest_driver))) {
                 snd_printk(KERN_ERR "cannot register keywest i2c driver\n");
+                i2c_put_adapter(adap);
                 return err;
         }
-        return 0;
+
+        /* We assume Macs have consecutive I2C bus numbers starting at 0 */
+        while (adap) {
+                err = keywest_attach_adapter(adap);
+                if (!err)
+                        return 0;
+                i2c_put_adapter(adap);
+                adap = i2c_get_adapter(++i);
+        }
+
+        return -ENODEV;
 }
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 9f60c25c4568..87ca9806f3ee 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -48,7 +48,7 @@ int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,
         INIT_LIST_HEAD(&jack->jack_zones);
         BLOCKING_INIT_NOTIFIER_HEAD(&jack->notifier);
 
-        ret = snd_jack_new(card->snd_card, id, type, &jack->jack);
+        ret = snd_jack_new(card->snd_card, id, type, &jack->jack, false, false);
         if (ret)
                 return ret;
 
@@ -197,6 +197,7 @@ int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
 
                 INIT_LIST_HEAD(&pins[i].list);
                 list_add(&(pins[i].list), &jack->pins);
+                snd_jack_add_new_kctl(jack->jack, pins[i].pin, pins[i].mask);
         }
 
         /* Update to reflect the last reported status; canned jack
diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c
index ab37add269ae..82e350e9501c 100644
--- a/sound/synth/emux/emux_oss.c
+++ b/sound/synth/emux/emux_oss.c
@@ -118,12 +118,8 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)
         if (snd_BUG_ON(!arg || !emu))
                 return -ENXIO;
 
-        mutex_lock(&emu->register_mutex);
-
-        if (!snd_emux_inc_count(emu)) {
-                mutex_unlock(&emu->register_mutex);
+        if (!snd_emux_inc_count(emu))
                 return -EFAULT;
-        }
 
         memset(&callback, 0, sizeof(callback));
         callback.owner = THIS_MODULE;
@@ -135,7 +131,6 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)
         if (p == NULL) {
                 snd_printk(KERN_ERR "can't create port\n");
                 snd_emux_dec_count(emu);
-                mutex_unlock(&emu->register_mutex);
                 return -ENOMEM;
         }
 
@@ -148,8 +143,6 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)
         reset_port_mode(p, arg->seq_mode);
 
         snd_emux_reset_port(p);
-
-        mutex_unlock(&emu->register_mutex);
         return 0;
 }
 
@@ -195,13 +188,11 @@ snd_emux_close_seq_oss(struct snd_seq_oss_arg *arg)
         if (snd_BUG_ON(!emu))
                 return -ENXIO;
 
-        mutex_lock(&emu->register_mutex);
         snd_emux_sounds_off_all(p);
         snd_soundfont_close_check(emu->sflist, SF_CLIENT_NO(p->chset.port));
         snd_seq_event_port_detach(p->chset.client, p->chset.port);
         snd_emux_dec_count(emu);
 
-        mutex_unlock(&emu->register_mutex);
         return 0;
 }
 
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index 7778b8e19782..a0209204ae48 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -124,12 +124,10 @@ snd_emux_detach_seq(struct snd_emux *emu)
         if (emu->voices)
                 snd_emux_terminate_all(emu);
                 
-        mutex_lock(&emu->register_mutex);
         if (emu->client >= 0) {
                 snd_seq_delete_kernel_client(emu->client);
                 emu->client = -1;
         }
-        mutex_unlock(&emu->register_mutex);
 }
 
 
@@ -269,8 +267,8 @@ snd_emux_event_input(struct snd_seq_event *ev, int direct, void *private_data,
 /*
  * increment usage count
  */
-int
-snd_emux_inc_count(struct snd_emux *emu)
+static int
+__snd_emux_inc_count(struct snd_emux *emu)
 {
         emu->used++;
         if (!try_module_get(emu->ops.owner))
@@ -284,12 +282,21 @@ snd_emux_inc_count(struct snd_emux *emu)
         return 1;
 }
 
+int snd_emux_inc_count(struct snd_emux *emu)
+{
+        int ret;
+
+        mutex_lock(&emu->register_mutex);
+        ret = __snd_emux_inc_count(emu);
+        mutex_unlock(&emu->register_mutex);
+        return ret;
+}
 
 /*
  * decrease usage count
  */
-void
-snd_emux_dec_count(struct snd_emux *emu)
+static void
+__snd_emux_dec_count(struct snd_emux *emu)
 {
         module_put(emu->card->module);
         emu->used--;
@@ -298,6 +305,12 @@ snd_emux_dec_count(struct snd_emux *emu)
         module_put(emu->ops.owner);
 }
 
+void snd_emux_dec_count(struct snd_emux *emu)
+{
+        mutex_lock(&emu->register_mutex);
+        __snd_emux_dec_count(emu);
+        mutex_unlock(&emu->register_mutex);
+}
 
 /*
  * Routine that is called upon a first use of a particular port
@@ -317,7 +330,7 @@ snd_emux_use(void *private_data, struct snd_seq_port_subscribe *info)
 
         mutex_lock(&emu->register_mutex);
         snd_emux_init_port(p);
-        snd_emux_inc_count(emu);
+        __snd_emux_inc_count(emu);
         mutex_unlock(&emu->register_mutex);
         return 0;
 }
@@ -340,7 +353,7 @@ snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *info)
 
         mutex_lock(&emu->register_mutex);
         snd_emux_sounds_off_all(p);
-        snd_emux_dec_count(emu);
+        __snd_emux_dec_count(emu);
         mutex_unlock(&emu->register_mutex);
         return 0;
 }