[alsa-devel] [PATCH] intel8x0m: enable AMD8111 modem
AMD 8111 southbridges contain a controller for MC'97 modem. Enable support for this controller in intel8x0m driver.
Signed-off-by: Dmitry Eremin-Solenikov dbaryshkov@gmail.com --- sound/pci/intel8x0m.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 27709f0..f3353b4 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -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 }, };
At Thu, 19 May 2011 18:48:27 +0400, Dmitry Eremin-Solenikov wrote:
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
Signed-off-by: Dmitry Eremin-Solenikov dbaryshkov@gmail.com
sound/pci/intel8x0m.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 27709f0..f3353b4 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -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
Hello,
On 5/19/11, Takashi Iwai tiwai@suse.de wrote:
At Thu, 19 May 2011 18:48:27 +0400, Dmitry Eremin-Solenikov wrote:
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.
thanks,
Takashi
Signed-off-by: Dmitry Eremin-Solenikov dbaryshkov@gmail.com
sound/pci/intel8x0m.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 27709f0..f3353b4 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -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
At Thu, 19 May 2011 19:04:16 +0400, Dmitry Eremin-Solenikov wrote:
Hello,
On 5/19/11, Takashi Iwai tiwai@suse.de wrote:
At Thu, 19 May 2011 18:48:27 +0400, Dmitry Eremin-Solenikov wrote:
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.
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
thanks,
Takashi
Signed-off-by: Dmitry Eremin-Solenikov dbaryshkov@gmail.com
sound/pci/intel8x0m.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 27709f0..f3353b4 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -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
-- With best wishes Dmitry
participants (2)
-
Dmitry Eremin-Solenikov -
Takashi Iwai