From 10e3f72ede553d612545cd894ee05bf6878b53bd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Apr 2013 16:54:10 +0200 Subject: [PATCH] linux: add upstream patches, backported from 3.8.7 Signed-off-by: Stephan Raue --- ...urn_value_when_getting_HDMI_ELD_info.patch | 33 +++++++++++++++ ...12-hda-Enabling_Realtek_ALC671_codec.patch | 40 +++++++++++++++++++ ...x-990.13-hda-fix_typo_in_proc_output.patch | 30 ++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 packages/linux/patches/3.7.10/linux-990.11-hda-bug_fix_on_return_value_when_getting_HDMI_ELD_info.patch create mode 100644 packages/linux/patches/3.7.10/linux-990.12-hda-Enabling_Realtek_ALC671_codec.patch create mode 100644 packages/linux/patches/3.7.10/linux-990.13-hda-fix_typo_in_proc_output.patch diff --git a/packages/linux/patches/3.7.10/linux-990.11-hda-bug_fix_on_return_value_when_getting_HDMI_ELD_info.patch b/packages/linux/patches/3.7.10/linux-990.11-hda-bug_fix_on_return_value_when_getting_HDMI_ELD_info.patch new file mode 100644 index 0000000000..fc38af97c5 --- /dev/null +++ b/packages/linux/patches/3.7.10/linux-990.11-hda-bug_fix_on_return_value_when_getting_HDMI_ELD_info.patch @@ -0,0 +1,33 @@ +From 083e2330c09b7a5f905020c10e9f52b5c1e17979 Mon Sep 17 00:00:00 2001 +From: Mengdong Lin +Date: Thu, 28 Mar 2013 09:20:22 +0000 +Subject: ALSA: hda - bug fix on return value when getting HDMI ELD info + +commit 2ef5692efad330b67a234e2c49edad38538751e7 upstream. + +In function snd_hdmi_get_eld(), the variable 'ret' should be initialized to 0. +Otherwise it will be returned uninitialized as non-zero after ELD info is got +successfully. Thus hdmi_present_sense() will always assume ELD info is invalid +by mistake, and /proc file system cannot show the proper ELD info. + +Signed-off-by: Mengdong Lin +Acked-by: David Henningsson +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- +diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c +index 4c054f4..86f6468 100644 +--- a/sound/pci/hda/hda_eld.c ++++ b/sound/pci/hda/hda_eld.c +@@ -322,7 +322,7 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld, + struct hda_codec *codec, hda_nid_t nid) + { + int i; +- int ret; ++ int ret = 0; + int size; + unsigned char *buf; + +-- +cgit v0.9.1 diff --git a/packages/linux/patches/3.7.10/linux-990.12-hda-Enabling_Realtek_ALC671_codec.patch b/packages/linux/patches/3.7.10/linux-990.12-hda-Enabling_Realtek_ALC671_codec.patch new file mode 100644 index 0000000000..c7bdb8bbbd --- /dev/null +++ b/packages/linux/patches/3.7.10/linux-990.12-hda-Enabling_Realtek_ALC671_codec.patch @@ -0,0 +1,40 @@ +From 0187ab6184b36cc1f01424ef534648c198578dbe Mon Sep 17 00:00:00 2001 +From: Rainer Koenig +Date: Thu, 04 Apr 2013 06:40:38 +0000 +Subject: ALSA: hda - Enabling Realtek ALC 671 codec + +commit 1d87caa69c04008e09f5ff47b5e6acb6116febc7 upstream. + +* Added the device ID to the modalias list and assinged ALC662 patches +for it +* Added 4 port support for the device ID 0671 in alc662_parse_auto_config + +Signed-off-by: Rainer Koenig +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 47fb18d..ee975a2 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6720,7 +6720,8 @@ static int alc662_parse_auto_config(struct hda_codec *codec) + const hda_nid_t *ssids; + + if (codec->vendor_id == 0x10ec0272 || codec->vendor_id == 0x10ec0663 || +- codec->vendor_id == 0x10ec0665 || codec->vendor_id == 0x10ec0670) ++ codec->vendor_id == 0x10ec0665 || codec->vendor_id == 0x10ec0670 || ++ codec->vendor_id == 0x10ec0671) + ssids = alc663_ssids; + else + ssids = alc662_ssids; +@@ -7173,6 +7174,7 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = { + { .id = 0x10ec0665, .name = "ALC665", .patch = patch_alc662 }, + { .id = 0x10ec0668, .name = "ALC668", .patch = patch_alc662 }, + { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 }, ++ { .id = 0x10ec0671, .name = "ALC671", .patch = patch_alc662 }, + { .id = 0x10ec0680, .name = "ALC680", .patch = patch_alc680 }, + { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 }, + { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 }, +-- +cgit v0.9.1 diff --git a/packages/linux/patches/3.7.10/linux-990.13-hda-fix_typo_in_proc_output.patch b/packages/linux/patches/3.7.10/linux-990.13-hda-fix_typo_in_proc_output.patch new file mode 100644 index 0000000000..c5528f0614 --- /dev/null +++ b/packages/linux/patches/3.7.10/linux-990.13-hda-fix_typo_in_proc_output.patch @@ -0,0 +1,30 @@ +From 05c05ef21a1cf71d16189cd4d8060b47f504db2b Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Thu, 04 Apr 2013 09:47:13 +0000 +Subject: ALSA: hda - fix typo in proc output + +commit aeb3a97222832e5457c4b72d72235098ce4bfe8d upstream. + +Rename "Digitial In" to "Digital In". This function is only used for +proc output, so should not cause any problems to change. + +Signed-off-by: David Henningsson +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- +diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c +index e46b6a3..622f726 100644 +--- a/sound/pci/hda/hda_codec.c ++++ b/sound/pci/hda/hda_codec.c +@@ -173,7 +173,7 @@ const char *snd_hda_get_jack_type(u32 cfg) + "Line Out", "Speaker", "HP Out", "CD", + "SPDIF Out", "Digital Out", "Modem Line", "Modem Hand", + "Line In", "Aux", "Mic", "Telephony", +- "SPDIF In", "Digitial In", "Reserved", "Other" ++ "SPDIF In", "Digital In", "Reserved", "Other" + }; + + return jack_types[(cfg & AC_DEFCFG_DEVICE) +-- +cgit v0.9.1