From patchwork Mon Feb 13 21:11:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 9570767 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 23EE06045D for ; Mon, 13 Feb 2017 21:11:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 154E027FA6 for ; Mon, 13 Feb 2017 21:11:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A49F28356; Mon, 13 Feb 2017 21:11:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDBC827FA6 for ; Mon, 13 Feb 2017 21:11:15 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6BA85266AF1; Mon, 13 Feb 2017 22:11:12 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id CB454266AF9; Mon, 13 Feb 2017 22:11:11 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by alsa0.perex.cz (Postfix) with ESMTP id E24C0266AB2 for ; Mon, 13 Feb 2017 22:11:07 +0100 (CET) Received: from mintppc.lan ([31.52.205.229]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.179]) with ESMTPA (Nemesis) id 0LcFAj-1bws0K48uL-00je4z; Mon, 13 Feb 2017 22:11:06 +0100 From: Darren Stevens To: Takashi Iwai Date: Mon, 13 Feb 2017 21:11:03 +0000 (GMT) Message-ID: <4995e1e49e.49df1cf5@auth.smtp.1and1.co.uk> In-Reply-To: References: <497a1dc45d9.2064992f@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) MIME-Version: 1.0 Content-type: multipart/mixed; boundary="--=_BOUNDARY.6cb034b0e833be9.81" X-Provags-ID: V03:K0:iZ26qTlJ9OsYjcdbcf0RQq4EesP01yJRZdTZiddIccWiPeEVBil 4OuOQJKFBUG0IKdwurZj11gbrF0O2/riJOXwFyngWwMhRhpl/T5sZay1EYh8Slsh6h0F85b yabCB2kmVkjAIfOnxSeZs65j0nRk95d1cA6vVOVGzgZ95b6woMTaeh/I8VbnVK4va/2IIb1 0QDe+WmIerwGDeIZdz54Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:tdwBfmq17Mw=:2bWcc+bYHZcTIpT3+1y6bm SFNdNmslfJscYZo/zNAxU98ezBlTRZ6cIAUefMO47SMOWZ99kjR5BEwt4mX9YLurx5P/dxTbG 3+wv49beCT8mQU9nTPvHg41E9kril2OTfV5M1px+KKmTW/u9j0qrybR1V9x7ayF8TjA2CnRO/ 6/MQ5t+OLSX1rHs230luLvhykeu0KqrEsDb3WNOBXBBwZedFLdg/Rpzod1PPJSAdIgPRCDLSi SmGumm5KZn35UEVnSCda4g3WMmukVRmt4FVl/PsVBqhCUcDkfkmN3djaI7I6Cjb2QpljfMBUx 42isdzjXjL856bK0PaykHfvyzL2ztGHNGLFdd6h34E+tWN0+9a4McgQTmKFaW1iuMqgkRtDTy bPFXB4J35ZQ2os+qDWbQEYuNJ7/c5Gg2evb4sFBnZC1keUWe28YWcIpeiq67hh3n/UIhgzpkv TEfpi0SBaoeebSAXbAo24mXXiVezNVM36sim5YBX2UOAR6nBcLi94+Qi2+Au4KQiMN8bL5q7G LEAKueMrYLgrendFwaO3+ss8PZxy93955mMHL0ix4M7BW8/QHIi71iOXhYU/6gXaFdd1cMNmP yUu+06NXsErjhN86CC83RrVY1Gb2DoCghfHwKpzud2UF0/6I7eS8/CEwxqJ8kVe/8m8Vir56n +S/EuWz5uGRp8OcAiq8Z4ZfHxG3bjcR2BicMS2OwU5mIkIfCvfkUwYabSmo6SFCZ5udM= Cc: alsa-devel@alsa-project.org Subject: [alsa-devel] [PATCH v2] ALSA: hda/patch_sigmatel: Add AmigaOne X1000 pinconfigs X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The AmigaOne X1000 has a Sigmatel STAC92HD700 attached to the HD Audio on an ATI SB600. Add the required settings to enable sound. Signed-off-by: Darren Stevens --- v2: Tidy up indentation, correct config for unused pins, add pin I/O descriptions. diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 37b70f8..7afd9b9 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -166,6 +166,7 @@ enum { STAC_D965_VERBS, STAC_DELL_3ST, STAC_DELL_BIOS, + STAC_NEMO_DEFAULT, STAC_DELL_BIOS_AMIC, STAC_DELL_BIOS_SPDIF, STAC_927X_DELL_DMIC, @@ -1359,7 +1360,27 @@ static int stac_create_spdif_mux_ctls(struct hda_codec *codec) { 0x12, 0x400000f3 }, {} }; - +/* + STAC 92HD700 + 18881000 Amigaone X1000 +*/ +static const struct hda_pintbl nemo_pin_configs[] = { + { 0x0a, 0x02214020 }, /* Front panel HP socket */ + { 0x0b, 0x02a19080 }, /* Front Mic */ + { 0x0c, 0x0181304e }, /* Line in */ + { 0x0d, 0x01014010 }, /* Line out */ + { 0x0e, 0x01a19040 }, /* Rear Mic */ + { 0x0f, 0x01011012 }, /* Rear speakers */ + { 0x10, 0x01016011 }, /* Center speaker */ + { 0x11, 0x01012014 }, /* Side speakers (7.1) */ + { 0x12, 0x103301f0 }, /* Motherboard CD line in connector */ + { 0x13, 0x411111f0 }, /* Unused */ + { 0x14, 0x411111f0 }, /* Unused */ + { 0x21, 0x01442170 }, /* S/PDIF line out */ + { 0x22, 0x411111f0 }, /* Unused */ + { 0x23, 0x411111f0 }, /* Unused */ + {} +}; static void stac9200_fixup_panasonic(struct hda_codec *codec, const struct hda_fixup *fix, int action) @@ -3883,6 +3904,10 @@ static void stac927x_fixup_volknob(struct hda_codec *codec, .type = HDA_FIXUP_PINS, .v.pins = d965_5st_no_fp_pin_configs, }, + [STAC_NEMO_DEFAULT] = { + .type = HDA_FIXUP_PINS, + .v.pins = nemo_pin_configs, + }, [STAC_DELL_3ST] = { .type = HDA_FIXUP_PINS, .v.pins = dell_3st_pin_configs, @@ -3939,6 +3964,7 @@ static void stac927x_fixup_volknob(struct hda_codec *codec, { .id = STAC_D965_5ST_NO_FP, .name = "5stack-no-fp" }, { .id = STAC_DELL_3ST, .name = "dell-3stack" }, { .id = STAC_DELL_BIOS, .name = "dell-bios" }, + { .id = STAC_NEMO_DEFAULT, .name = "nemo-default" }, { .id = STAC_DELL_BIOS_AMIC, .name = "dell-bios-amic" }, { .id = STAC_927X_VOLKNOB, .name = "volknob" }, {} @@ -3977,6 +4003,8 @@ static void stac927x_fixup_volknob(struct hda_codec *codec, "Intel D965", STAC_D965_5ST), SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500, "Intel D965", STAC_D965_5ST), + /* Nemo */ + SND_PCI_QUIRK(0x1888, 0x1000, "AmigaOne X1000", STAC_NEMO_DEFAULT), /* volume-knob fixes */ SND_PCI_QUIRK_VENDOR(0x10cf, "FSC", STAC_927X_VOLKNOB), {} /* terminator */ @@ -5036,6 +5064,7 @@ static int patch_stac9872(struct hda_codec *codec) HDA_CODEC_ENTRY(0x83847683, "STAC9221D A2", patch_stac922x), HDA_CODEC_ENTRY(0x83847618, "STAC9227", patch_stac927x), HDA_CODEC_ENTRY(0x83847619, "STAC9227", patch_stac927x), + HDA_CODEC_ENTRY(0x83847638, "STAC92HD700", patch_stac927x), HDA_CODEC_ENTRY(0x83847616, "STAC9228", patch_stac927x), HDA_CODEC_ENTRY(0x83847617, "STAC9228", patch_stac927x), HDA_CODEC_ENTRY(0x83847614, "STAC9229", patch_stac927x),