rt2x00: rt2800pci: move SoC specific code into a separate module

The PCI and SoC specific drivers are using separate
code now so it is not reasonable to use the same
module for both drivers anymore.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

4 files changed, 284 insertions, 245 deletions

diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index e86324931b63..006b8bcb2e31 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -58,12 +58,11 @@ config RT61PCI
 
 config RT2800PCI
         tristate "Ralink rt27xx/rt28xx/rt30xx (PCI/PCIe/PCMCIA) support"
-        depends on PCI || SOC_RT288X || SOC_RT305X
+        depends on PCI
         select RT2800_LIB
         select RT2800_LIB_MMIO
         select RT2X00_LIB_MMIO
-        select RT2X00_LIB_PCI if PCI
-        select RT2X00_LIB_SOC if SOC_RT288X || SOC_RT305X
+        select RT2X00_LIB_PCI
         select RT2X00_LIB_FIRMWARE
         select RT2X00_LIB_CRYPTO
         select CRC_CCITT
@@ -200,6 +199,22 @@ config RT2800USB_UNKNOWN
 
 endif
 
+config RT2800SOC
+        tristate "Ralink WiSoC support"
+        depends on SOC_RT288X || SOC_RT305X
+        select RT2X00_LIB_SOC
+        select RT2X00_LIB_MMIO
+        select RT2X00_LIB_CRYPTO
+        select RT2X00_LIB_FIRMWARE
+        select RT2800_LIB
+        select RT2800_LIB_MMIO
+        ---help---
+          This adds support for Ralink WiSoC devices.
+          Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352.
+
+          When compiled as a module, this driver will be called rt2800soc.
+
+
 config RT2800_LIB
         tristate
 
diff --git a/drivers/net/wireless/rt2x00/Makefile b/drivers/net/wireless/rt2x00/Makefile
index d11e3562ab46..24a66015a495 100644
--- a/drivers/net/wireless/rt2x00/Makefile
+++ b/drivers/net/wireless/rt2x00/Makefile
@@ -22,3 +22,4 @@ obj-$(CONFIG_RT2800PCI)			+= rt2800pci.o
 obj-$(CONFIG_RT2500USB)                 += rt2500usb.o
 obj-$(CONFIG_RT73USB)                   += rt73usb.o
 obj-$(CONFIG_RT2800USB)                 += rt2800usb.o
+obj-$(CONFIG_RT2800SOC)                 += rt2800soc.o
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 488d1c449349..260d2fdadc76 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -37,13 +37,11 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/platform_device.h>
 #include <linux/eeprom_93cx6.h>
 
 #include "rt2x00.h"
 #include "rt2x00mmio.h"
 #include "rt2x00pci.h"
-#include "rt2x00soc.h"
 #include "rt2800lib.h"
 #include "rt2800mmio.h"
 #include "rt2800.h"
@@ -56,7 +54,6 @@ static bool modparam_nohwcrypt = false;
 module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
 
-#ifdef CONFIG_PCI
 static bool rt2800pci_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)
 {
         return modparam_nohwcrypt;
@@ -449,230 +446,15 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
 #endif
         { 0, }
 };
-#endif /* CONFIG_PCI */
 
 MODULE_AUTHOR(DRV_PROJECT);
 MODULE_VERSION(DRV_VERSION);
 MODULE_DESCRIPTION("Ralink RT2800 PCI & PCMCIA Wireless LAN driver.");
 MODULE_SUPPORTED_DEVICE("Ralink RT2860 PCI & PCMCIA chipset based cards");
-#ifdef CONFIG_PCI
 MODULE_FIRMWARE(FIRMWARE_RT2860);
 MODULE_DEVICE_TABLE(pci, rt2800pci_device_table);
-#endif /* CONFIG_PCI */
 MODULE_LICENSE("GPL");
 
-#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
-static bool rt2800soc_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)
-{
-        return modparam_nohwcrypt;
-}
-
-static void rt2800soc_disable_radio(struct rt2x00_dev *rt2x00dev)
-{
-        rt2800_disable_radio(rt2x00dev);
-        rt2x00mmio_register_write(rt2x00dev, PWR_PIN_CFG, 0);
-        rt2x00mmio_register_write(rt2x00dev, TX_PIN_CFG, 0);
-}
-
-static int rt2800soc_set_device_state(struct rt2x00_dev *rt2x00dev,
-                                      enum dev_state state)
-{
-        int retval = 0;
-
-        switch (state) {
-        case STATE_RADIO_ON:
-                retval = rt2800mmio_enable_radio(rt2x00dev);
-                break;
-
-        case STATE_RADIO_OFF:
-                rt2800soc_disable_radio(rt2x00dev);
-                break;
-
-        case STATE_RADIO_IRQ_ON:
-        case STATE_RADIO_IRQ_OFF:
-                rt2800mmio_toggle_irq(rt2x00dev, state);
-                break;
-
-        case STATE_DEEP_SLEEP:
-        case STATE_SLEEP:
-        case STATE_STANDBY:
-        case STATE_AWAKE:
-                /* These states are not supported, but don't report an error */
-                retval = 0;
-                break;
-
-        default:
-                retval = -ENOTSUPP;
-                break;
-        }
-
-        if (unlikely(retval))
-                rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",
-                           state, retval);
-
-        return retval;
-}
-
-static int rt2800soc_read_eeprom(struct rt2x00_dev *rt2x00dev)
-{
-        void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);
-
-        if (!base_addr)
-                return -ENOMEM;
-
-        memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
-
-        iounmap(base_addr);
-        return 0;
-}
-
-/* Firmware functions */
-static char *rt2800soc_get_firmware_name(struct rt2x00_dev *rt2x00dev)
-{
-        WARN_ON_ONCE(1);
-        return NULL;
-}
-
-static int rt2800soc_load_firmware(struct rt2x00_dev *rt2x00dev,
-                                   const u8 *data, const size_t len)
-{
-        WARN_ON_ONCE(1);
-        return 0;