Merge remote-tracking branch 'stable/build' into build

68 files changed, 180 insertions, 53 deletions

diff --git a/alsa/hda/array.c b/alsa/hda/array.c
new file mode 100644
index 000000000..e18f8223a
--- /dev/null
+++ b/alsa/hda/array.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../alsa-kernel/hda/array.c"
diff --git a/alsa/hda/hdac_regmap.c b/alsa/hda/hdac_regmap.c
new file mode 100644
index 000000000..ebae13752
--- /dev/null
+++ b/alsa/hda/hdac_regmap.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../alsa-kernel/hda/hdac_regmap.c"
diff --git a/alsa/pci/hda/hda_codec.c b/alsa/pci/hda/hda_codec.c
index 39010da80..c122956e2 100644
--- a/alsa/pci/hda/hda_codec.c
+++ b/alsa/pci/hda/hda_codec.c
@@ -1,2 +1,53 @@
 #include "adriver.h"
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 15, 0)
+#include <linux/device.h>
+static int pm_runtime_force_suspend(struct device *dev);
+static int pm_runtime_force_resume(struct device *dev);
+#endif
 #include "../../alsa-kernel/pci/hda/hda_codec.c"
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 15, 0)
+static int pm_runtime_force_suspend(struct device *dev)
+{
+	int ret = 0;
+
+	pm_runtime_disable(dev);
+	if (pm_runtime_status_suspended(dev))
+		return 0;
+
+	if (!device->driver->pm || !device->driver->pm->runtime_suspend) {
+		ret = -ENOSYS;
+		goto err;
+	}
+
+	ret = device->driver->pm->runtime_suspend(dev);
+	if (ret)
+		goto err;
+
+	pm_runtime_set_suspended(dev);
+	return 0;
+err:
+	pm_runtime_enable(dev);
+	return ret;
+}
+
+static int pm_runtime_force_resume(struct device *dev)
+{
+	int ret = 0;
+
+	if (!device->driver->pm || !device->driver->pm->runtime_resume) {
+		ret = -ENOSYS;
+		goto out;
+	}
+
+	ret = device->driver->pm->runtime_resume(dev);
+	if (ret)
+		goto out;
+
+	pm_runtime_set_active(dev);
+	pm_runtime_mark_last_busy(dev);
+out:
+	pm_runtime_enable(dev);
+	return ret;
+}
+#endif /* <= 3.15 */
diff --git a/alsa/soc/intel/sst/Makefile b/alsa/soc/intel/atom/Makefile
index ab259bc0f..b55a704a2 100644
--- a/alsa/soc/intel/sst/Makefile
+++ b/alsa/soc/intel/atom/Makefile
@@ -5,6 +5,6 @@ endif
 include $(SND_TOPDIR)/toplevel.config
 include $(SND_TOPDIR)/Makefile.conf
 
-include $(SND_TOPDIR)/alsa-kernel/soc/intel/sst/Makefile
+include $(SND_TOPDIR)/alsa-kernel/soc/intel/atom/Makefile
 
 include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/intel/atom/sst-atom-controls.c b/alsa/soc/intel/atom/sst-atom-controls.c
