lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rt2x00: fix rt2x00 to work with the new ralink SoC config symbols

Browse Source 
Since v3.9-rc1 the kernel has basic support for Ralink WiSoC. The config symbols
are named slightly different than before. Fix the rt2x00 to match the new
symbols.

The commit causing this breakage is:
commit ae2b5bb657
Author: John Crispin <blogic@openwrt.org>
Date:   Sun Jan 20 22:05:30 2013 +0100
MIPS: ralink: adds Kbuild files

Signed-off-by: John Crispin <blogic@openwrt.org>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John Crispin 2013-03-13 13:20:15 +01:00 committed by John W. Linville
parent d15591b008
commit 5818a46a99
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/rt2x00/Kconfig
View File

@ -55,10 +55,10 @@ config RT61PCI
config RT2800PCI config RT2800PCI
tristate "Ralink rt27xx/rt28xx/rt30xx (PCI/PCIe/PCMCIA) support" tristate "Ralink rt27xx/rt28xx/rt30xx (PCI/PCIe/PCMCIA) support"
depends on PCI || RALINK_RT288X || RALINK_RT305X depends on PCI || SOC_RT288X || SOC_RT305X
select RT2800_LIB select RT2800_LIB
select RT2X00_LIB_PCI if PCI select RT2X00_LIB_PCI if PCI
select RT2X00_LIB_SOC if RALINK_RT288X || RALINK_RT305X select RT2X00_LIB_SOC if SOC_RT288X || SOC_RT305X
select RT2X00_LIB_FIRMWARE select RT2X00_LIB_FIRMWARE
select RT2X00_LIB_CRYPTO select RT2X00_LIB_CRYPTO
select CRC_CCITT select CRC_CCITT

14
drivers/net/wireless/rt2x00/rt2800pci.c
View File

@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
} }
#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X) #if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
{ {
void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE); void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);
@ -107,7 +107,7 @@ static inline int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
{ {
return -ENOMEM; return -ENOMEM;
} }
#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */ #endif /* CONFIG_SOC_RT288X || CONFIG_SOC_RT305X */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom) static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
@ -1177,7 +1177,7 @@ MODULE_DEVICE_TABLE(pci, rt2800pci_device_table);
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X) #if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
static int rt2800soc_probe(struct platform_device *pdev) static int rt2800soc_probe(struct platform_device *pdev)
{ {
return rt2x00soc_probe(pdev, &rt2800pci_ops); return rt2x00soc_probe(pdev, &rt2800pci_ops);
@ -1194,7 +1194,7 @@ static struct platform_driver rt2800soc_driver = {
.suspend = rt2x00soc_suspend, .suspend = rt2x00soc_suspend,
.resume = rt2x00soc_resume, .resume = rt2x00soc_resume,
}; };
#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */ #endif /* CONFIG_SOC_RT288X || CONFIG_SOC_RT305X */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int rt2800pci_probe(struct pci_dev *pci_dev, static int rt2800pci_probe(struct pci_dev *pci_dev,
@ -1217,7 +1217,7 @@ static int __init rt2800pci_init(void)
{ {
int ret = 0; int ret = 0;
#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X) #if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
ret = platform_driver_register(&rt2800soc_driver); ret = platform_driver_register(&rt2800soc_driver);
if (ret) if (ret)
return ret; return ret;
@ -1225,7 +1225,7 @@ static int __init rt2800pci_init(void)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
ret = pci_register_driver(&rt2800pci_driver); ret = pci_register_driver(&rt2800pci_driver);
if (ret) { if (ret) {
#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X) #if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
platform_driver_unregister(&rt2800soc_driver); platform_driver_unregister(&rt2800soc_driver);
#endif #endif
return ret; return ret;
@ -1240,7 +1240,7 @@ static void __exit rt2800pci_exit(void)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
pci_unregister_driver(&rt2800pci_driver); pci_unregister_driver(&rt2800pci_driver);
#endif #endif
#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X) #if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
platform_driver_unregister(&rt2800soc_driver); platform_driver_unregister(&rt2800soc_driver);
#endif #endif
} }