Skip to contentSkip to conversation

intel8x0m: enable AMD8111 modem

PATCH In review Dmitry Eremin-Solenikov 2 participants 4 messages May 19, 2011 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 intel8x0m: enable AMD8111 modem

AMD 8111 southbridges contain a controller for MC'97 modem. Enable support for this controller in intel8x0m driver.

---
 sound/pci/intel8x0m.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/pci/intel8x0m.c +2 -2
index 27709f0..f3353b4 100644
@@ -235,8 +235,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {
 	{ PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */
 	{ PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */
 	{ PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */
+	{ PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL },	/* AMD8111 */
 #if 0
-	{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },	/* AMD8111 */
 	{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
 #endif
 	{ 0, }
@@ -1261,9 +1261,9 @@ static struct shortname_table {
 	{ PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
+	{ 0x746e, "AMD AMD8111" },
 #if 0
 	{ 0x5455, "ALi M5455" },
-	{ 0x746d, "AMD AMD8111" },
 #endif
 	{ 0 },
 };
Signature · 1 line
1.7.4.4
#1 lore raw

At Thu, 19 May 2011 18:48:27 +0400,

Quoted 3 lines · Dmitry Eremin-Solenikov

AMD 8111 southbridges contain a controller for MC'97 modem. Enable support for this controller in intel8x0m driver.

Just to be sure -- did you test whether it actually works?

thanks,

Takashi

Quoted 34 lines
---
 sound/pci/intel8x0m.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/pci/intel8x0m.c +2 -2
index 27709f0..f3353b4 100644
@@ -235,8 +235,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {
 	{ PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */
 	{ PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */
 	{ PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */
+	{ PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL },	/* AMD8111 */
 #if 0
-	{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },	/* AMD8111 */
 	{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
 #endif
 	{ 0, }
@@ -1261,9 +1261,9 @@ static struct shortname_table {
 	{ PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
+	{ 0x746e, "AMD AMD8111" },
 #if 0
 	{ 0x5455, "ALi M5455" },
-	{ 0x746d, "AMD AMD8111" },
 #endif
 	{ 0 },
 };
Signature · 1 line
1.7.4.4
#2 lore raw

Hello,

Quoted 7 lines · Takashi Iwai

At Thu, 19 May 2011 18:48:27 +0400,

Quoted 3 lines · Dmitry Eremin-Solenikov

AMD 8111 southbridges contain a controller for MC'97 modem. Enable support for this controller in intel8x0m driver.

Just to be sure -- did you test whether it actually works?

I was able to read controller registers, read the data. No codec connected (yet).
Even if this is not 'a prove' to commit the enable, we should change device_id present
in the file, according to datasheet.

Quoted 41 lines

thanks,

Takashi

Quoted 34 lines
---
 sound/pci/intel8x0m.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/pci/intel8x0m.c +2 -3
index 27709f0..f3353b4 100644
@@ -235,8 +235,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {
 	{ PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */
 	{ PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */
 	{ PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */
+	{ PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL },	/* AMD8111 */
 #if 0
-	{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },	/* AMD8111 */
 	{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
 #endif
 	{ 0, }
@@ -1261,9 +1261,9 @@ static struct shortname_table {
 	{ PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
+	{ 0x746e, "AMD AMD8111" },
 #if 0
 	{ 0x5455, "ALi M5455" },
-	{ 0x746d, "AMD AMD8111" },
 #endif
 	{ 0 },
 };
--

1.7.4.4

Signature · 2 lines
With best wishes
Dmitry
#3 lore raw

At Thu, 19 May 2011 19:04:16 +0400,

Quoted 10 lines · Dmitry Eremin-Solenikov

Hello,

Quoted 6 lines · Takashi Iwai

At Thu, 19 May 2011 18:48:27 +0400,

Quoted 3 lines · Dmitry Eremin-Solenikov

AMD 8111 southbridges contain a controller for MC'97 modem. Enable support for this controller in intel8x0m driver.

Quoted 7 lines
Quoted 1 line

Just to be sure -- did you test whether it actually works?

I was able to read controller registers, read the data. No codec connected (yet).
Even if this is not 'a prove' to commit the enable, we should change device_id present
in the file, according to datasheet.

Actually adding such a thing blindly is dangerous. Especially it may conflict with the audio controller and lead to regression because both modem and audio share the same resources.

And, above all, you can't trust datasheet :)

In this case, however, it's likely safe to add, as other AMD controllers have been added already. So applied it now.

thanks,

Takashi

Quoted 48 lines
Quoted 42 lines

thanks,

Takashi

Quoted 34 lines
---
 sound/pci/intel8x0m.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/pci/intel8x0m.c +2 -3
index 27709f0..f3353b4 100644
@@ -235,8 +235,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {
 	{ PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */
 	{ PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */
 	{ PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */
+	{ PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL },	/* AMD8111 */
 #if 0
-	{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },	/* AMD8111 */
 	{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
 #endif
 	{ 0, }
@@ -1261,9 +1261,9 @@ static struct shortname_table {
 	{ PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
 	{ PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
+	{ 0x746e, "AMD AMD8111" },
 #if 0
 	{ 0x5455, "ALi M5455" },
-	{ 0x746d, "AMD AMD8111" },
 #endif
 	{ 0 },
 };
--

1.7.4.4

Signature · 2 lines
With best wishes
Dmitry