new file mode 100644
index 000000000..bd7d75f96
--- /dev/null
+++ b/alsa/soc/intel/atom/sst-atom-controls.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/atom/sst-atom-controls.c"
diff --git a/alsa/soc/intel/atom/sst-mfld-platform-compress.c b/alsa/soc/intel/atom/sst-mfld-platform-compress.c
new file mode 100644
index 000000000..2686179e3
--- /dev/null
+++ b/alsa/soc/intel/atom/sst-mfld-platform-compress.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/atom/sst-mfld-platform-compress.c"
diff --git a/alsa/soc/intel/atom/sst-mfld-platform-pcm.c b/alsa/soc/intel/atom/sst-mfld-platform-pcm.c
new file mode 100644
index 000000000..8fc1f863e
--- /dev/null
+++ b/alsa/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/atom/sst-mfld-platform-pcm.c"
diff --git a/alsa/soc/intel/atom/sst/Makefile b/alsa/soc/intel/atom/sst/Makefile
new file mode 100644
index 000000000..00d01f31f
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/Makefile
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../../../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/intel/atom/sst/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/intel/atom/sst/sst.c b/alsa/soc/intel/atom/sst/sst.c
new file mode 100644
index 000000000..381857238
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/sst.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../../alsa-kernel/soc/intel/atom/sst/sst.c"
diff --git a/alsa/soc/intel/atom/sst/sst_acpi.c b/alsa/soc/intel/atom/sst/sst_acpi.c
new file mode 100644
index 000000000..2a458a416
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/sst_acpi.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../../alsa-kernel/soc/intel/atom/sst/sst_acpi.c"
diff --git a/alsa/soc/intel/atom/sst/sst_drv_interface.c b/alsa/soc/intel/atom/sst/sst_drv_interface.c
new file mode 100644
index 000000000..45cf1af1d
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/sst_drv_interface.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../../alsa-kernel/soc/intel/atom/sst/sst_drv_interface.c"
diff --git a/alsa/soc/intel/atom/sst/sst_ipc.c b/alsa/soc/intel/atom/sst/sst_ipc.c
new file mode 100644
index 000000000..052950c01
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/sst_ipc.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../../alsa-kernel/soc/intel/atom/sst/sst_ipc.c"
diff --git a/alsa/soc/intel/atom/sst/sst_loader.c b/alsa/soc/intel/atom/sst/sst_loader.c
new file mode 100644
index 000000000..66597cfbd
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/sst_loader.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../../alsa-kernel/soc/intel/atom/sst/sst_loader.c"
diff --git a/alsa/soc/intel/atom/sst/sst_pci.c b/alsa/soc/intel/atom/sst/sst_pci.c
new file mode 100644
index 000000000..d25f3f41f
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/sst_pci.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../../alsa-kernel/soc/intel/atom/sst/sst_pci.c"
diff --git a/alsa/soc/intel/atom/sst/sst_pvt.c b/alsa/soc/intel/atom/sst/sst_pvt.c
new file mode 100644
index 000000000..4893fee91
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/sst_pvt.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../../alsa-kernel/soc/intel/atom/sst/sst_pvt.c"
diff --git a/alsa/soc/intel/atom/sst/sst_stream.c b/alsa/soc/intel/atom/sst/sst_stream.c
new file mode 100644
index 000000000..2695a6c7a
--- /dev/null
+++ b/alsa/soc/intel/atom/sst/sst_stream.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../../alsa-kernel/soc/intel/atom/sst/sst_stream.c"
diff --git a/alsa/soc/intel/baytrail/Makefile b/alsa/soc/intel/baytrail/Makefile
new file mode 100644
index 000000000..21f534f4f
--- /dev/null
+++ b/alsa/soc/intel/baytrail/Makefile
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/intel/baytrail/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/intel/baytrail/sst-baytrail-dsp.c b/alsa/soc/intel/baytrail/sst-baytrail-dsp.c
new file mode 100644
index 000000000..b9fc72644
--- /dev/null
+++ b/alsa/soc/intel/baytrail/sst-baytrail-dsp.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/baytrail/sst-baytrail-dsp.c"
diff --git a/alsa/soc/intel/baytrail/sst-baytrail-ipc.c b/alsa/soc/intel/baytrail/sst-baytrail-ipc.c
new file mode 100644
index 000000000..c1ba338b9
--- /dev/null
+++ b/alsa/soc/intel/baytrail/sst-baytrail-ipc.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/baytrail/sst-baytrail-ipc.c"
diff --git a/alsa/soc/intel/baytrail/sst-baytrail-pcm.c b/alsa/soc/intel/baytrail/sst-baytrail-pcm.c
new file mode 100644
index 000000000..7247def83
--- /dev/null
+++ b/alsa/soc/intel/baytrail/sst-baytrail-pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/baytrail/sst-baytrail-pcm.c"
diff --git a/alsa/soc/intel/boards/Makefile b/alsa/soc/intel/boards/Makefile
new file mode 100644
index 000000000..7e7d966d4
--- /dev/null
+++ b/alsa/soc/intel/boards/Makefile
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/intel/boards/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/intel/boards/broadwell.c b/alsa/soc/intel/boards/broadwell.c
new file mode 100644
index 000000000..54e2b2915
--- /dev/null
+++ b/alsa/soc/intel/boards/broadwell.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/boards/broadwell.c"
diff --git a/alsa/soc/intel/boards/byt-max98090.c b/alsa/soc/intel/boards/byt-max98090.c
new file mode 100644
index 000000000..c0c45b818
--- /dev/null
+++ b/alsa/soc/intel/boards/byt-max98090.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/boards/byt-max98090.c"
diff --git a/alsa/soc/intel/boards/byt-rt5640.c b/alsa/soc/intel/boards/byt-rt5640.c
new file mode 100644
index 000000000..4b15d4957
--- /dev/null
+++ b/alsa/soc/intel/boards/byt-rt5640.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/boards/byt-rt5640.c"
diff --git a/alsa/soc/intel/boards/bytcr_rt5640.c b/alsa/soc/intel/boards/bytcr_rt5640.c
new file mode 100644
index 000000000..f09163610
--- /dev/null
+++ b/alsa/soc/intel/boards/bytcr_rt5640.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/boards/bytcr_rt5640.c"
diff --git a/alsa/soc/intel/boards/cht_bsw_rt5645.c b/alsa/soc/intel/boards/cht_bsw_rt5645.c
new file mode 100644
index 000000000..93619cd3c
--- /dev/null
+++ b/alsa/soc/intel/boards/cht_bsw_rt5645.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/boards/cht_bsw_rt5645.c"
diff --git a/alsa/soc/intel/boards/cht_bsw_rt5672.c b/alsa/soc/intel/boards/cht_bsw_rt5672.c
new file mode 100644
index 000000000..13b9026a9
--- /dev/null
+++ b/alsa/soc/intel/boards/cht_bsw_rt5672.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/boards/cht_bsw_rt5672.c"
diff --git a/alsa/soc/intel/boards/haswell.c b/alsa/soc/intel/boards/haswell.c
new file mode 100644
index 000000000..c3e387745
--- /dev/null
+++ b/alsa/soc/intel/boards/haswell.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/boards/haswell.c"
diff --git a/alsa/soc/intel/boards/mfld_machine.c b/alsa/soc/intel/boards/mfld_machine.c
new file mode 100644
index 000000000..41ec3122c
--- /dev/null
+++ b/alsa/soc/intel/boards/mfld_machine.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/boards/mfld_machine.c"
diff --git a/alsa/soc/intel/broadwell.c b/alsa/soc/intel/broadwell.c
deleted file mode 100644
index 358d7b528..000000000
--- a/alsa/soc/intel/broadwell.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/broadwell.c"
diff --git a/alsa/soc/intel/byt-max98090.c b/alsa/soc/intel/byt-max98090.c
deleted file mode 100644
index 1866c5497..000000000
--- a/alsa/soc/intel/byt-max98090.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/byt-max98090.c"
diff --git a/alsa/soc/intel/bytcr_dpcm_rt5640.c b/alsa/soc/intel/bytcr_dpcm_rt5640.c
deleted file mode 100644
index 6ba33d2b3..000000000
--- a/alsa/soc/intel/bytcr_dpcm_rt5640.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/bytcr_dpcm_rt5640.c"
diff --git a/alsa/soc/intel/cht_bsw_rt5672.c b/alsa/soc/intel/cht_bsw_rt5672.c
deleted file mode 100644
index 086a54297..000000000
--- a/alsa/soc/intel/cht_bsw_rt5672.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/cht_bsw_rt5672.c"
diff --git a/alsa/soc/intel/common/Makefile b/alsa/soc/intel/common/Makefile
new file mode 100644
index 000000000..e64572356
--- /dev/null
+++ b/alsa/soc/intel/common/Makefile
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/intel/common/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/intel/common/sst-acpi.c b/alsa/soc/intel/common/sst-acpi.c
new file mode 100644
index 000000000..fdad82d5e
--- /dev/null
+++ b/alsa/soc/intel/common/sst-acpi.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/common/sst-acpi.c"
diff --git a/alsa/soc/intel/common/sst-dsp.c b/alsa/soc/intel/common/sst-dsp.c
new file mode 100644
index 000000000..8e2fd1bbd
--- /dev/null
+++ b/alsa/soc/intel/common/sst-dsp.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/common/sst-dsp.c"
diff --git a/alsa/soc/intel/common/sst-firmware.c b/alsa/soc/intel/common/sst-firmware.c
new file mode 100644
index 000000000..c13ae13d7
--- /dev/null
+++ b/alsa/soc/intel/common/sst-firmware.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/common/sst-firmware.c"
diff --git a/alsa/soc/intel/common/sst-ipc.c b/alsa/soc/intel/common/sst-ipc.c
new file mode 100644
index 000000000..1a8b2882c
--- /dev/null
+++ b/alsa/soc/intel/common/sst-ipc.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/common/sst-ipc.c"
diff --git a/alsa/soc/intel/haswell.c b/alsa/soc/intel/haswell.c
deleted file mode 100644
index 1e33f593b..000000000
--- a/alsa/soc/intel/haswell.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/haswell.c"
diff --git a/alsa/soc/intel/haswell/Makefile b/alsa/soc/intel/haswell/Makefile
new file mode 100644
index 000000000..9d650bfce
--- /dev/null
+++ b/alsa/soc/intel/haswell/Makefile
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/intel/haswell/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/intel/haswell/sst-haswell-dsp.c b/alsa/soc/intel/haswell/sst-haswell-dsp.c
new file mode 100644
index 000000000..0e7403209
--- /dev/null
+++ b/alsa/soc/intel/haswell/sst-haswell-dsp.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/haswell/sst-haswell-dsp.c"
diff --git a/alsa/soc/intel/haswell/sst-haswell-ipc.c b/alsa/soc/intel/haswell/sst-haswell-ipc.c
new file mode 100644
index 000000000..fb6bc680e
--- /dev/null
+++ b/alsa/soc/intel/haswell/sst-haswell-ipc.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/haswell/sst-haswell-ipc.c"
diff --git a/alsa/soc/intel/haswell/sst-haswell-pcm.c b/alsa/soc/intel/haswell/sst-haswell-pcm.c
new file mode 100644
index 000000000..8957a9217
--- /dev/null
+++ b/alsa/soc/intel/haswell/sst-haswell-pcm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../../alsa-kernel/soc/intel/haswell/sst-haswell-pcm.c"
diff --git a/alsa/soc/intel/mfld_machine.c b/alsa/soc/intel/mfld_machine.c
deleted file mode 100644
index cb8936c0d..000000000
--- a/alsa/soc/intel/mfld_machine.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/mfld_machine.c"
diff --git a/alsa/soc/intel/sst-acpi.c b/alsa/soc/intel/sst-acpi.c
deleted file mode 100644
index 7e7ba3423..000000000
--- a/alsa/soc/intel/sst-acpi.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-acpi.c"
diff --git a/alsa/soc/intel/sst-atom-controls.c b/alsa/soc/intel/sst-atom-controls.c
deleted file mode 100644
index 47f4d5278..000000000
--- a/alsa/soc/intel/sst-atom-controls.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-atom-controls.c"
diff --git a/alsa/soc/intel/sst-baytrail-dsp.c b/alsa/soc/intel/sst-baytrail-dsp.c
deleted file mode 100644
index 4a6b481c6..000000000
--- a/alsa/soc/intel/sst-baytrail-dsp.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-baytrail-dsp.c"
diff --git a/alsa/soc/intel/sst-baytrail-ipc.c b/alsa/soc/intel/sst-baytrail-ipc.c
deleted file mode 100644
index d07ed659c..000000000
--- a/alsa/soc/intel/sst-baytrail-ipc.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-baytrail-ipc.c"
diff --git a/alsa/soc/intel/sst-baytrail-pcm.c b/alsa/soc/intel/sst-baytrail-pcm.c
deleted file mode 100644
index 9944c063b..000000000
--- a/alsa/soc/intel/sst-baytrail-pcm.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-baytrail-pcm.c"
diff --git a/alsa/soc/intel/sst-dsp.c b/alsa/soc/intel/sst-dsp.c
deleted file mode 100644
index 9944c063b..000000000
--- a/alsa/soc/intel/sst-dsp.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-baytrail-pcm.c"
diff --git a/alsa/soc/intel/sst-firmware.c b/alsa/soc/intel/sst-firmware.c
deleted file mode 100644
index 80e9bd09c..000000000
--- a/alsa/soc/intel/sst-firmware.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-firmware.c"
diff --git a/alsa/soc/intel/sst-haswell-dsp.c b/alsa/soc/intel/sst-haswell-dsp.c
deleted file mode 100644
index bf7e8a67f..000000000
--- a/alsa/soc/intel/sst-haswell-dsp.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-haswell-dsp.c"
diff --git a/alsa/soc/intel/sst-haswell-ipc.c b/alsa/soc/intel/sst-haswell-ipc.c
deleted file mode 100644
index 6f89bc193..000000000
--- a/alsa/soc/intel/sst-haswell-ipc.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-haswell-ipc.c"
diff --git a/alsa/soc/intel/sst-haswell-pcm.c b/alsa/soc/intel/sst-haswell-pcm.c
deleted file mode 100644
index a8318e812..000000000
--- a/alsa/soc/intel/sst-haswell-pcm.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-haswell-pcm.c"
diff --git a/alsa/soc/intel/sst-mfld-platform-compress.c b/alsa/soc/intel/sst-mfld-platform-compress.c
deleted file mode 100644
index d276cdda8..000000000
--- a/alsa/soc/intel/sst-mfld-platform-compress.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-mfld-platform-compress.c"
diff --git a/alsa/soc/intel/sst-mfld-platform-pcm.c b/alsa/soc/intel/sst-mfld-platform-pcm.c
deleted file mode 100644
index 20cb014d3..000000000
--- a/alsa/soc/intel/sst-mfld-platform-pcm.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../alsa-kernel/soc/intel/sst-mfld-platform-pcm.c"
diff --git a/alsa/soc/intel/sst/sst.c b/alsa/soc/intel/sst/sst.c
deleted file mode 100644
index 720edcc01..000000000
--- a/alsa/soc/intel/sst/sst.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../../alsa-kernel/soc/intel/sst/sst.c"
diff --git a/alsa/soc/intel/sst/sst_acpi.c b/alsa/soc/intel/sst/sst_acpi.c
deleted file mode 100644
index 2d7f7ff0c..000000000
--- a/alsa/soc/intel/sst/sst_acpi.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../../alsa-kernel/soc/intel/sst/sst_acpi.c"
diff --git a/alsa/soc/intel/sst/sst_drv_interface.c b/alsa/soc/intel/sst/sst_drv_interface.c
deleted file mode 100644
index bc353987d..000000000
--- a/alsa/soc/intel/sst/sst_drv_interface.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../../alsa-kernel/soc/intel/sst/sst_drv_interface.c"
diff --git a/alsa/soc/intel/sst/sst_ipc.c b/alsa/soc/intel/sst/sst_ipc.c
deleted file mode 100644
index 612e2bf49..000000000
--- a/alsa/soc/intel/sst/sst_ipc.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../../alsa-kernel/soc/intel/sst/sst_ipc.c"
diff --git a/alsa/soc/intel/sst/sst_loader.c b/alsa/soc/intel/sst/sst_loader.c
deleted file mode 100644
index c5f557bf0..000000000
--- a/alsa/soc/intel/sst/sst_loader.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../../alsa-kernel/soc/intel/sst/sst_loader.c"
diff --git a/alsa/soc/intel/sst/sst_pci.c b/alsa/soc/intel/sst/sst_pci.c
deleted file mode 100644
index 2922523d2..000000000
--- a/alsa/soc/intel/sst/sst_pci.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../../alsa-kernel/soc/intel/sst/sst_pci.c"
diff --git a/alsa/soc/intel/sst/sst_pvt.c b/alsa/soc/intel/sst/sst_pvt.c
deleted file mode 100644
index efd74960a..000000000
--- a/alsa/soc/intel/sst/sst_pvt.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../../alsa-kernel/soc/intel/sst/sst_pvt.c"
diff --git a/alsa/soc/intel/sst/sst_stream.c b/alsa/soc/intel/sst/sst_stream.c
deleted file mode 100644
index bf5f10110..000000000
--- a/alsa/soc/intel/sst/sst_stream.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "adriver.h"
-#include "../../../alsa-kernel/soc/intel/sst/sst_stream.c"
diff --git a/alsa/soc/qcom/Makefile b/alsa/soc/qcom/Makefile
new file mode 100644
index 000000000..47a85a44c
--- /dev/null
+++ b/alsa/soc/qcom/Makefile
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/soc/qcom/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff --git a/alsa/soc/qcom/lpass-cpu.c b/alsa/soc/qcom/lpass-cpu.c
new file mode 100644
index 000000000..eb2cbceca
--- /dev/null
+++ b/alsa/soc/qcom/lpass-cpu.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/qcom/lpass-cpu.c"
diff --git a/alsa/soc/qcom/lpass-platform.c b/alsa/soc/qcom/lpass-platform.c
new file mode 100644
index 000000000..acfe0c416
--- /dev/null
+++ b/alsa/soc/qcom/lpass-platform.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/qcom/lpass-platform.c"
diff --git a/alsa/soc/qcom/storm.c b/alsa/soc/qcom/storm.c
new file mode 100644
index 000000000..46d792fff
--- /dev/null
+++ b/alsa/soc/qcom/storm.c
@@ -0,0 +1,2 @@
+#include "adriver.h"
+#include "../../alsa-kernel/soc/qcom/storm.c"