All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ALSA: hda/patch_sigmatel: Add AmigaOne X1000 pin configs
@ 2017-01-20 17:58 Darren Stevens
  2017-01-23 14:22 ` Takashi Iwai
  0 siblings, 1 reply; 4+ messages in thread
From: Darren Stevens @ 2017-01-20 17:58 UTC (permalink / raw)
  To: alsa-devel

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 <darren@stevens-zone.net>

---

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 37b70f8..51947a6 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,
@@ -1360,6 +1361,23 @@ static int stac_create_spdif_mux_ctls(struct hda_codec
*codec)
    {}
 };
 
+static const struct hda_pintbl nemo_pin_configs[] = {
+   { 0x0a, 0x02214020 },
+   { 0x0b, 0x02A19080 },
+   { 0x0c, 0x0181304E },
+   { 0x0d, 0x01014010 },
+   { 0x0e, 0x01A19040 },
+   { 0x0f, 0x01011012 },
+   { 0x10, 0x01016011 },
+   { 0x11, 0x01012014 },
+   { 0x12, 0x103301F0 },
+   { 0x13, 0x00000000 },
+   { 0x14, 0x00000000 },
+   { 0x21, 0x01442170 },
+   { 0x22, 0x00000000 },
+   { 0x23, 0x00000000 },
+   {}
+};
 
 static void stac9200_fixup_panasonic(struct hda_codec *codec,
                     const struct hda_fixup *fix, int action)
@@ -3883,6 +3901,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 +3961,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 +4000,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 +5061,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),

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] ALSA: hda/patch_sigmatel: Add AmigaOne X1000 pin configs
  2017-01-20 17:58 [PATCH] ALSA: hda/patch_sigmatel: Add AmigaOne X1000 pin configs Darren Stevens
@ 2017-01-23 14:22 ` Takashi Iwai
  0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2017-01-23 14:22 UTC (permalink / raw)
  To: Darren Stevens; +Cc: alsa-devel

On Fri, 20 Jan 2017 18:58:01 +0100,
Darren Stevens wrote:
> 
> 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 <darren@stevens-zone.net>

The patch isn't cleanly applicable.  Please fix your MUA setup not to
modify the spaces?  If it's difficult, use an attachment as a last
resort.


thanks,

Takashi


> 
> ---
> 
> diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
> index 37b70f8..51947a6 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,
> @@ -1360,6 +1361,23 @@ static int stac_create_spdif_mux_ctls(struct hda_codec
> *codec)
>     {}
>  };
>  
> +static const struct hda_pintbl nemo_pin_configs[] = {
> +   { 0x0a, 0x02214020 },
> +   { 0x0b, 0x02A19080 },
> +   { 0x0c, 0x0181304E },
> +   { 0x0d, 0x01014010 },
> +   { 0x0e, 0x01A19040 },
> +   { 0x0f, 0x01011012 },
> +   { 0x10, 0x01016011 },
> +   { 0x11, 0x01012014 },
> +   { 0x12, 0x103301F0 },
> +   { 0x13, 0x00000000 },
> +   { 0x14, 0x00000000 },
> +   { 0x21, 0x01442170 },
> +   { 0x22, 0x00000000 },
> +   { 0x23, 0x00000000 },
> +   {}
> +};
>  
>  static void stac9200_fixup_panasonic(struct hda_codec *codec,
>                      const struct hda_fixup *fix, int action)
> @@ -3883,6 +3901,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 +3961,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 +4000,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 +5061,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),
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] ALSA: hda/patch_sigmatel: Add AmigaOne X1000 pin configs
  2017-01-23 19:43 Darren Stevens
@ 2017-01-24  9:02 ` Takashi Iwai
  0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2017-01-24  9:02 UTC (permalink / raw)
  To: Darren Stevens; +Cc: alsa-devel

On Mon, 23 Jan 2017 20:43:29 +0100,
Darren Stevens wrote:
> 
> +static const struct hda_pintbl nemo_pin_configs[] = {
> +   { 0x0a, 0x02214020 },

Please use the standard indentation level.

> +   { 0x0b, 0x02A19080 },
> +   { 0x0c, 0x0181304E },
> +   { 0x0d, 0x01014010 },
> +   { 0x0e, 0x01A19040 },
> +   { 0x0f, 0x01011012 },
> +   { 0x10, 0x01016011 },
> +   { 0x11, 0x01012014 },
> +   { 0x12, 0x103301F0 },
> +   { 0x13, 0x00000000 },

The pin config shouldn't be zero.  If the pin is to be disabled, use
a valid value like 0x411111f0.  Also, it'd be more helpful to give a
comment in each config to indicate which pin corresponds to which
I/O.

> +   { 0x14, 0x00000000 },
> +   { 0x21, 0x01442170 },
> +   { 0x22, 0x00000000 },
> +   { 0x23, 0x00000000 },
> +   {}
> +};
>  
>  static void stac9200_fixup_panasonic(struct hda_codec *codec,
>  				     const struct hda_fixup *fix, int action)
> @@ -3883,6 +3901,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,

Align the indentation.


thanks,

Takashi

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] ALSA: hda/patch_sigmatel: Add AmigaOne X1000 pin configs
@ 2017-01-23 19:43 Darren Stevens
  2017-01-24  9:02 ` Takashi Iwai
  0 siblings, 1 reply; 4+ messages in thread
From: Darren Stevens @ 2017-01-23 19:43 UTC (permalink / raw)
  To: alsa-devel

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

  AmigaOS...........: http://yam.ch/
  Unix/MacOS/Windows: http://www.mozilla.com/thunderbird/

General information about MIME can be found at:
http://en.wikipedia.org/wiki/MIME

[-- Attachment #2: Type: text/plain, Size: 193 bytes --]

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 <darren@stevens-zone.net>

---

[-- Attachment #3: sigmatel.patch --]
[-- Type: text/plain, Size: 2636 bytes --]

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 37b70f8..51947a6 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,
@@ -1360,6 +1361,23 @@ static int stac_create_spdif_mux_ctls(struct hda_codec *codec)
 	{}
 };
 
+static const struct hda_pintbl nemo_pin_configs[] = {
+   { 0x0a, 0x02214020 },
+   { 0x0b, 0x02A19080 },
+   { 0x0c, 0x0181304E },
+   { 0x0d, 0x01014010 },
+   { 0x0e, 0x01A19040 },
+   { 0x0f, 0x01011012 },
+   { 0x10, 0x01016011 },
+   { 0x11, 0x01012014 },
+   { 0x12, 0x103301F0 },
+   { 0x13, 0x00000000 },
+   { 0x14, 0x00000000 },
+   { 0x21, 0x01442170 },
+   { 0x22, 0x00000000 },
+   { 0x23, 0x00000000 },
+   {}
+};
 
 static void stac9200_fixup_panasonic(struct hda_codec *codec,
 				     const struct hda_fixup *fix, int action)
@@ -3883,6 +3901,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 +3961,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 +4000,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 +5061,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),

[-- Attachment #4: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-01-24  9:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-20 17:58 [PATCH] ALSA: hda/patch_sigmatel: Add AmigaOne X1000 pin configs Darren Stevens
2017-01-23 14:22 ` Takashi Iwai
2017-01-23 19:43 Darren Stevens
2017-01-24  9:02 ` Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.