From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NJVpZ-0000mz-Dc for garchives@archives.gentoo.org; Sat, 12 Dec 2009 17:32:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12D6BE07A3; Sat, 12 Dec 2009 17:32:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CB0FAE07A3 for ; Sat, 12 Dec 2009 17:32:29 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 173AC67F7D for ; Sat, 12 Dec 2009 17:32:28 +0000 (UTC) Received: from mpagano by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NJVpU-0003FX-4J for gentoo-commits@lists.gentoo.org; Sat, 12 Dec 2009 17:32:28 +0000 To: gentoo-commits@lists.gentoo.org From: "Mike Pagano (mpagano)" Subject: [gentoo-commits] linux-patches r1641 - genpatches-2.6/trunk/2.6.31 X-VCS-Repository: linux-patches X-VCS-Revision: 1641 X-VCS-Files: genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch genpatches-2.6/trunk/2.6.31/0000_README X-VCS-Directories: genpatches-2.6/trunk/2.6.31 X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano Content-Type: text/plain; charset=UTF-8 Message-Id: Sender: Mike Pagano Date: Sat, 12 Dec 2009 17:32:28 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d8b8d0b0-30aa-473a-babe-699d44b4e59d X-Archives-Hash: 578055c471874eb3f2186a5ed27c1208 Author: mpagano Date: 2009-12-12 17:32:27 +0000 (Sat, 12 Dec 2009) New Revision: 1641 Added: genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch Modified: genpatches-2.6/trunk/2.6.31/0000_README Log: Patch for suspend/resume for ESI Juli Modified: genpatches-2.6/trunk/2.6.31/0000_README =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- genpatches-2.6/trunk/2.6.31/0000_README 2009-12-08 22:17:18 UTC (rev = 1640) +++ genpatches-2.6/trunk/2.6.31/0000_README 2009-12-12 17:32:27 UTC (rev = 1641) @@ -91,6 +91,14 @@ From: http://bugs.gentoo.org/show_bug.cgi?id=3D293181 Desc: Patch for suspend/resume for Audiotrak Prodigy HD2 =20 +Patch: 2900_makefile-changes.patch +From: http://www.kernel.org +Desc: Minor patch to makefile from Linux 2.6.31.5 + +Patch: 2720_juli-suspend-resume-fix.patch +From: http://bugs.gentoo.org/show_bug.cgi?id=3D293181 +Desc: Patch for suspend/resume for ESI Juli + Patch: 4100_dm-bbr.patch From: EVMS 2.5.2 Desc: Bad block relocation support for LiveCD users @@ -103,7 +111,3 @@ From: Tavis Ormandy and http://bugs.gentoo.org/show_= bug.cgi?id=3D217323 Desc: Enable control of the unaligned access control policy from sysctl =20 -Patch: 2900_makefile-changes.patch -From: http://www.kernel.org -Desc: Minor patch to makefile from Linux 2.6.31.5 - Added: genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch = (rev 0) +++ genpatches-2.6/trunk/2.6.31/2720_juli-suspend-resume-fix.patch 2009-1= 2-12 17:32:27 UTC (rev 1641) @@ -0,0 +1,67 @@ +From: Aleksey Kunitskiy +Date: Sat, 14 Nov 2009 13:18:54 +0000 (+0200) +Subject: ALSA: ice1724 - Patch for suspend/resume for ESI Juli@ +X-Git-Url: http://git.kernel.org/?p=3Dlinux%2Fkernel%2Fgit%2Ftorvalds%2F= linux-2.6.git;a=3Dcommitdiff_plain;h=3D50d40f187f9182ee8caa1b83f80a0e11e2= 226baa + +ALSA: ice1724 - Patch for suspend/resume for ESI Juli@ + +Add proper suspend/resume code for Juli@ cards. Based on ice1724 +suspend/resume work of Igor Chernyshev. +Fixes bug https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3D4413 +Tested on linux-2.6.31.6 + +Signed-off-by: Aleksey Kunitskiy +Signed-off-by: Takashi Iwai +--- + +diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c +index fd948bf..f5020ad 100644 +--- a/sound/pci/ice1712/juli.c ++++ b/sound/pci/ice1712/juli.c +@@ -504,6 +504,31 @@ static int __devinit juli_add_controls(struct snd_i= ce1712 *ice) + } +=20 + /* ++ * suspend/resume ++ * */ ++ ++#ifdef CONFIG_PM ++static int juli_resume(struct snd_ice1712 *ice) ++{ ++ struct snd_akm4xxx *ak =3D ice->akm; ++ struct juli_spec *spec =3D ice->spec; ++ /* akm4358 un-reset, un-mute */ ++ snd_akm4xxx_reset(ak, 0); ++ /* reinit ak4114 */ ++ snd_ak4114_reinit(spec->ak4114); ++ return 0; ++} ++ ++static int juli_suspend(struct snd_ice1712 *ice) ++{ ++ struct snd_akm4xxx *ak =3D ice->akm; ++ /* akm4358 reset and soft-mute */ ++ snd_akm4xxx_reset(ak, 1); ++ return 0; ++} ++#endif ++ ++/* + * initialize the chip + */ +=20 +@@ -646,6 +671,13 @@ static int __devinit juli_init(struct snd_ice1712 *= ice) + ice->set_spdif_clock =3D juli_set_spdif_clock; +=20 + ice->spdif.ops.open =3D juli_spdif_in_open; ++ ++#ifdef CONFIG_PM ++ ice->pm_resume =3D juli_resume; ++ ice->pm_suspend =3D juli_suspend; ++ ice->pm_suspend_enabled =3D 1; ++#endif ++ + return 0; + } +=20 +