Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de1ebdce authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: rt2800 - Make rt30xx and rt35xx chipsets configurable. 



Support for rt30xx- and rt35xx-based devices is currently not functional
in rt2800pci and rt2800usb.
In order to not confuse users we shouldn't claim the PCI and USB device
ID's for these devices. However, to allow for testing it is good to still
have them available, although disabled by default.
Make support for these device configuration options that default to off.

For rt2800usb a 3rd class of devices is added, which are the unknown
devices. For these devices it is known that they are either based on
rt28xx, rt30xx or rt35xx, but it is not known on what chipset exactly.
These devices are disabled by default as well, until it can be established
on what chipset exactly they are based.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 49e721ec

drivers/net/wireless/rt2x00/Kconfig

+65 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ config RT2800PCI_SOC 
	default y



config RT2800PCI

	tristate "Ralink rt2800 (PCI/PCMCIA) support (VERY EXPERIMENTAL)"

	tristate "Ralink rt28xx/rt30xx/rt35xx (PCI/PCIe/PCMCIA) support (EXPERIMENTAL)"

	depends on (RT2800PCI_PCI || RT2800PCI_SOC) && EXPERIMENTAL

	select RT2800_LIB

	select RT2X00_LIB_PCI if RT2800PCI_PCI
@@ -75,7 +75,7 @@ config RT2800PCI 
	select CRC_CCITT

	select EEPROM_93CX6

	---help---

	  This adds support for rt2800 wireless chipset family.

	  This adds support for rt2800/rt3000/rt3500 wireless chipset family.

	  Supported chips: RT2760, RT2790, RT2860, RT2880, RT2890 & RT3052



	  This driver is non-functional at the moment and is intended for
@@ -83,6 +83,32 @@ config RT2800PCI 


	  When compiled as a module, this driver will be called "rt2800pci.ko".



if RT2800PCI



config RT2800PCI_RT30XX

	bool "rt2800pci - Include support for rt30xx (PCI/PCIe/PCMCIA) devices"

	default n

	---help---

	  This adds support for rt30xx wireless chipset family to the

	  rt2800pci driver.

	  Supported chips: RT3090, RT3091 & RT3092



	  Support for these devices is non-functional at the moment and is

	  intended for testers and developers.



config RT2800PCI_RT35XX

	bool "rt2800pci - Include support for rt35xx (PCI/PCIe/PCMCIA) devices"

	default n

	---help---

	  This adds support for rt35xx wireless chipset family to the

	  rt2800pci driver.

	  Supported chips: RT3060, RT3062, RT3562, RT3592



	  Support for these devices is non-functional at the moment and is

	  intended for testers and developers.



endif



config RT2500USB

	tristate "Ralink rt2500 (USB) support"

	depends on USB
@@ -126,6 +152,43 @@ config RT2800USB 


	  When compiled as a module, this driver will be called "rt2800usb.ko".



if RT2800USB



config RT2800USB_RT30XX

	bool "rt2800usb - Include support for rt30xx (USB) devices"

	default n

	---help---

	  This adds support for rt30xx wireless chipset family to the

	  rt2800usb driver.

	  Supported chips: RT3070, RT3071 & RT3072



	  Support for these devices is non-functional at the moment and is

	  intended for testers and developers.



config RT2800USB_RT35XX

	bool "rt2800usb - Include support for rt35xx (USB) devices"

	default n

	---help---

	  This adds support for rt35xx wireless chipset family to the

	  rt2800usb driver.

	  Supported chips: RT3572



	  Support for these devices is non-functional at the moment and is

	  intended for testers and developers.



config RT2800USB_UNKNOWN

	bool "rt2800usb - Include support for unknown (USB) devices"

	default n

	---help---

	  This adds support for rt2800 family devices that are known to

	  have a rt2800 family chipset, but for which the exact chipset

	  is unknown.



	  Support status for these devices is unknown, and enabling these

	  devices may or may not work.



endif



config RT2800_LIB

	tristate

drivers/net/wireless/rt2x00/rt2800pci.c

+12 −8
Original line number Diff line number Diff line
@@ -1185,7 +1185,10 @@ static const struct rt2x00_ops rt2800pci_ops = { 
 * RT2800pci module information.

 */

static struct pci_device_id rt2800pci_device_table[] = {

	{ PCI_DEVICE(0x1462, 0x891a), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x0601), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x0681), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x0701), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x0781), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1432, 0x7708), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1432, 0x7727), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1432, 0x7728), PCI_DEVICE_DATA(&rt2800pci_ops) },
@@ -1193,18 +1196,19 @@ static struct pci_device_id rt2800pci_device_table[] = { 
	{ PCI_DEVICE(0x1432, 0x7748), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1432, 0x7758), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1432, 0x7768), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x0601), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x0681), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x0701), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x0781), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x3060), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x3062), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1a3b, 0x1059), PCI_DEVICE_DATA(&rt2800pci_ops) },

#ifdef CONFIG_RT2800PCI_RT30XX

	{ PCI_DEVICE(0x1814, 0x3090), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x3091), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x3092), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1462, 0x891a), PCI_DEVICE_DATA(&rt2800pci_ops) },

#endif

#ifdef CONFIG_RT2800PCI_RT35XX

	{ PCI_DEVICE(0x1814, 0x3060), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x3062), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x3562), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1814, 0x3592), PCI_DEVICE_DATA(&rt2800pci_ops) },

	{ PCI_DEVICE(0x1a3b, 0x1059), PCI_DEVICE_DATA(&rt2800pci_ops) },

#endif

	{ 0, }

};

drivers/net/wireless/rt2x00/rt2800usb.c

+181 −105

File changed.

Preview size limit exceeded, changes collapsed.