summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-04-26 12:17:34 -0500
committerJustin M. Forbes <jforbes@redhat.com>2016-04-26 12:17:34 -0500
commit1182fce9ed5857e87813609b09f8e5b23e8970bb (patch)
tree13a8915a8a03e7fea40fc7e90cbf870056f3724d
parenta5f6e99b8358d942db45cec03c352d106451c208 (diff)
downloadkernel-1182fce9ed5857e87813609b09f8e5b23e8970bb.tar.gz
kernel-1182fce9ed5857e87813609b09f8e5b23e8970bb.tar.xz
kernel-1182fce9ed5857e87813609b09f8e5b23e8970bb.zip
Change CONFIG_DW_DMAC to built-in to fix sound on some intel platforms
-rw-r--r--config-x86_64-generic3
-rw-r--r--kernel.spec4
-rw-r--r--rebase-notes.txt6
3 files changed, 10 insertions, 3 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 8d8b27519..5d0f7b2b2 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -231,3 +231,6 @@ CONFIG_INFINIBAND_HFI1=m
CONFIG_HFI1_VERBS_31BIT_PSN=y
# CONFIG_SDMA_VERBOSITY is not set
# CONFIG_PRESCAN_RXQ is not set
+
+# Temporary workaround until SND_SOC_INTEL_HASWELL_MACH no longer requires builtin
+CONFIG_DW_DMAC=y
diff --git a/kernel.spec b/kernel.spec
index 3635e6a90..43c8bfa3d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2174,6 +2174,10 @@ fi
#
#
%changelog
+* Tue Apr 26 2016 Justin M. Forbes <jforbes@fedoraproject.org>
+- Change CONFIG_DW_DMAC to built-in to fix sound on some intel platforms
+ This needs to be revisited later.
+
* Tue Apr 26 2016 Josh Boyer <jwboyer@fedoraproject.org>
- Enable IEEE802154_AT86RF230 on more arches (rhbz 1330356)
diff --git a/rebase-notes.txt b/rebase-notes.txt
index 0d7d76f2d..1cc632157 100644
--- a/rebase-notes.txt
+++ b/rebase-notes.txt
@@ -1,8 +1,8 @@
Linux 4.5 rebase notes:
-- Check on status of drm-i915-turn-off-wc-mmaps.patch
-- Check on status of disabled ZONE_DMA
-- Check on status of CONFIG_DW_DMAC_CORE
+- Check on status of drm-i915-turn-off-wc-mmaps.patch (Should be okay to remove in F24, but not F22 or F23)
+- Check on status of disabled ZONE_DMA (They can now coexist with ZONE_DEVICE)
+- Check on status of CONFIG_DW_DMAC_CORE ( Built-in DW_DMAC for now, revisit later)
Linux 4.4 rebase notes: