diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 10:47:57 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 10:47:57 -0400 |
| commit | e743ed71af266d100762d6dd656161240fceba7f (patch) | |
| tree | e73df6f744e0f9786eac5db8b831574090152568 | |
| parent | 1b69d46e72eb77827158d803aa12394e615bc767 (diff) | |
| download | longterm-queue-4.12-e743ed71af266d100762d6dd656161240fceba7f.tar.gz | |
ALSA: drop new ID patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ALSA-hda-Add-vendor-id-for-Cannonlake-HDMI-codec.patch | 43 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/queue/ALSA-hda-Add-vendor-id-for-Cannonlake-HDMI-codec.patch b/queue/ALSA-hda-Add-vendor-id-for-Cannonlake-HDMI-codec.patch deleted file mode 100644 index e2f33b1..0000000 --- a/queue/ALSA-hda-Add-vendor-id-for-Cannonlake-HDMI-codec.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2b4584d00a6bc02b63ab3c7213060d41a74bdff1 Mon Sep 17 00:00:00 2001 -From: Guneshwor Singh <guneshwor.o.singh@intel.com> -Date: Thu, 7 Dec 2017 18:06:20 +0530 -Subject: [PATCH] ALSA: hda - Add vendor id for Cannonlake HDMI codec - -commit 2b4584d00a6bc02b63ab3c7213060d41a74bdff1 upstream. - -Cannonlake HDMI codec has the same nid as Geminilake. This adds the -codec entry for it. - -Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com> -Cc: <stable@vger.kernel.org> -Signed-off-by: Takashi Iwai <tiwai@suse.de> - -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index c19c81d230bd..b4f1b6e88305 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -55,10 +55,11 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info"); - #define is_kabylake(codec) ((codec)->core.vendor_id == 0x8086280b) - #define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \ - ((codec)->core.vendor_id == 0x80862800)) -+#define is_cannonlake(codec) ((codec)->core.vendor_id == 0x8086280c) - #define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \ - || is_skylake(codec) || is_broxton(codec) \ -- || is_kabylake(codec)) || is_geminilake(codec) -- -+ || is_kabylake(codec)) || is_geminilake(codec) \ -+ || is_cannonlake(codec) - #define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882) - #define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883) - #define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec)) -@@ -3841,6 +3842,7 @@ HDA_CODEC_ENTRY(0x80862808, "Broadwell HDMI", patch_i915_hsw_hdmi), - HDA_CODEC_ENTRY(0x80862809, "Skylake HDMI", patch_i915_hsw_hdmi), - HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI", patch_i915_hsw_hdmi), - HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI", patch_i915_hsw_hdmi), -+HDA_CODEC_ENTRY(0x8086280c, "Cannonlake HDMI", patch_i915_glk_hdmi), - HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI", patch_i915_glk_hdmi), - HDA_CODEC_ENTRY(0x80862800, "Geminilake HDMI", patch_i915_glk_hdmi), - HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi), --- -2.15.0 - diff --git a/queue/series b/queue/series index 806c556..10dc342 100644 --- a/queue/series +++ b/queue/series @@ -58,7 +58,6 @@ mfd-cros-ec-spi-Don-t-send-first-message-too-soon.patch mfd-twl4030-audio-Fix-sibling-node-lookup.patch mfd-twl6040-Fix-child-node-lookup.patch ALSA-rawmidi-Avoid-racy-info-ioctl-via-ctl-device.patch -ALSA-hda-Add-vendor-id-for-Cannonlake-HDMI-codec.patch ALSA-usb-audio-Add-native-DSD-support-for-Esoteric-D.patch block-throttle-avoid-double-charge.patch parisc-Align-os_hpmc_size-on-word-boundary.patch |