Driver SDIO code is currently in files name ks7010_sdio.[ch]. These
names are not uniform with the rest of the files in this driver. This
driver only covers a single chipset, the file prefix does not add any
extra information. Other in-tree SDIO drivers typically call these
files sdio.[ch]. This is achieved using the following commands.

$ git mv ks7010_sdio.c sdio.c
$ git mv ks7010_sdio.h sdio.h

Rename 'ks7010_sdio.c' to 'sdio.c'
Rename 'ks7010_sdio.h' to 'sdio.h'

Signed-off-by: Tobin C. Harding <m...@tobin.cc>
---
 drivers/staging/ks7010/Makefile      |    2 +-
 drivers/staging/ks7010/ks7010_sdio.c | 1078 ----------------------------------
 drivers/staging/ks7010/ks7010_sdio.h |  176 ------
 drivers/staging/ks7010/ks_wlan.h     |    2 +-
 drivers/staging/ks7010/sdio.c        | 1078 ++++++++++++++++++++++++++++++++++
 drivers/staging/ks7010/sdio.h        |  176 ++++++
 6 files changed, 1256 insertions(+), 1256 deletions(-)
 delete mode 100644 drivers/staging/ks7010/ks7010_sdio.c
 delete mode 100644 drivers/staging/ks7010/ks7010_sdio.h
 create mode 100644 drivers/staging/ks7010/sdio.c
 create mode 100644 drivers/staging/ks7010/sdio.h

diff --git a/drivers/staging/ks7010/Makefile b/drivers/staging/ks7010/Makefile
index 69fcf8d..d14f292 100644
--- a/drivers/staging/ks7010/Makefile
+++ b/drivers/staging/ks7010/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_KS7010) += ks7010.o
 
 ccflags-y           += -DKS_WLAN_DEBUG=0
-ks7010-y            := michael_mic.o ks_hostif.o ks_wlan_net.o ks7010_sdio.o
+ks7010-y            := michael_mic.o ks_hostif.o ks_wlan_net.o sdio.o
diff --git a/drivers/staging/ks7010/ks7010_sdio.c 
b/drivers/staging/ks7010/ks7010_sdio.c
deleted file mode 100644
index 487506e..0000000
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ /dev/null
@@ -1,1078 +0,0 @@
-/*
- *   Driver for KeyStream, KS7010 based SDIO cards.
- *
- *   Copyright (C) 2006-2008 KeyStream Corp.
- *   Copyright (C) 2009 Renesas Technology Corp.
- *   Copyright (C) 2016 Sang Engineering, Wolfram Sang
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2 as
- *   published by the Free Software Foundation.
- */
-
-#include <linux/firmware.h>
-#include <linux/mmc/card.h>
-#include <linux/mmc/sdio_func.h>
-#include <linux/workqueue.h>
-#include <linux/atomic.h>
-
-#include "ks_wlan.h"
-#include "ks_wlan_ioctl.h"
-#include "ks_hostif.h"
-#include "ks7010_sdio.h"
-
-#define KS7010_FUNC_NUM 1
-#define KS7010_IO_BLOCK_SIZE 512
-#define KS7010_MAX_CLOCK 25000000
-
-static const struct sdio_device_id ks7010_sdio_ids[] = {
-       {SDIO_DEVICE(SDIO_VENDOR_ID_KS_CODE_A, SDIO_DEVICE_ID_KS_7010)},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_KS_CODE_B, SDIO_DEVICE_ID_KS_7010)},
-       { /* all zero */ }
-};
-MODULE_DEVICE_TABLE(sdio, ks7010_sdio_ids);
-
-#define inc_txqhead(priv) \
-       (priv->tx_dev.qhead = (priv->tx_dev.qhead + 1) % TX_DEVICE_BUFF_SIZE)
-#define inc_txqtail(priv) \
-       (priv->tx_dev.qtail = (priv->tx_dev.qtail + 1) % TX_DEVICE_BUFF_SIZE)
-#define cnt_txqbody(priv) \
-       (((priv->tx_dev.qtail + TX_DEVICE_BUFF_SIZE) - (priv->tx_dev.qhead)) % 
TX_DEVICE_BUFF_SIZE)
-
-#define inc_rxqhead(priv) \
-       (priv->rx_dev.qhead = (priv->rx_dev.qhead + 1) % RX_DEVICE_BUFF_SIZE)
-#define inc_rxqtail(priv) \
-       (priv->rx_dev.qtail = (priv->rx_dev.qtail + 1) % RX_DEVICE_BUFF_SIZE)
-#define cnt_rxqbody(priv) \
-       (((priv->rx_dev.qtail + RX_DEVICE_BUFF_SIZE) - (priv->rx_dev.qhead)) % 
RX_DEVICE_BUFF_SIZE)
-
-/* Read single byte from device address into byte (CMD52) */
-static int ks7010_sdio_readb(struct ks_wlan_private *priv, unsigned int 
address,
-                            unsigned char *byte)
-{
-       struct sdio_func *func = priv->ks_sdio_card->func;
-       int ret;
-
-       *byte = sdio_readb(func, address, &ret);
-
-       return ret;
-}
-
-/* Read length bytes from device address into buffer (CMD53) */
-static int ks7010_sdio_read(struct ks_wlan_private *priv, unsigned int address,
-                           unsigned char *buffer, int length)
-{
-       struct sdio_func *func = priv->ks_sdio_card->func;
-
-       return sdio_memcpy_fromio(func, buffer, address, length);
-}
-
-/* Write single byte to device address (CMD52) */
-static int ks7010_sdio_writeb(struct ks_wlan_private *priv,
-                             unsigned int address, unsigned char byte)
-{
-       struct sdio_func *func = priv->ks_sdio_card->func;
-       int ret;
-
-       sdio_writeb(func, byte, address, &ret);
-
-       return ret;
-}
-
-/* Write length bytes to device address from buffer (CMD53) */
-static int ks7010_sdio_write(struct ks_wlan_private *priv, unsigned int 
address,
-                            unsigned char *buffer, int length)
-{
-       struct sdio_func *func = priv->ks_sdio_card->func;
-
-       return sdio_memcpy_toio(func, address, buffer, length);
-}
-
-static void ks_wlan_hw_sleep_doze_request(struct ks_wlan_private *priv)
-{
-       int ret;
-
-       DPRINTK(4, "\n");
-
-       /* clear request */
-       atomic_set(&priv->sleepstatus.doze_request, 0);
-
-       if (atomic_read(&priv->sleepstatus.status) == 0) {
-               ret = ks7010_sdio_writeb(priv, GCR_B, GCR_B_DOZE);
-               if (ret) {
-                       DPRINTK(1, " error : GCR_B\n");
-                       goto set_sleep_mode;
-               }
-               DPRINTK(3, "sleep_mode=SLP_SLEEP\n");
-               atomic_set(&priv->sleepstatus.status, 1);
-               priv->last_doze = jiffies;
-       } else {
-               DPRINTK(1, "sleep_mode=%d\n", priv->sleep_mode);
-       }
-
-set_sleep_mode:
-       priv->sleep_mode = atomic_read(&priv->sleepstatus.status);
-}
-
-static void ks_wlan_hw_sleep_wakeup_request(struct ks_wlan_private *priv)
-{
-       int ret;
-
-       DPRINTK(4, "\n");
-
-       /* clear request */
-       atomic_set(&priv->sleepstatus.wakeup_request, 0);
-
-       if (atomic_read(&priv->sleepstatus.status) == 1) {
-               ret = ks7010_sdio_writeb(priv, WAKEUP, WAKEUP_REQ);
-               if (ret) {
-                       DPRINTK(1, " error : WAKEUP\n");
-                       goto set_sleep_mode;
-               }
-               DPRINTK(4, "wake up : WAKEUP\n");
-               atomic_set(&priv->sleepstatus.status, 0);
-               priv->last_wakeup = jiffies;
-               ++priv->wakeup_count;
-       } else {
-               DPRINTK(1, "sleep_mode=%d\n", priv->sleep_mode);
-       }
-
-set_sleep_mode:
-       priv->sleep_mode = atomic_read(&priv->sleepstatus.status);
-}
-
-void ks_wlan_hw_wakeup_request(struct ks_wlan_private *priv)
-{
-       int ret;
-
-       DPRINTK(4, "\n");
-       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
-               ret = ks7010_sdio_writeb(priv, WAKEUP, WAKEUP_REQ);
-               if (ret)
-                       DPRINTK(1, " error : WAKEUP\n");
-               else
-                       DPRINTK(4, "wake up : WAKEUP\n");
-
-               priv->last_wakeup = jiffies;
-               ++priv->wakeup_count;
-       } else {
-               DPRINTK(1, "psstatus=%d\n",
-                       atomic_read(&priv->psstatus.status));
-       }
-}
-
-static void _ks_wlan_hw_power_save(struct ks_wlan_private *priv)
-{
-       unsigned char byte;
-       int ret;
-
-       if (priv->reg.powermgt == POWMGT_ACTIVE_MODE)
-               return;
-
-       if (priv->reg.operation_mode != MODE_INFRASTRUCTURE)
-               return;
-
-       if ((priv->connect_status & CONNECT_STATUS_MASK) != CONNECT_STATUS)
-               return;
-
-       if (priv->dev_state != DEVICE_STATE_SLEEP)
-               return;
-
-       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE)
-               return;
-
-       DPRINTK(5, 
"\npsstatus.status=%d\npsstatus.confirm_wait=%d\npsstatus.snooze_guard=%d\ncnt_txqbody=%d\n",
-               atomic_read(&priv->psstatus.status),
-               atomic_read(&priv->psstatus.confirm_wait),
-               atomic_read(&priv->psstatus.snooze_guard),
-               cnt_txqbody(priv));
-
-       if (atomic_read(&priv->psstatus.confirm_wait) ||
-           atomic_read(&priv->psstatus.snooze_guard) ||
-           cnt_txqbody(priv)) {
-               queue_delayed_work(priv->wq, &priv->rw_dwork, 0);
-               return;
-       }
-
-       ret = ks7010_sdio_readb(priv, INT_PENDING, &byte);
-       if (ret) {
-               DPRINTK(1, " error : INT_PENDING\n");
-               goto queue_delayed_work;
-       }
-       if (byte)
-               goto queue_delayed_work;
-
-       ret = ks7010_sdio_writeb(priv, GCR_B, GCR_B_DOZE);
-       if (ret) {
-               DPRINTK(1, " error : GCR_B\n");
-               goto queue_delayed_work;
-       }
-       atomic_set(&priv->psstatus.status, PS_SNOOZE);
-       DPRINTK(3, "psstatus.status=PS_SNOOZE\n");
-
-       return;
-
-queue_delayed_work:
-       queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
-}
-
-int ks_wlan_hw_power_save(struct ks_wlan_private *priv)
-{
-       queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
-       return 0;
-}
-
-static int enqueue_txdev(struct ks_wlan_private *priv, unsigned char *p,
-                        unsigned long size,
-                        void (*complete_handler)(void *, void *),
-                        void *arg1, void *arg2)
-{
-       struct tx_device_buffer *sp;
-       int ret;
-
-       if (priv->dev_state < DEVICE_STATE_BOOT) {
-               ret = -EPERM;
-               goto err_complete;
-       }
-
-       if ((TX_DEVICE_BUFF_SIZE - 1) <= cnt_txqbody(priv)) {
-               DPRINTK(1, "tx buffer overflow\n");
-               ret = -EOVERFLOW;
-               goto err_complete;
-       }
-
-       sp = &priv->tx_dev.tx_dev_buff[priv->tx_dev.qtail];
-       sp->sendp = p;
-       sp->size = size;
-       sp->complete_handler = complete_handler;
-       sp->arg1 = arg1;
-       sp->arg2 = arg2;
-       inc_txqtail(priv);
-
-       return 0;
-
-err_complete:
-       kfree(p);
-       if (complete_handler)
-               (*complete_handler) (arg1, arg2);
-
-       return ret;
-}
-
-/* write data */
-static int write_to_device(struct ks_wlan_private *priv, unsigned char *buffer,
-                          unsigned long size)
-{
-       struct hostif_hdr *hdr;
-       int ret;
-
-       hdr = (struct hostif_hdr *)buffer;
-
-       DPRINTK(4, "size=%d\n", hdr->size);
-       if (hdr->event < HIF_DATA_REQ || HIF_REQ_MAX < hdr->event) {
-               DPRINTK(1, "unknown event=%04X\n", hdr->event);
-               return 0;
-       }
-
-       ret = ks7010_sdio_write(priv, DATA_WINDOW, buffer, size);
-       if (ret) {
-               DPRINTK(1, " write error : retval=%d\n", ret);
-               return ret;
-       }
-
-       ret = ks7010_sdio_writeb(priv, WRITE_STATUS, WRITE_STATUS_BUSY);
-       if (ret) {
-               DPRINTK(1, " error : WRITE_STATUS\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-static void tx_device_task(struct ks_wlan_private *priv)
-{
-       struct tx_device_buffer *sp;
-       int ret;
-
-       DPRINTK(4, "\n");
-       if (cnt_txqbody(priv) <= 0 ||
-           atomic_read(&priv->psstatus.status) == PS_SNOOZE)
-               return;
-
-       sp = &priv->tx_dev.tx_dev_buff[priv->tx_dev.qhead];
-       if (priv->dev_state >= DEVICE_STATE_BOOT) {
-               ret = write_to_device(priv, sp->sendp, sp->size);
-               if (ret) {
-                       DPRINTK(1, "write_to_device error !!(%d)\n", ret);
-                       queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
-                       return;
-               }
-       }
-       kfree(sp->sendp);
-       if (sp->complete_handler)       /* TX Complete */
-               (*sp->complete_handler) (sp->arg1, sp->arg2);
-       inc_txqhead(priv);
-
-       if (cnt_txqbody(priv) > 0)
-               queue_delayed_work(priv->wq, &priv->rw_dwork, 0);
-}
-
-int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size,
-                 void (*complete_handler)(void *, void *),
-                 void *arg1, void *arg2)
-{
-       int result = 0;
-       struct hostif_hdr *hdr;
-
-       hdr = (struct hostif_hdr *)p;
-
-       if (hdr->event < HIF_DATA_REQ || HIF_REQ_MAX < hdr->event) {
-               DPRINTK(1, "unknown event=%04X\n", hdr->event);
-               return 0;
-       }
-
-       /* add event to hostt buffer */
-       priv->hostt.buff[priv->hostt.qtail] = hdr->event;
-       priv->hostt.qtail = (priv->hostt.qtail + 1) % SME_EVENT_BUFF_SIZE;
-
-       DPRINTK(4, "event=%04X\n", hdr->event);
-       spin_lock(&priv->tx_dev.tx_dev_lock);
-       result = enqueue_txdev(priv, p, size, complete_handler, arg1, arg2);
-       spin_unlock(&priv->tx_dev.tx_dev_lock);
-
-       if (cnt_txqbody(priv) > 0)
-               queue_delayed_work(priv->wq, &priv->rw_dwork, 0);
-
-       return result;
-}
-
-static void rx_event_task(unsigned long dev)
-{
-       struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
-       struct rx_device_buffer *rp;
-
-       DPRINTK(4, "\n");
-
-       if (cnt_rxqbody(priv) > 0 && priv->dev_state >= DEVICE_STATE_BOOT) {
-               rp = &priv->rx_dev.rx_dev_buff[priv->rx_dev.qhead];
-               hostif_receive(priv, rp->data, rp->size);
-               inc_rxqhead(priv);
-
-               if (cnt_rxqbody(priv) > 0)
-                       tasklet_schedule(&priv->rx_bh_task);
-       }
-}
-
-static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size)
-{
-       int ret;
-       struct rx_device_buffer *rx_buffer;
-       struct hostif_hdr *hdr;
-       unsigned short event = 0;
-
-       DPRINTK(4, "\n");
-
-       /* receive data */
-       if (cnt_rxqbody(priv) >= (RX_DEVICE_BUFF_SIZE - 1)) {
-               DPRINTK(1, "rx buffer overflow\n");
-               return;
-       }
-       rx_buffer = &priv->rx_dev.rx_dev_buff[priv->rx_dev.qtail];
-
-       ret = ks7010_sdio_read(priv, DATA_WINDOW, &rx_buffer->data[0],
-                              hif_align_size(size));
-       if (ret)
-               return;
-
-       /* length check */
-       if (size > 2046 || size == 0) {
-#ifdef KS_WLAN_DEBUG
-               if (KS_WLAN_DEBUG > 5)
-                       print_hex_dump_bytes("INVALID DATA dump: ",
-                                            DUMP_PREFIX_OFFSET,
-                                            rx_buffer->data, 32);
-#endif
-               ret = ks7010_sdio_writeb(priv, READ_STATUS, READ_STATUS_IDLE);
-               if (ret)
-                       DPRINTK(1, " error : READ_STATUS\n");
-
-               /* length check fail */
-               return;
-       }
-
-       hdr = (struct hostif_hdr *)&rx_buffer->data[0];
-       rx_buffer->size = le16_to_cpu(hdr->size) + sizeof(hdr->size);
-       event = hdr->event;
-       inc_rxqtail(priv);
-
-       ret = ks7010_sdio_writeb(priv, READ_STATUS, READ_STATUS_IDLE);
-       if (ret)
-               DPRINTK(1, " error : READ_STATUS\n");
-
-       if (atomic_read(&priv->psstatus.confirm_wait)) {
-               if (IS_HIF_CONF(event)) {
-                       DPRINTK(4, "IS_HIF_CONF true !!\n");
-                       atomic_dec(&priv->psstatus.confirm_wait);
-               }
-       }
-
-       tasklet_schedule(&priv->rx_bh_task);
-}
-
-static void ks7010_rw_function(struct work_struct *work)
-{
-       struct ks_wlan_private *priv;
-       unsigned char byte;
-       int ret;
-
-       priv = container_of(work, struct ks_wlan_private, rw_dwork.work);
-
-       DPRINTK(4, "\n");
-
-       /* wait after DOZE */
-       if (time_after(priv->last_doze + ((30 * HZ) / 1000), jiffies)) {
-               DPRINTK(4, "wait after DOZE\n");
-               queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
-               return;
-       }
-
-       /* wait after WAKEUP */
-       while (time_after(priv->last_wakeup + ((30 * HZ) / 1000), jiffies)) {
-               DPRINTK(4, "wait after WAKEUP\n");
-               dev_info(&priv->ks_sdio_card->func->dev,
-                        "wake: %lu %lu\n",
-                        priv->last_wakeup + (30 * HZ) / 1000,
-                               jiffies);
-               msleep(30);
-       }
-
-       sdio_claim_host(priv->ks_sdio_card->func);
-
-       /* power save wakeup */
-       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
-               if (cnt_txqbody(priv) > 0) {
-                       ks_wlan_hw_wakeup_request(priv);
-                       queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
-               }
-               goto release_host;
-       }
-
-       /* sleep mode doze */
-       if (atomic_read(&priv->sleepstatus.doze_request) == 1) {
-               ks_wlan_hw_sleep_doze_request(priv);
-               goto release_host;
-       }
-       /* sleep mode wakeup */
-       if (atomic_read(&priv->sleepstatus.wakeup_request) == 1) {
-               ks_wlan_hw_sleep_wakeup_request(priv);
-               goto release_host;
-       }
-
-       /* read (WriteStatus/ReadDataSize FN1:00_0014) */
-       ret = ks7010_sdio_readb(priv, WSTATUS_RSIZE, &byte);
-       if (ret) {
-               DPRINTK(1, " error : WSTATUS_RSIZE psstatus=%d\n",
-                       atomic_read(&priv->psstatus.status));
-               goto release_host;
-       }
-       DPRINTK(4, "WSTATUS_RSIZE=%02X\n", byte);
-
-       if (byte & RSIZE_MASK) {        /* Read schedule */
-               ks_wlan_hw_rx(priv, (uint16_t)((byte & RSIZE_MASK) << 4));
-       }
-       if ((byte & WSTATUS_MASK))
-               tx_device_task(priv);
-
-       _ks_wlan_hw_power_save(priv);
-
-release_host:
-       sdio_release_host(priv->ks_sdio_card->func);
-}
-
-static void ks_sdio_interrupt(struct sdio_func *func)
-{
-       int ret;
-       struct ks_sdio_card *card;
-       struct ks_wlan_private *priv;
-       unsigned char status, rsize, byte;
-
-       card = sdio_get_drvdata(func);
-       priv = card->priv;
-       DPRINTK(4, "\n");
-
-       if (priv->dev_state < DEVICE_STATE_BOOT)
-               goto queue_delayed_work;
-
-       ret = ks7010_sdio_readb(priv, INT_PENDING, &status);
-       if (ret) {
-               DPRINTK(1, "error : INT_PENDING\n");
-               goto queue_delayed_work;
-       }
-       DPRINTK(4, "INT_PENDING=%02X\n", status);
-
-       /* schedule task for interrupt status */
-       /* bit7 -> Write General Communication B register */
-       /* read (General Communication B register) */
-       /* bit5 -> Write Status Idle */
-       /* bit2 -> Read Status Busy  */
-       if (status & INT_GCR_B ||
-           atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
-               ret = ks7010_sdio_readb(priv, GCR_B, &byte);
-               if (ret) {
-                       DPRINTK(1, " error : GCR_B\n");
-                       goto queue_delayed_work;
-               }
-               if (byte == GCR_B_ACTIVE) {
-                       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
-                               atomic_set(&priv->psstatus.status, PS_WAKEUP);
-                               priv->wakeup_count = 0;
-                       }
-                       complete(&priv->psstatus.wakeup_wait);
-               }
-       }
-
-       do {
-               /* read (WriteStatus/ReadDataSize FN1:00_0014) */
-               ret = ks7010_sdio_readb(priv, WSTATUS_RSIZE, &byte);
-               if (ret) {
-                       DPRINTK(1, " error : WSTATUS_RSIZE\n");
-                       goto queue_delayed_work;
-               }
-               DPRINTK(4, "WSTATUS_RSIZE=%02X\n", byte);
-               rsize = byte & RSIZE_MASK;
-               if (rsize != 0)         /* Read schedule */
-                       ks_wlan_hw_rx(priv, (uint16_t)(rsize << 4));
-
-               if (byte & WSTATUS_MASK) {
-                       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
-                               if (cnt_txqbody(priv)) {
-                                       ks_wlan_hw_wakeup_request(priv);
-                                       queue_delayed_work(priv->wq, 
&priv->rw_dwork, 1);
-                                       return;
-                               }
-                       } else {
-                               tx_device_task(priv);
-                       }
-               }
-       } while (rsize);
-
-queue_delayed_work:
-       queue_delayed_work(priv->wq, &priv->rw_dwork, 0);
-}
-
-static int trx_device_init(struct ks_wlan_private *priv)
-{
-       priv->tx_dev.qhead = 0;
-       priv->tx_dev.qtail = 0;
-
-       priv->rx_dev.qhead = 0;
-       priv->rx_dev.qtail = 0;
-
-       spin_lock_init(&priv->tx_dev.tx_dev_lock);
-       spin_lock_init(&priv->rx_dev.rx_dev_lock);
-
-       tasklet_init(&priv->rx_bh_task, rx_event_task, (unsigned long)priv);
-
-       return 0;
-}
-
-static void trx_device_exit(struct ks_wlan_private *priv)
-{
-       struct tx_device_buffer *sp;
-
-       /* tx buffer clear */
-       while (cnt_txqbody(priv) > 0) {
-               sp = &priv->tx_dev.tx_dev_buff[priv->tx_dev.qhead];
-               kfree(sp->sendp);
-               if (sp->complete_handler)       /* TX Complete */
-                       (*sp->complete_handler) (sp->arg1, sp->arg2);
-               inc_txqhead(priv);
-       }
-
-       tasklet_kill(&priv->rx_bh_task);
-}
-
-static int ks7010_sdio_update_index(struct ks_wlan_private *priv, u32 index)
-{
-       int ret;
-       unsigned char *data_buf;
-
-       data_buf = kmalloc(sizeof(u32), GFP_KERNEL);
-       if (!data_buf)
-               return -ENOMEM;
-
-       memcpy(data_buf, &index, sizeof(index));
-       ret = ks7010_sdio_write(priv, WRITE_INDEX, data_buf, sizeof(index));
-       if (ret)
-               goto err_free_data_buf;
-
-       ret = ks7010_sdio_write(priv, READ_INDEX, data_buf, sizeof(index));
-       if (ret)
-               goto err_free_data_buf;
-
-       return 0;
-
-err_free_data_buf:
-       kfree(data_buf);
-
-       return ret;
-}
-
-#define ROM_BUFF_SIZE (64 * 1024)
-static int ks7010_sdio_data_compare(struct ks_wlan_private *priv, u32 address,
-                                   unsigned char *data, unsigned int size)
-{
-       int ret;
-       unsigned char *read_buf;
-
-       read_buf = kmalloc(ROM_BUFF_SIZE, GFP_KERNEL);
-       if (!read_buf)
-               return -ENOMEM;
-
-       ret = ks7010_sdio_read(priv, address, read_buf, size);
-       if (ret)
-               goto err_free_read_buf;
-
-       if (memcmp(data, read_buf, size) != 0) {
-               ret = -EIO;
-               DPRINTK(0, "data compare error (%d)\n", ret);
-               goto err_free_read_buf;
-       }
-
-       return 0;
-
-err_free_read_buf:
-       kfree(read_buf);
-
-       return ret;
-}
-
-static int ks7010_upload_firmware(struct ks_sdio_card *card)
-{
-       struct ks_wlan_private *priv = card->priv;
-       unsigned int size, offset, n = 0;
-       unsigned char *rom_buf;
-       unsigned char byte = 0;
-       int ret;
-       unsigned int length;
-       const struct firmware *fw_entry = NULL;
-
-       rom_buf = kmalloc(ROM_BUFF_SIZE, GFP_KERNEL);
-       if (!rom_buf)
-               return -ENOMEM;
-
-       sdio_claim_host(card->func);
-
-       /* Firmware running ? */
-       ret = ks7010_sdio_readb(priv, GCR_A, &byte);
-       if (byte == GCR_A_RUN) {
-               DPRINTK(0, "MAC firmware running ...\n");
-               goto release_host_and_free;
-       }
-
-       ret = request_firmware(&fw_entry, ROM_FILE,
-                              &priv->ks_sdio_card->func->dev);
-       if (ret)
-               goto release_host_and_free;
-
-       length = fw_entry->size;
-
-       n = 0;
-       do {
-               if (length >= ROM_BUFF_SIZE) {
-                       size = ROM_BUFF_SIZE;
-                       length = length - ROM_BUFF_SIZE;
-               } else {
-                       size = length;
-                       length = 0;
-               }
-               DPRINTK(4, "size = %d\n", size);
-               if (size == 0)
-                       break;
-               memcpy(rom_buf, fw_entry->data + n, size);
-
-               offset = n;
-               ret = ks7010_sdio_update_index(priv, KS7010_IRAM_ADDRESS + 
offset);
-               if (ret)
-                       goto release_firmware;
-
-               ret = ks7010_sdio_write(priv, DATA_WINDOW, rom_buf, size);
-               if (ret)
-                       goto release_firmware;
-
-               ret = ks7010_sdio_data_compare(priv, DATA_WINDOW, rom_buf, 
size);
-               if (ret)
-                       goto release_firmware;
-
-               n += size;
-
-       } while (size);
-
-       ret = ks7010_sdio_writeb(priv, GCR_A, GCR_A_REMAP);
-       if (ret)
-               goto release_firmware;
-
-       DPRINTK(4, " REMAP Request : GCR_A\n");
-
-       /* Firmware running check */
-       for (n = 0; n < 50; ++n) {
-               mdelay(10);     /* wait_ms(10); */
-               ret = ks7010_sdio_readb(priv, GCR_A, &byte);
-               if (ret)
-                       goto release_firmware;
-
-               if (byte == GCR_A_RUN)
-                       break;
-       }
-       DPRINTK(4, "firmware wakeup (%d)!!!!\n", n);
-       if ((50) <= n) {
-               DPRINTK(1, "firmware can't start\n");
-               ret = -EIO;
-               goto release_firmware;
-       }
-
-       ret = 0;
-
- release_firmware:
-       release_firmware(fw_entry);
- release_host_and_free:
-       sdio_release_host(card->func);
-       kfree(rom_buf);
-
-       return ret;
-}
-
-static void ks7010_card_init(struct ks_wlan_private *priv)
-{
-       DPRINTK(5, "\ncard_init_task()\n");
-
-       init_completion(&priv->confirm_wait);
-
-       DPRINTK(5, "init_completion()\n");
-
-       /* get mac address & firmware version */
-       hostif_sme_enqueue(priv, SME_START);
-
-       DPRINTK(5, "hostif_sme_enqueu()\n");
-
-       if (!wait_for_completion_interruptible_timeout
-           (&priv->confirm_wait, 5 * HZ)) {
-               DPRINTK(1, "wait time out!! SME_START\n");
-       }
-
-       if (priv->mac_address_valid && priv->version_size != 0)
-               priv->dev_state = DEVICE_STATE_PREINIT;
-
-       hostif_sme_enqueue(priv, SME_GET_EEPROM_CKSUM);
-
-       /* load initial wireless parameter */
-       hostif_sme_enqueue(priv, SME_STOP_REQUEST);
-
-       hostif_sme_enqueue(priv, SME_RTS_THRESHOLD_REQUEST);
-       hostif_sme_enqueue(priv, SME_FRAGMENTATION_THRESHOLD_REQUEST);
-
-       hostif_sme_enqueue(priv, SME_WEP_INDEX_REQUEST);
-       hostif_sme_enqueue(priv, SME_WEP_KEY1_REQUEST);
-       hostif_sme_enqueue(priv, SME_WEP_KEY2_REQUEST);
-       hostif_sme_enqueue(priv, SME_WEP_KEY3_REQUEST);
-       hostif_sme_enqueue(priv, SME_WEP_KEY4_REQUEST);
-
-       hostif_sme_enqueue(priv, SME_WEP_FLAG_REQUEST);
-       hostif_sme_enqueue(priv, SME_RSN_ENABLED_REQUEST);
-       hostif_sme_enqueue(priv, SME_MODE_SET_REQUEST);
-       hostif_sme_enqueue(priv, SME_START_REQUEST);
-
-       if (!wait_for_completion_interruptible_timeout
-           (&priv->confirm_wait, 5 * HZ)) {
-               DPRINTK(1, "wait time out!! wireless parameter set\n");
-       }
-
-       if (priv->dev_state >= DEVICE_STATE_PREINIT) {
-               DPRINTK(1, "DEVICE READY!!\n");
-               priv->dev_state = DEVICE_STATE_READY;
-       } else {
-               DPRINTK(1, "dev_state=%d\n", priv->dev_state);
-       }
-}
-
-static void ks7010_init_defaults(struct ks_wlan_private *priv)
-{
-       priv->reg.tx_rate = TX_RATE_AUTO;
-       priv->reg.preamble = LONG_PREAMBLE;
-       priv->reg.powermgt = POWMGT_ACTIVE_MODE;
-       priv->reg.scan_type = ACTIVE_SCAN;
-       priv->reg.beacon_lost_count = 20;
-       priv->reg.rts = 2347UL;
-       priv->reg.fragment = 2346UL;
-       priv->reg.phy_type = D_11BG_COMPATIBLE_MODE;
-       priv->reg.cts_mode = CTS_MODE_FALSE;
-       priv->reg.rate_set.body[11] = TX_RATE_54M;
-       priv->reg.rate_set.body[10] = TX_RATE_48M;
-       priv->reg.rate_set.body[9] = TX_RATE_36M;
-       priv->reg.rate_set.body[8] = TX_RATE_18M;
-       priv->reg.rate_set.body[7] = TX_RATE_9M;
-       priv->reg.rate_set.body[6] = TX_RATE_24M | BASIC_RATE;
-       priv->reg.rate_set.body[5] = TX_RATE_12M | BASIC_RATE;
-       priv->reg.rate_set.body[4] = TX_RATE_6M | BASIC_RATE;
-       priv->reg.rate_set.body[3] = TX_RATE_11M | BASIC_RATE;
-       priv->reg.rate_set.body[2] = TX_RATE_5M | BASIC_RATE;
-       priv->reg.rate_set.body[1] = TX_RATE_2M | BASIC_RATE;
-       priv->reg.rate_set.body[0] = TX_RATE_1M | BASIC_RATE;
-       priv->reg.tx_rate = TX_RATE_FULL_AUTO;
-       priv->reg.rate_set.size = 12;
-}
-
-static int ks7010_sdio_probe(struct sdio_func *func,
-                            const struct sdio_device_id *device)
-{
-       struct ks_wlan_private *priv;
-       struct ks_sdio_card *card;
-       struct net_device *netdev;
-       unsigned char byte;
-       int ret;
-
-       DPRINTK(5, "ks7010_sdio_probe()\n");
-
-       priv = NULL;
-       netdev = NULL;
-
-       card = kzalloc(sizeof(*card), GFP_KERNEL);
-       if (!card)
-               return -ENOMEM;
-
-       card->func = func;
-
-       sdio_claim_host(func);
-
-       ret = sdio_set_block_size(func, KS7010_IO_BLOCK_SIZE);
-       DPRINTK(5, "multi_block=%d sdio_set_block_size()=%d %d\n",
-               func->card->cccr.multi_block, func->cur_blksize, ret);
-
-       ret = sdio_enable_func(func);
-       DPRINTK(5, "sdio_enable_func() %d\n", ret);
-       if (ret)
-               goto err_free_card;
-
-       /* interrupt disable */
-       sdio_writeb(func, 0, INT_ENABLE, &ret);
-       if (ret)
-               goto err_free_card;
-       sdio_writeb(func, 0xff, INT_PENDING, &ret);
-       if (ret)
-               goto err_disable_func;
-
-       /* setup interrupt handler */
-       ret = sdio_claim_irq(func, ks_sdio_interrupt);
-       if (ret)
-               goto err_disable_func;
-
-       sdio_release_host(func);
-
-       sdio_set_drvdata(func, card);
-
-       DPRINTK(5, "class = 0x%X, vendor = 0x%X, device = 0x%X\n",
-               func->class, func->vendor, func->device);
-
-       /* private memory allocate */
-       netdev = alloc_etherdev(sizeof(*priv));
-       if (!netdev) {
-               dev_err(&card->func->dev, "ks7010 : Unable to alloc new net 
device\n");
-               goto err_release_irq;
-       }
-       if (dev_alloc_name(netdev, "wlan%d") < 0) {
-               dev_err(&card->func->dev,
-                       "ks7010 :  Couldn't get name!\n");
-               goto err_free_netdev;
-       }
-
-       priv = netdev_priv(netdev);
-
-       card->priv = priv;
-       SET_NETDEV_DEV(netdev, &card->func->dev);       /* for create sysfs 
symlinks */
-
-       /* private memory initialize */
-       priv->ks_sdio_card = card;
-
-       priv->dev_state = DEVICE_STATE_PREBOOT;
-       priv->net_dev = netdev;
-       priv->firmware_version[0] = '\0';
-       priv->version_size = 0;
-       priv->last_doze = jiffies;
-       priv->last_wakeup = jiffies;
-       memset(&priv->nstats, 0, sizeof(priv->nstats));
-       memset(&priv->wstats, 0, sizeof(priv->wstats));
-
-       /* sleep mode */
-       atomic_set(&priv->sleepstatus.doze_request, 0);
-       atomic_set(&priv->sleepstatus.wakeup_request, 0);
-       atomic_set(&priv->sleepstatus.wakeup_request, 0);
-
-       trx_device_init(priv);
-       hostif_init(priv);
-       ks_wlan_net_start(netdev);
-
-       ks7010_init_defaults(priv);
-
-       ret = ks7010_upload_firmware(card);
-       if (ret) {
-               dev_err(&card->func->dev,
-                       "ks7010: firmware load failed !! return code = %d\n",
-                        ret);
-               goto err_free_netdev;
-       }
-
-       /* interrupt setting */
-       /* clear Interrupt status write (ARMtoSD_InterruptPending FN1:00_0024) 
*/
-       sdio_claim_host(func);
-       ret = ks7010_sdio_writeb(priv, INT_PENDING, 0xff);
-       sdio_release_host(func);
-       if (ret)
-               DPRINTK(1, " error : INT_PENDING\n");
-
-       /* enable ks7010sdio interrupt */
-       byte = (INT_GCR_B | INT_READ_STATUS | INT_WRITE_STATUS);
-       sdio_claim_host(func);
-       ret = ks7010_sdio_writeb(priv, INT_ENABLE, byte);
-       sdio_release_host(func);
-       if (ret)
-               DPRINTK(1, " err : INT_ENABLE\n");
-
-       DPRINTK(4, " enable Interrupt : INT_ENABLE=%02X\n", byte);
-       priv->dev_state = DEVICE_STATE_BOOT;
-
-       priv->wq = create_workqueue("wq");
-       if (!priv->wq) {
-               DPRINTK(1, "create_workqueue failed !!\n");
-               goto err_free_netdev;
-       }
-
-       INIT_DELAYED_WORK(&priv->rw_dwork, ks7010_rw_function);
-       ks7010_card_init(priv);
-
-       ret = register_netdev(priv->net_dev);
-       if (ret)
-               goto err_free_netdev;
-
-       return 0;
-
- err_free_netdev:
-       free_netdev(priv->net_dev);
-       card->priv = NULL;
- err_release_irq:
-       sdio_claim_host(func);
-       sdio_release_irq(func);
- err_disable_func:
-       sdio_disable_func(func);
- err_free_card:
-       sdio_release_host(func);
-       sdio_set_drvdata(func, NULL);
-       kfree(card);
-
-       return -ENODEV;
-}
-
-/* send stop request to MAC */
-static int send_stop_request(struct sdio_func *func)
-{
-       struct hostif_stop_request_t *pp;
-       struct ks_sdio_card *card;
-       size_t size;
-
-       card = sdio_get_drvdata(func);
-
-       pp = kzalloc(hif_align_size(sizeof(*pp)), GFP_KERNEL);
-       if (!pp) {
-               DPRINTK(3, "allocate memory failed..\n");
-               return -ENOMEM;
-       }
-
-       size = sizeof(*pp) - sizeof(pp->header.size);
-       pp->header.size = cpu_to_le16((uint16_t)size);
-       pp->header.event = cpu_to_le16((uint16_t)HIF_STOP_REQ);
-
-       sdio_claim_host(func);
-       write_to_device(card->priv, (unsigned char *)pp,
-                       hif_align_size(sizeof(*pp)));
-       sdio_release_host(func);
-
-       kfree(pp);
-       return 0;
-}
-
-static void ks7010_sdio_remove(struct sdio_func *func)
-{
-       int ret;
-       struct ks_sdio_card *card;
-       struct ks_wlan_private *priv;
-
-       DPRINTK(1, "ks7010_sdio_remove()\n");
-
-       card = sdio_get_drvdata(func);
-
-       if (!card)
-               return;
-
-       DPRINTK(1, "priv = card->priv\n");
-       priv = card->priv;
-       if (priv) {
-               struct net_device *netdev = priv->net_dev;
-
-               ks_wlan_net_stop(netdev);
-               DPRINTK(1, "ks_wlan_net_stop\n");
-
-               /* interrupt disable */
-               sdio_claim_host(func);
-               sdio_writeb(func, 0, INT_ENABLE, &ret);
-               sdio_writeb(func, 0xff, INT_PENDING, &ret);
-               sdio_release_host(func);
-               DPRINTK(1, "interrupt disable\n");
-
-               ret = send_stop_request(func);
-               if (ret)        /* memory allocation failure */
-                       return;
-
-               DPRINTK(1, "STOP Req\n");
-
-               if (priv->wq) {
-                       flush_workqueue(priv->wq);
-                       destroy_workqueue(priv->wq);
-               }
-               DPRINTK(1, "destroy_workqueue(priv->wq);\n");
-
-               hostif_exit(priv);
-               DPRINTK(1, "hostif_exit\n");
-
-               unregister_netdev(netdev);
-
-               trx_device_exit(priv);
-               free_netdev(priv->net_dev);
-               card->priv = NULL;
-       }
-
-       sdio_claim_host(func);
-       sdio_release_irq(func);
-       DPRINTK(1, "sdio_release_irq()\n");
-       sdio_disable_func(func);
-       DPRINTK(1, "sdio_disable_func()\n");
-       sdio_release_host(func);
-
-       sdio_set_drvdata(func, NULL);
-
-       kfree(card);
-       DPRINTK(1, "kfree()\n");
-
-       DPRINTK(5, " Bye !!\n");
-}
-
-static struct sdio_driver ks7010_sdio_driver = {
-       .name = "ks7010_sdio",
-       .id_table = ks7010_sdio_ids,
-       .probe = ks7010_sdio_probe,
-       .remove = ks7010_sdio_remove,
-};
-
-module_driver(ks7010_sdio_driver, sdio_register_driver, 
sdio_unregister_driver);
-MODULE_AUTHOR("Sang Engineering, Qi-Hardware, KeyStream");
-MODULE_DESCRIPTION("Driver for KeyStream KS7010 based SDIO cards");
-MODULE_LICENSE("GPL v2");
-MODULE_FIRMWARE(ROM_FILE);
diff --git a/drivers/staging/ks7010/ks7010_sdio.h 
b/drivers/staging/ks7010/ks7010_sdio.h
deleted file mode 100644
index 78adeb9..0000000
--- a/drivers/staging/ks7010/ks7010_sdio.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *   Driver for KeyStream, KS7010 based SDIO cards.
- *
- *   Copyright (C) 2006-2008 KeyStream Corp.
- *   Copyright (C) 2009 Renesas Technology Corp.
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2 as
- *   published by the Free Software Foundation.
- */
-#ifndef _KS7010_SDIO_H
-#define _KS7010_SDIO_H
-
-#ifdef DEVICE_ALIGNMENT
-#undef DEVICE_ALIGNMENT
-#endif
-#define DEVICE_ALIGNMENT 32
-
-/*  SDIO KeyStream vendor and device */
-#define SDIO_VENDOR_ID_KS_CODE_A       0x005b
-#define SDIO_VENDOR_ID_KS_CODE_B       0x0023
-/* Older sources suggest earlier versions were named 7910 or 79xx */
-#define SDIO_DEVICE_ID_KS_7010         0x7910
-
-/* Read Status Register */
-#define READ_STATUS            0x000000
-enum read_status_type {
-       READ_STATUS_BUSY,
-       READ_STATUS_IDLE
-};
-
-/* Read Index Register */
-#define READ_INDEX             0x000004
-
-/* Read Data Size Register */
-#define READ_DATA_SIZE         0x000008
-
-/* Write Status Register */
-#define WRITE_STATUS           0x00000C
-enum write_status_type {
-       WRITE_STATUS_BUSY,
-       WRITE_STATUS_IDLE
-};
-
-/* Write Index Register */
-#define WRITE_INDEX            0x000010
-
-/* Write Status/Read Data Size Register
- * for network packet (less than 2048 bytes data)
- */
-#define WSTATUS_RSIZE          0x000014
-#define WSTATUS_MASK           0x80    /* Write Status Register value */
-#define RSIZE_MASK             0x7F    /* Read Data Size Register value [10:4] 
*/
-
-/* ARM to SD interrupt Enable */
-#define INT_ENABLE             0x000020
-/* ARM to SD interrupt Pending */
-#define INT_PENDING            0x000024
-
-#define INT_GCR_B              BIT(7)
-#define INT_GCR_A              BIT(6)
-#define INT_WRITE_STATUS       BIT(5)
-#define INT_WRITE_INDEX        BIT(4)
-#define INT_WRITE_SIZE         BIT(3)
-#define INT_READ_STATUS        BIT(2)
-#define INT_READ_INDEX         BIT(1)
-#define INT_READ_SIZE          BIT(0)
-
-/* General Communication Register A */
-#define GCR_A                  0x000028
-enum gen_com_reg_a {
-       GCR_A_INIT,
-       GCR_A_REMAP,
-       GCR_A_RUN
-};
-
-/* General Communication Register B */
-#define GCR_B                  0x00002C
-enum gen_com_reg_b {
-       GCR_B_ACTIVE,
-       GCR_B_DOZE
-};
-
-/* Wakeup Register */
-#define WAKEUP                 0x008018
-#define WAKEUP_REQ             0x5a
-
-/* AHB Data Window  0x010000-0x01FFFF */
-#define DATA_WINDOW            0x010000
-#define WINDOW_SIZE            (64 * 1024)
-
-#define KS7010_IRAM_ADDRESS    0x06000000
-
-/**
- * struct ks_sdio_card - SDIO device data.
- *
- * Structure is used as the &struct sdio_func private data.
- *
- * @func: Pointer to the SDIO function device.
- * @priv: Pointer to the &struct net_device private data.
- */
-struct ks_sdio_card {
-       struct sdio_func *func;
-       struct ks_wlan_private *priv;
-};
-
-/*
- * Tx Queue
- */
-
-#define        TX_DEVICE_BUFF_SIZE     1024
-
-/**
- * struct tx_device_buffer - Queue item for the tx queue.
- * @sendp: Pointer to the send request data.
- * @size: Size of @sendp data.
- * @complete_handler: Function called once data write to device is complete.
- * @arg1: First argument to @complete_handler.
- * @arg2: Second argument to @complete_handler.
- */
-struct tx_device_buffer {
-       unsigned char *sendp;
-       unsigned int size;
-       void (*complete_handler)(void *, void *);
-       void *arg1;
-       void *arg2;
-};
-
-/**
- * struct tx_device - Tx buffer queue.
- * @tx_device_buffer: Queue buffer.
- * @qhead: Head of tx queue.
- * @qtail: Tail of tx queue.
- * @tx_dev_lock: Queue lock.
- */
-struct tx_device {
-       struct tx_device_buffer tx_dev_buff[TX_DEVICE_BUFF_SIZE];
-       unsigned int qhead;
-       unsigned int qtail;
-       spinlock_t tx_dev_lock; /* protect access to the queue */
-};
-
-/*
- * Rx Queue
- */
-
-#define        RX_DATA_SIZE    (2 + 2 + 2347 + 1)
-#define        RX_DEVICE_BUFF_SIZE     32
-
-/**
- * struct rx_device_buffer - Queue item for the rx queue.
- * @data: rx data.
- * @size: Size of @data.
- */
-struct rx_device_buffer {
-       unsigned char data[RX_DATA_SIZE];
-       unsigned int size;
-};
-
-/**
- * struct rx_device - Rx buffer queue.
- * @rx_device_buffer: Queue buffer.
- * @qhead: Head of rx queue.
- * @qtail: Tail of rx queue.
- * @rx_dev_lock: Queue lock.
- */
-struct rx_device {
-       struct rx_device_buffer rx_dev_buff[RX_DEVICE_BUFF_SIZE];
-       unsigned int qhead;
-       unsigned int qtail;
-       spinlock_t rx_dev_lock; /* protect access to the queue */
-};
-
-#define        ROM_FILE "ks7010sd.rom"
-
-#endif /* _KS7010_SDIO_H */
diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h
index eb15db9..688869d 100644
--- a/drivers/staging/ks7010/ks_wlan.h
+++ b/drivers/staging/ks7010/ks_wlan.h
@@ -32,7 +32,7 @@
 
 #include <linux/io.h>
 
-#include "ks7010_sdio.h"
+#include "sdio.h"
 
 #ifdef KS_WLAN_DEBUG
 #define DPRINTK(n, fmt, args...) \
diff --git a/drivers/staging/ks7010/sdio.c b/drivers/staging/ks7010/sdio.c
new file mode 100644
index 0000000..d64df5d
--- /dev/null
+++ b/drivers/staging/ks7010/sdio.c
@@ -0,0 +1,1078 @@
+/*
+ *   Driver for KeyStream, KS7010 based SDIO cards.
+ *
+ *   Copyright (C) 2006-2008 KeyStream Corp.
+ *   Copyright (C) 2009 Renesas Technology Corp.
+ *   Copyright (C) 2016 Sang Engineering, Wolfram Sang
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2 as
+ *   published by the Free Software Foundation.
+ */
+
+#include <linux/firmware.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/sdio_func.h>
+#include <linux/workqueue.h>
+#include <linux/atomic.h>
+
+#include "ks_wlan.h"
+#include "ks_wlan_ioctl.h"
+#include "ks_hostif.h"
+#include "sdio.h"
+
+#define KS7010_FUNC_NUM 1
+#define KS7010_IO_BLOCK_SIZE 512
+#define KS7010_MAX_CLOCK 25000000
+
+static const struct sdio_device_id ks7010_sdio_ids[] = {
+       {SDIO_DEVICE(SDIO_VENDOR_ID_KS_CODE_A, SDIO_DEVICE_ID_KS_7010)},
+       {SDIO_DEVICE(SDIO_VENDOR_ID_KS_CODE_B, SDIO_DEVICE_ID_KS_7010)},
+       { /* all zero */ }
+};
+MODULE_DEVICE_TABLE(sdio, ks7010_sdio_ids);
+
+#define inc_txqhead(priv) \
+       (priv->tx_dev.qhead = (priv->tx_dev.qhead + 1) % TX_DEVICE_BUFF_SIZE)
+#define inc_txqtail(priv) \
+       (priv->tx_dev.qtail = (priv->tx_dev.qtail + 1) % TX_DEVICE_BUFF_SIZE)
+#define cnt_txqbody(priv) \
+       (((priv->tx_dev.qtail + TX_DEVICE_BUFF_SIZE) - (priv->tx_dev.qhead)) % 
TX_DEVICE_BUFF_SIZE)
+
+#define inc_rxqhead(priv) \
+       (priv->rx_dev.qhead = (priv->rx_dev.qhead + 1) % RX_DEVICE_BUFF_SIZE)
+#define inc_rxqtail(priv) \
+       (priv->rx_dev.qtail = (priv->rx_dev.qtail + 1) % RX_DEVICE_BUFF_SIZE)
+#define cnt_rxqbody(priv) \
+       (((priv->rx_dev.qtail + RX_DEVICE_BUFF_SIZE) - (priv->rx_dev.qhead)) % 
RX_DEVICE_BUFF_SIZE)
+
+/* Read single byte from device address into byte (CMD52) */
+static int ks7010_sdio_readb(struct ks_wlan_private *priv, unsigned int 
address,
+                            unsigned char *byte)
+{
+       struct sdio_func *func = priv->ks_sdio_card->func;
+       int ret;
+
+       *byte = sdio_readb(func, address, &ret);
+
+       return ret;
+}
+
+/* Read length bytes from device address into buffer (CMD53) */
+static int ks7010_sdio_read(struct ks_wlan_private *priv, unsigned int address,
+                           unsigned char *buffer, int length)
+{
+       struct sdio_func *func = priv->ks_sdio_card->func;
+
+       return sdio_memcpy_fromio(func, buffer, address, length);
+}
+
+/* Write single byte to device address (CMD52) */
+static int ks7010_sdio_writeb(struct ks_wlan_private *priv,
+                             unsigned int address, unsigned char byte)
+{
+       struct sdio_func *func = priv->ks_sdio_card->func;
+       int ret;
+
+       sdio_writeb(func, byte, address, &ret);
+
+       return ret;
+}
+
+/* Write length bytes to device address from buffer (CMD53) */
+static int ks7010_sdio_write(struct ks_wlan_private *priv, unsigned int 
address,
+                            unsigned char *buffer, int length)
+{
+       struct sdio_func *func = priv->ks_sdio_card->func;
+
+       return sdio_memcpy_toio(func, address, buffer, length);
+}
+
+static void ks_wlan_hw_sleep_doze_request(struct ks_wlan_private *priv)
+{
+       int ret;
+
+       DPRINTK(4, "\n");
+
+       /* clear request */
+       atomic_set(&priv->sleepstatus.doze_request, 0);
+
+       if (atomic_read(&priv->sleepstatus.status) == 0) {
+               ret = ks7010_sdio_writeb(priv, GCR_B, GCR_B_DOZE);
+               if (ret) {
+                       DPRINTK(1, " error : GCR_B\n");
+                       goto set_sleep_mode;
+               }
+               DPRINTK(3, "sleep_mode=SLP_SLEEP\n");
+               atomic_set(&priv->sleepstatus.status, 1);
+               priv->last_doze = jiffies;
+       } else {
+               DPRINTK(1, "sleep_mode=%d\n", priv->sleep_mode);
+       }
+
+set_sleep_mode:
+       priv->sleep_mode = atomic_read(&priv->sleepstatus.status);
+}
+
+static void ks_wlan_hw_sleep_wakeup_request(struct ks_wlan_private *priv)
+{
+       int ret;
+
+       DPRINTK(4, "\n");
+
+       /* clear request */
+       atomic_set(&priv->sleepstatus.wakeup_request, 0);
+
+       if (atomic_read(&priv->sleepstatus.status) == 1) {
+               ret = ks7010_sdio_writeb(priv, WAKEUP, WAKEUP_REQ);
+               if (ret) {
+                       DPRINTK(1, " error : WAKEUP\n");
+                       goto set_sleep_mode;
+               }
+               DPRINTK(4, "wake up : WAKEUP\n");
+               atomic_set(&priv->sleepstatus.status, 0);
+               priv->last_wakeup = jiffies;
+               ++priv->wakeup_count;
+       } else {
+               DPRINTK(1, "sleep_mode=%d\n", priv->sleep_mode);
+       }
+
+set_sleep_mode:
+       priv->sleep_mode = atomic_read(&priv->sleepstatus.status);
+}
+
+void ks_wlan_hw_wakeup_request(struct ks_wlan_private *priv)
+{
+       int ret;
+
+       DPRINTK(4, "\n");
+       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
+               ret = ks7010_sdio_writeb(priv, WAKEUP, WAKEUP_REQ);
+               if (ret)
+                       DPRINTK(1, " error : WAKEUP\n");
+               else
+                       DPRINTK(4, "wake up : WAKEUP\n");
+
+               priv->last_wakeup = jiffies;
+               ++priv->wakeup_count;
+       } else {
+               DPRINTK(1, "psstatus=%d\n",
+                       atomic_read(&priv->psstatus.status));
+       }
+}
+
+static void _ks_wlan_hw_power_save(struct ks_wlan_private *priv)
+{
+       unsigned char byte;
+       int ret;
+
+       if (priv->reg.powermgt == POWMGT_ACTIVE_MODE)
+               return;
+
+       if (priv->reg.operation_mode != MODE_INFRASTRUCTURE)
+               return;
+
+       if ((priv->connect_status & CONNECT_STATUS_MASK) != CONNECT_STATUS)
+               return;
+
+       if (priv->dev_state != DEVICE_STATE_SLEEP)
+               return;
+
+       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE)
+               return;
+
+       DPRINTK(5, 
"\npsstatus.status=%d\npsstatus.confirm_wait=%d\npsstatus.snooze_guard=%d\ncnt_txqbody=%d\n",
+               atomic_read(&priv->psstatus.status),
+               atomic_read(&priv->psstatus.confirm_wait),
+               atomic_read(&priv->psstatus.snooze_guard),
+               cnt_txqbody(priv));
+
+       if (atomic_read(&priv->psstatus.confirm_wait) ||
+           atomic_read(&priv->psstatus.snooze_guard) ||
+           cnt_txqbody(priv)) {
+               queue_delayed_work(priv->wq, &priv->rw_dwork, 0);
+               return;
+       }
+
+       ret = ks7010_sdio_readb(priv, INT_PENDING, &byte);
+       if (ret) {
+               DPRINTK(1, " error : INT_PENDING\n");
+               goto queue_delayed_work;
+       }
+       if (byte)
+               goto queue_delayed_work;
+
+       ret = ks7010_sdio_writeb(priv, GCR_B, GCR_B_DOZE);
+       if (ret) {
+               DPRINTK(1, " error : GCR_B\n");
+               goto queue_delayed_work;
+       }
+       atomic_set(&priv->psstatus.status, PS_SNOOZE);
+       DPRINTK(3, "psstatus.status=PS_SNOOZE\n");
+
+       return;
+
+queue_delayed_work:
+       queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
+}
+
+int ks_wlan_hw_power_save(struct ks_wlan_private *priv)
+{
+       queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
+       return 0;
+}
+
+static int enqueue_txdev(struct ks_wlan_private *priv, unsigned char *p,
+                        unsigned long size,
+                        void (*complete_handler)(void *, void *),
+                        void *arg1, void *arg2)
+{
+       struct tx_device_buffer *sp;
+       int ret;
+
+       if (priv->dev_state < DEVICE_STATE_BOOT) {
+               ret = -EPERM;
+               goto err_complete;
+       }
+
+       if ((TX_DEVICE_BUFF_SIZE - 1) <= cnt_txqbody(priv)) {
+               DPRINTK(1, "tx buffer overflow\n");
+               ret = -EOVERFLOW;
+               goto err_complete;
+       }
+
+       sp = &priv->tx_dev.tx_dev_buff[priv->tx_dev.qtail];
+       sp->sendp = p;
+       sp->size = size;
+       sp->complete_handler = complete_handler;
+       sp->arg1 = arg1;
+       sp->arg2 = arg2;
+       inc_txqtail(priv);
+
+       return 0;
+
+err_complete:
+       kfree(p);
+       if (complete_handler)
+               (*complete_handler) (arg1, arg2);
+
+       return ret;
+}
+
+/* write data */
+static int write_to_device(struct ks_wlan_private *priv, unsigned char *buffer,
+                          unsigned long size)
+{
+       struct hostif_hdr *hdr;
+       int ret;
+
+       hdr = (struct hostif_hdr *)buffer;
+
+       DPRINTK(4, "size=%d\n", hdr->size);
+       if (hdr->event < HIF_DATA_REQ || HIF_REQ_MAX < hdr->event) {
+               DPRINTK(1, "unknown event=%04X\n", hdr->event);
+               return 0;
+       }
+
+       ret = ks7010_sdio_write(priv, DATA_WINDOW, buffer, size);
+       if (ret) {
+               DPRINTK(1, " write error : retval=%d\n", ret);
+               return ret;
+       }
+
+       ret = ks7010_sdio_writeb(priv, WRITE_STATUS, WRITE_STATUS_BUSY);
+       if (ret) {
+               DPRINTK(1, " error : WRITE_STATUS\n");
+               return ret;
+       }
+
+       return 0;
+}
+
+static void tx_device_task(struct ks_wlan_private *priv)
+{
+       struct tx_device_buffer *sp;
+       int ret;
+
+       DPRINTK(4, "\n");
+       if (cnt_txqbody(priv) <= 0 ||
+           atomic_read(&priv->psstatus.status) == PS_SNOOZE)
+               return;
+
+       sp = &priv->tx_dev.tx_dev_buff[priv->tx_dev.qhead];
+       if (priv->dev_state >= DEVICE_STATE_BOOT) {
+               ret = write_to_device(priv, sp->sendp, sp->size);
+               if (ret) {
+                       DPRINTK(1, "write_to_device error !!(%d)\n", ret);
+                       queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
+                       return;
+               }
+       }
+       kfree(sp->sendp);
+       if (sp->complete_handler)       /* TX Complete */
+               (*sp->complete_handler) (sp->arg1, sp->arg2);
+       inc_txqhead(priv);
+
+       if (cnt_txqbody(priv) > 0)
+               queue_delayed_work(priv->wq, &priv->rw_dwork, 0);
+}
+
+int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size,
+                 void (*complete_handler)(void *, void *),
+                 void *arg1, void *arg2)
+{
+       int result = 0;
+       struct hostif_hdr *hdr;
+
+       hdr = (struct hostif_hdr *)p;
+
+       if (hdr->event < HIF_DATA_REQ || HIF_REQ_MAX < hdr->event) {
+               DPRINTK(1, "unknown event=%04X\n", hdr->event);
+               return 0;
+       }
+
+       /* add event to hostt buffer */
+       priv->hostt.buff[priv->hostt.qtail] = hdr->event;
+       priv->hostt.qtail = (priv->hostt.qtail + 1) % SME_EVENT_BUFF_SIZE;
+
+       DPRINTK(4, "event=%04X\n", hdr->event);
+       spin_lock(&priv->tx_dev.tx_dev_lock);
+       result = enqueue_txdev(priv, p, size, complete_handler, arg1, arg2);
+       spin_unlock(&priv->tx_dev.tx_dev_lock);
+
+       if (cnt_txqbody(priv) > 0)
+               queue_delayed_work(priv->wq, &priv->rw_dwork, 0);
+
+       return result;
+}
+
+static void rx_event_task(unsigned long dev)
+{
+       struct ks_wlan_private *priv = (struct ks_wlan_private *)dev;
+       struct rx_device_buffer *rp;
+
+       DPRINTK(4, "\n");
+
+       if (cnt_rxqbody(priv) > 0 && priv->dev_state >= DEVICE_STATE_BOOT) {
+               rp = &priv->rx_dev.rx_dev_buff[priv->rx_dev.qhead];
+               hostif_receive(priv, rp->data, rp->size);
+               inc_rxqhead(priv);
+
+               if (cnt_rxqbody(priv) > 0)
+                       tasklet_schedule(&priv->rx_bh_task);
+       }
+}
+
+static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size)
+{
+       int ret;
+       struct rx_device_buffer *rx_buffer;
+       struct hostif_hdr *hdr;
+       unsigned short event = 0;
+
+       DPRINTK(4, "\n");
+
+       /* receive data */
+       if (cnt_rxqbody(priv) >= (RX_DEVICE_BUFF_SIZE - 1)) {
+               DPRINTK(1, "rx buffer overflow\n");
+               return;
+       }
+       rx_buffer = &priv->rx_dev.rx_dev_buff[priv->rx_dev.qtail];
+
+       ret = ks7010_sdio_read(priv, DATA_WINDOW, &rx_buffer->data[0],
+                              hif_align_size(size));
+       if (ret)
+               return;
+
+       /* length check */
+       if (size > 2046 || size == 0) {
+#ifdef KS_WLAN_DEBUG
+               if (KS_WLAN_DEBUG > 5)
+                       print_hex_dump_bytes("INVALID DATA dump: ",
+                                            DUMP_PREFIX_OFFSET,
+                                            rx_buffer->data, 32);
+#endif
+               ret = ks7010_sdio_writeb(priv, READ_STATUS, READ_STATUS_IDLE);
+               if (ret)
+                       DPRINTK(1, " error : READ_STATUS\n");
+
+               /* length check fail */
+               return;
+       }
+
+       hdr = (struct hostif_hdr *)&rx_buffer->data[0];
+       rx_buffer->size = le16_to_cpu(hdr->size) + sizeof(hdr->size);
+       event = hdr->event;
+       inc_rxqtail(priv);
+
+       ret = ks7010_sdio_writeb(priv, READ_STATUS, READ_STATUS_IDLE);
+       if (ret)
+               DPRINTK(1, " error : READ_STATUS\n");
+
+       if (atomic_read(&priv->psstatus.confirm_wait)) {
+               if (IS_HIF_CONF(event)) {
+                       DPRINTK(4, "IS_HIF_CONF true !!\n");
+                       atomic_dec(&priv->psstatus.confirm_wait);
+               }
+       }
+
+       tasklet_schedule(&priv->rx_bh_task);
+}
+
+static void ks7010_rw_function(struct work_struct *work)
+{
+       struct ks_wlan_private *priv;
+       unsigned char byte;
+       int ret;
+
+       priv = container_of(work, struct ks_wlan_private, rw_dwork.work);
+
+       DPRINTK(4, "\n");
+
+       /* wait after DOZE */
+       if (time_after(priv->last_doze + ((30 * HZ) / 1000), jiffies)) {
+               DPRINTK(4, "wait after DOZE\n");
+               queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
+               return;
+       }
+
+       /* wait after WAKEUP */
+       while (time_after(priv->last_wakeup + ((30 * HZ) / 1000), jiffies)) {
+               DPRINTK(4, "wait after WAKEUP\n");
+               dev_info(&priv->ks_sdio_card->func->dev,
+                        "wake: %lu %lu\n",
+                        priv->last_wakeup + (30 * HZ) / 1000,
+                               jiffies);
+               msleep(30);
+       }
+
+       sdio_claim_host(priv->ks_sdio_card->func);
+
+       /* power save wakeup */
+       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
+               if (cnt_txqbody(priv) > 0) {
+                       ks_wlan_hw_wakeup_request(priv);
+                       queue_delayed_work(priv->wq, &priv->rw_dwork, 1);
+               }
+               goto release_host;
+       }
+
+       /* sleep mode doze */
+       if (atomic_read(&priv->sleepstatus.doze_request) == 1) {
+               ks_wlan_hw_sleep_doze_request(priv);
+               goto release_host;
+       }
+       /* sleep mode wakeup */
+       if (atomic_read(&priv->sleepstatus.wakeup_request) == 1) {
+               ks_wlan_hw_sleep_wakeup_request(priv);
+               goto release_host;
+       }
+
+       /* read (WriteStatus/ReadDataSize FN1:00_0014) */
+       ret = ks7010_sdio_readb(priv, WSTATUS_RSIZE, &byte);
+       if (ret) {
+               DPRINTK(1, " error : WSTATUS_RSIZE psstatus=%d\n",
+                       atomic_read(&priv->psstatus.status));
+               goto release_host;
+       }
+       DPRINTK(4, "WSTATUS_RSIZE=%02X\n", byte);
+
+       if (byte & RSIZE_MASK) {        /* Read schedule */
+               ks_wlan_hw_rx(priv, (uint16_t)((byte & RSIZE_MASK) << 4));
+       }
+       if ((byte & WSTATUS_MASK))
+               tx_device_task(priv);
+
+       _ks_wlan_hw_power_save(priv);
+
+release_host:
+       sdio_release_host(priv->ks_sdio_card->func);
+}
+
+static void ks_sdio_interrupt(struct sdio_func *func)
+{
+       int ret;
+       struct ks_sdio_card *card;
+       struct ks_wlan_private *priv;
+       unsigned char status, rsize, byte;
+
+       card = sdio_get_drvdata(func);
+       priv = card->priv;
+       DPRINTK(4, "\n");
+
+       if (priv->dev_state < DEVICE_STATE_BOOT)
+               goto queue_delayed_work;
+
+       ret = ks7010_sdio_readb(priv, INT_PENDING, &status);
+       if (ret) {
+               DPRINTK(1, "error : INT_PENDING\n");
+               goto queue_delayed_work;
+       }
+       DPRINTK(4, "INT_PENDING=%02X\n", status);
+
+       /* schedule task for interrupt status */
+       /* bit7 -> Write General Communication B register */
+       /* read (General Communication B register) */
+       /* bit5 -> Write Status Idle */
+       /* bit2 -> Read Status Busy  */
+       if (status & INT_GCR_B ||
+           atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
+               ret = ks7010_sdio_readb(priv, GCR_B, &byte);
+               if (ret) {
+                       DPRINTK(1, " error : GCR_B\n");
+                       goto queue_delayed_work;
+               }
+               if (byte == GCR_B_ACTIVE) {
+                       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
+                               atomic_set(&priv->psstatus.status, PS_WAKEUP);
+                               priv->wakeup_count = 0;
+                       }
+                       complete(&priv->psstatus.wakeup_wait);
+               }
+       }
+
+       do {
+               /* read (WriteStatus/ReadDataSize FN1:00_0014) */
+               ret = ks7010_sdio_readb(priv, WSTATUS_RSIZE, &byte);
+               if (ret) {
+                       DPRINTK(1, " error : WSTATUS_RSIZE\n");
+                       goto queue_delayed_work;
+               }
+               DPRINTK(4, "WSTATUS_RSIZE=%02X\n", byte);
+               rsize = byte & RSIZE_MASK;
+               if (rsize != 0)         /* Read schedule */
+                       ks_wlan_hw_rx(priv, (uint16_t)(rsize << 4));
+
+               if (byte & WSTATUS_MASK) {
+                       if (atomic_read(&priv->psstatus.status) == PS_SNOOZE) {
+                               if (cnt_txqbody(priv)) {
+                                       ks_wlan_hw_wakeup_request(priv);
+                                       queue_delayed_work(priv->wq, 
&priv->rw_dwork, 1);
+                                       return;
+                               }
+                       } else {
+                               tx_device_task(priv);
+                       }
+               }
+       } while (rsize);
+
+queue_delayed_work:
+       queue_delayed_work(priv->wq, &priv->rw_dwork, 0);
+}
+
+static int trx_device_init(struct ks_wlan_private *priv)
+{
+       priv->tx_dev.qhead = 0;
+       priv->tx_dev.qtail = 0;
+
+       priv->rx_dev.qhead = 0;
+       priv->rx_dev.qtail = 0;
+
+       spin_lock_init(&priv->tx_dev.tx_dev_lock);
+       spin_lock_init(&priv->rx_dev.rx_dev_lock);
+
+       tasklet_init(&priv->rx_bh_task, rx_event_task, (unsigned long)priv);
+
+       return 0;
+}
+
+static void trx_device_exit(struct ks_wlan_private *priv)
+{
+       struct tx_device_buffer *sp;
+
+       /* tx buffer clear */
+       while (cnt_txqbody(priv) > 0) {
+               sp = &priv->tx_dev.tx_dev_buff[priv->tx_dev.qhead];
+               kfree(sp->sendp);
+               if (sp->complete_handler)       /* TX Complete */
+                       (*sp->complete_handler) (sp->arg1, sp->arg2);
+               inc_txqhead(priv);
+       }
+
+       tasklet_kill(&priv->rx_bh_task);
+}
+
+static int ks7010_sdio_update_index(struct ks_wlan_private *priv, u32 index)
+{
+       int ret;
+       unsigned char *data_buf;
+
+       data_buf = kmalloc(sizeof(u32), GFP_KERNEL);
+       if (!data_buf)
+               return -ENOMEM;
+
+       memcpy(data_buf, &index, sizeof(index));
+       ret = ks7010_sdio_write(priv, WRITE_INDEX, data_buf, sizeof(index));
+       if (ret)
+               goto err_free_data_buf;
+
+       ret = ks7010_sdio_write(priv, READ_INDEX, data_buf, sizeof(index));
+       if (ret)
+               goto err_free_data_buf;
+
+       return 0;
+
+err_free_data_buf:
+       kfree(data_buf);
+
+       return ret;
+}
+
+#define ROM_BUFF_SIZE (64 * 1024)
+static int ks7010_sdio_data_compare(struct ks_wlan_private *priv, u32 address,
+                                   unsigned char *data, unsigned int size)
+{
+       int ret;
+       unsigned char *read_buf;
+
+       read_buf = kmalloc(ROM_BUFF_SIZE, GFP_KERNEL);
+       if (!read_buf)
+               return -ENOMEM;
+
+       ret = ks7010_sdio_read(priv, address, read_buf, size);
+       if (ret)
+               goto err_free_read_buf;
+
+       if (memcmp(data, read_buf, size) != 0) {
+               ret = -EIO;
+               DPRINTK(0, "data compare error (%d)\n", ret);
+               goto err_free_read_buf;
+       }
+
+       return 0;
+
+err_free_read_buf:
+       kfree(read_buf);
+
+       return ret;
+}
+
+static int ks7010_upload_firmware(struct ks_sdio_card *card)
+{
+       struct ks_wlan_private *priv = card->priv;
+       unsigned int size, offset, n = 0;
+       unsigned char *rom_buf;
+       unsigned char byte = 0;
+       int ret;
+       unsigned int length;
+       const struct firmware *fw_entry = NULL;
+
+       rom_buf = kmalloc(ROM_BUFF_SIZE, GFP_KERNEL);
+       if (!rom_buf)
+               return -ENOMEM;
+
+       sdio_claim_host(card->func);
+
+       /* Firmware running ? */
+       ret = ks7010_sdio_readb(priv, GCR_A, &byte);
+       if (byte == GCR_A_RUN) {
+               DPRINTK(0, "MAC firmware running ...\n");
+               goto release_host_and_free;
+       }
+
+       ret = request_firmware(&fw_entry, ROM_FILE,
+                              &priv->ks_sdio_card->func->dev);
+       if (ret)
+               goto release_host_and_free;
+
+       length = fw_entry->size;
+
+       n = 0;
+       do {
+               if (length >= ROM_BUFF_SIZE) {
+                       size = ROM_BUFF_SIZE;
+                       length = length - ROM_BUFF_SIZE;
+               } else {
+                       size = length;
+                       length = 0;
+               }
+               DPRINTK(4, "size = %d\n", size);
+               if (size == 0)
+                       break;
+               memcpy(rom_buf, fw_entry->data + n, size);
+
+               offset = n;
+               ret = ks7010_sdio_update_index(priv, KS7010_IRAM_ADDRESS + 
offset);
+               if (ret)
+                       goto release_firmware;
+
+               ret = ks7010_sdio_write(priv, DATA_WINDOW, rom_buf, size);
+               if (ret)
+                       goto release_firmware;
+
+               ret = ks7010_sdio_data_compare(priv, DATA_WINDOW, rom_buf, 
size);
+               if (ret)
+                       goto release_firmware;
+
+               n += size;
+
+       } while (size);
+
+       ret = ks7010_sdio_writeb(priv, GCR_A, GCR_A_REMAP);
+       if (ret)
+               goto release_firmware;
+
+       DPRINTK(4, " REMAP Request : GCR_A\n");
+
+       /* Firmware running check */
+       for (n = 0; n < 50; ++n) {
+               mdelay(10);     /* wait_ms(10); */
+               ret = ks7010_sdio_readb(priv, GCR_A, &byte);
+               if (ret)
+                       goto release_firmware;
+
+               if (byte == GCR_A_RUN)
+                       break;
+       }
+       DPRINTK(4, "firmware wakeup (%d)!!!!\n", n);
+       if ((50) <= n) {
+               DPRINTK(1, "firmware can't start\n");
+               ret = -EIO;
+               goto release_firmware;
+       }
+
+       ret = 0;
+
+ release_firmware:
+       release_firmware(fw_entry);
+ release_host_and_free:
+       sdio_release_host(card->func);
+       kfree(rom_buf);
+
+       return ret;
+}
+
+static void ks7010_card_init(struct ks_wlan_private *priv)
+{
+       DPRINTK(5, "\ncard_init_task()\n");
+
+       init_completion(&priv->confirm_wait);
+
+       DPRINTK(5, "init_completion()\n");
+
+       /* get mac address & firmware version */
+       hostif_sme_enqueue(priv, SME_START);
+
+       DPRINTK(5, "hostif_sme_enqueu()\n");
+
+       if (!wait_for_completion_interruptible_timeout
+           (&priv->confirm_wait, 5 * HZ)) {
+               DPRINTK(1, "wait time out!! SME_START\n");
+       }
+
+       if (priv->mac_address_valid && priv->version_size != 0)
+               priv->dev_state = DEVICE_STATE_PREINIT;
+
+       hostif_sme_enqueue(priv, SME_GET_EEPROM_CKSUM);
+
+       /* load initial wireless parameter */
+       hostif_sme_enqueue(priv, SME_STOP_REQUEST);
+
+       hostif_sme_enqueue(priv, SME_RTS_THRESHOLD_REQUEST);
+       hostif_sme_enqueue(priv, SME_FRAGMENTATION_THRESHOLD_REQUEST);
+
+       hostif_sme_enqueue(priv, SME_WEP_INDEX_REQUEST);
+       hostif_sme_enqueue(priv, SME_WEP_KEY1_REQUEST);
+       hostif_sme_enqueue(priv, SME_WEP_KEY2_REQUEST);
+       hostif_sme_enqueue(priv, SME_WEP_KEY3_REQUEST);
+       hostif_sme_enqueue(priv, SME_WEP_KEY4_REQUEST);
+
+       hostif_sme_enqueue(priv, SME_WEP_FLAG_REQUEST);
+       hostif_sme_enqueue(priv, SME_RSN_ENABLED_REQUEST);
+       hostif_sme_enqueue(priv, SME_MODE_SET_REQUEST);
+       hostif_sme_enqueue(priv, SME_START_REQUEST);
+
+       if (!wait_for_completion_interruptible_timeout
+           (&priv->confirm_wait, 5 * HZ)) {
+               DPRINTK(1, "wait time out!! wireless parameter set\n");
+       }
+
+       if (priv->dev_state >= DEVICE_STATE_PREINIT) {
+               DPRINTK(1, "DEVICE READY!!\n");
+               priv->dev_state = DEVICE_STATE_READY;
+       } else {
+               DPRINTK(1, "dev_state=%d\n", priv->dev_state);
+       }
+}
+
+static void ks7010_init_defaults(struct ks_wlan_private *priv)
+{
+       priv->reg.tx_rate = TX_RATE_AUTO;
+       priv->reg.preamble = LONG_PREAMBLE;
+       priv->reg.powermgt = POWMGT_ACTIVE_MODE;
+       priv->reg.scan_type = ACTIVE_SCAN;
+       priv->reg.beacon_lost_count = 20;
+       priv->reg.rts = 2347UL;
+       priv->reg.fragment = 2346UL;
+       priv->reg.phy_type = D_11BG_COMPATIBLE_MODE;
+       priv->reg.cts_mode = CTS_MODE_FALSE;
+       priv->reg.rate_set.body[11] = TX_RATE_54M;
+       priv->reg.rate_set.body[10] = TX_RATE_48M;
+       priv->reg.rate_set.body[9] = TX_RATE_36M;
+       priv->reg.rate_set.body[8] = TX_RATE_18M;
+       priv->reg.rate_set.body[7] = TX_RATE_9M;
+       priv->reg.rate_set.body[6] = TX_RATE_24M | BASIC_RATE;
+       priv->reg.rate_set.body[5] = TX_RATE_12M | BASIC_RATE;
+       priv->reg.rate_set.body[4] = TX_RATE_6M | BASIC_RATE;
+       priv->reg.rate_set.body[3] = TX_RATE_11M | BASIC_RATE;
+       priv->reg.rate_set.body[2] = TX_RATE_5M | BASIC_RATE;
+       priv->reg.rate_set.body[1] = TX_RATE_2M | BASIC_RATE;
+       priv->reg.rate_set.body[0] = TX_RATE_1M | BASIC_RATE;
+       priv->reg.tx_rate = TX_RATE_FULL_AUTO;
+       priv->reg.rate_set.size = 12;
+}
+
+static int ks7010_sdio_probe(struct sdio_func *func,
+                            const struct sdio_device_id *device)
+{
+       struct ks_wlan_private *priv;
+       struct ks_sdio_card *card;
+       struct net_device *netdev;
+       unsigned char byte;
+       int ret;
+
+       DPRINTK(5, "ks7010_sdio_probe()\n");
+
+       priv = NULL;
+       netdev = NULL;
+
+       card = kzalloc(sizeof(*card), GFP_KERNEL);
+       if (!card)
+               return -ENOMEM;
+
+       card->func = func;
+
+       sdio_claim_host(func);
+
+       ret = sdio_set_block_size(func, KS7010_IO_BLOCK_SIZE);
+       DPRINTK(5, "multi_block=%d sdio_set_block_size()=%d %d\n",
+               func->card->cccr.multi_block, func->cur_blksize, ret);
+
+       ret = sdio_enable_func(func);
+       DPRINTK(5, "sdio_enable_func() %d\n", ret);
+       if (ret)
+               goto err_free_card;
+
+       /* interrupt disable */
+       sdio_writeb(func, 0, INT_ENABLE, &ret);
+       if (ret)
+               goto err_free_card;
+       sdio_writeb(func, 0xff, INT_PENDING, &ret);
+       if (ret)
+               goto err_disable_func;
+
+       /* setup interrupt handler */
+       ret = sdio_claim_irq(func, ks_sdio_interrupt);
+       if (ret)
+               goto err_disable_func;
+
+       sdio_release_host(func);
+
+       sdio_set_drvdata(func, card);
+
+       DPRINTK(5, "class = 0x%X, vendor = 0x%X, device = 0x%X\n",
+               func->class, func->vendor, func->device);
+
+       /* private memory allocate */
+       netdev = alloc_etherdev(sizeof(*priv));
+       if (!netdev) {
+               dev_err(&card->func->dev, "ks7010 : Unable to alloc new net 
device\n");
+               goto err_release_irq;
+       }
+       if (dev_alloc_name(netdev, "wlan%d") < 0) {
+               dev_err(&card->func->dev,
+                       "ks7010 :  Couldn't get name!\n");
+               goto err_free_netdev;
+       }
+
+       priv = netdev_priv(netdev);
+
+       card->priv = priv;
+       SET_NETDEV_DEV(netdev, &card->func->dev);       /* for create sysfs 
symlinks */
+
+       /* private memory initialize */
+       priv->ks_sdio_card = card;
+
+       priv->dev_state = DEVICE_STATE_PREBOOT;
+       priv->net_dev = netdev;
+       priv->firmware_version[0] = '\0';
+       priv->version_size = 0;
+       priv->last_doze = jiffies;
+       priv->last_wakeup = jiffies;
+       memset(&priv->nstats, 0, sizeof(priv->nstats));
+       memset(&priv->wstats, 0, sizeof(priv->wstats));
+
+       /* sleep mode */
+       atomic_set(&priv->sleepstatus.doze_request, 0);
+       atomic_set(&priv->sleepstatus.wakeup_request, 0);
+       atomic_set(&priv->sleepstatus.wakeup_request, 0);
+
+       trx_device_init(priv);
+       hostif_init(priv);
+       ks_wlan_net_start(netdev);
+
+       ks7010_init_defaults(priv);
+
+       ret = ks7010_upload_firmware(card);
+       if (ret) {
+               dev_err(&card->func->dev,
+                       "ks7010: firmware load failed !! return code = %d\n",
+                        ret);
+               goto err_free_netdev;
+       }
+
+       /* interrupt setting */
+       /* clear Interrupt status write (ARMtoSD_InterruptPending FN1:00_0024) 
*/
+       sdio_claim_host(func);
+       ret = ks7010_sdio_writeb(priv, INT_PENDING, 0xff);
+       sdio_release_host(func);
+       if (ret)
+               DPRINTK(1, " error : INT_PENDING\n");
+
+       /* enable ks7010sdio interrupt */
+       byte = (INT_GCR_B | INT_READ_STATUS | INT_WRITE_STATUS);
+       sdio_claim_host(func);
+       ret = ks7010_sdio_writeb(priv, INT_ENABLE, byte);
+       sdio_release_host(func);
+       if (ret)
+               DPRINTK(1, " err : INT_ENABLE\n");
+
+       DPRINTK(4, " enable Interrupt : INT_ENABLE=%02X\n", byte);
+       priv->dev_state = DEVICE_STATE_BOOT;
+
+       priv->wq = create_workqueue("wq");
+       if (!priv->wq) {
+               DPRINTK(1, "create_workqueue failed !!\n");
+               goto err_free_netdev;
+       }
+
+       INIT_DELAYED_WORK(&priv->rw_dwork, ks7010_rw_function);
+       ks7010_card_init(priv);
+
+       ret = register_netdev(priv->net_dev);
+       if (ret)
+               goto err_free_netdev;
+
+       return 0;
+
+ err_free_netdev:
+       free_netdev(priv->net_dev);
+       card->priv = NULL;
+ err_release_irq:
+       sdio_claim_host(func);
+       sdio_release_irq(func);
+ err_disable_func:
+       sdio_disable_func(func);
+ err_free_card:
+       sdio_release_host(func);
+       sdio_set_drvdata(func, NULL);
+       kfree(card);
+
+       return -ENODEV;
+}
+
+/* send stop request to MAC */
+static int send_stop_request(struct sdio_func *func)
+{
+       struct hostif_stop_request_t *pp;
+       struct ks_sdio_card *card;
+       size_t size;
+
+       card = sdio_get_drvdata(func);
+
+       pp = kzalloc(hif_align_size(sizeof(*pp)), GFP_KERNEL);
+       if (!pp) {
+               DPRINTK(3, "allocate memory failed..\n");
+               return -ENOMEM;
+       }
+
+       size = sizeof(*pp) - sizeof(pp->header.size);
+       pp->header.size = cpu_to_le16((uint16_t)size);
+       pp->header.event = cpu_to_le16((uint16_t)HIF_STOP_REQ);
+
+       sdio_claim_host(func);
+       write_to_device(card->priv, (unsigned char *)pp,
+                       hif_align_size(sizeof(*pp)));
+       sdio_release_host(func);
+
+       kfree(pp);
+       return 0;
+}
+
+static void ks7010_sdio_remove(struct sdio_func *func)
+{
+       int ret;
+       struct ks_sdio_card *card;
+       struct ks_wlan_private *priv;
+
+       DPRINTK(1, "ks7010_sdio_remove()\n");
+
+       card = sdio_get_drvdata(func);
+
+       if (!card)
+               return;
+
+       DPRINTK(1, "priv = card->priv\n");
+       priv = card->priv;
+       if (priv) {
+               struct net_device *netdev = priv->net_dev;
+
+               ks_wlan_net_stop(netdev);
+               DPRINTK(1, "ks_wlan_net_stop\n");
+
+               /* interrupt disable */
+               sdio_claim_host(func);
+               sdio_writeb(func, 0, INT_ENABLE, &ret);
+               sdio_writeb(func, 0xff, INT_PENDING, &ret);
+               sdio_release_host(func);
+               DPRINTK(1, "interrupt disable\n");
+
+               ret = send_stop_request(func);
+               if (ret)        /* memory allocation failure */
+                       return;
+
+               DPRINTK(1, "STOP Req\n");
+
+               if (priv->wq) {
+                       flush_workqueue(priv->wq);
+                       destroy_workqueue(priv->wq);
+               }
+               DPRINTK(1, "destroy_workqueue(priv->wq);\n");
+
+               hostif_exit(priv);
+               DPRINTK(1, "hostif_exit\n");
+
+               unregister_netdev(netdev);
+
+               trx_device_exit(priv);
+               free_netdev(priv->net_dev);
+               card->priv = NULL;
+       }
+
+       sdio_claim_host(func);
+       sdio_release_irq(func);
+       DPRINTK(1, "sdio_release_irq()\n");
+       sdio_disable_func(func);
+       DPRINTK(1, "sdio_disable_func()\n");
+       sdio_release_host(func);
+
+       sdio_set_drvdata(func, NULL);
+
+       kfree(card);
+       DPRINTK(1, "kfree()\n");
+
+       DPRINTK(5, " Bye !!\n");
+}
+
+static struct sdio_driver ks7010_sdio_driver = {
+       .name = "ks7010_sdio",
+       .id_table = ks7010_sdio_ids,
+       .probe = ks7010_sdio_probe,
+       .remove = ks7010_sdio_remove,
+};
+
+module_driver(ks7010_sdio_driver, sdio_register_driver, 
sdio_unregister_driver);
+MODULE_AUTHOR("Sang Engineering, Qi-Hardware, KeyStream");
+MODULE_DESCRIPTION("Driver for KeyStream KS7010 based SDIO cards");
+MODULE_LICENSE("GPL v2");
+MODULE_FIRMWARE(ROM_FILE);
diff --git a/drivers/staging/ks7010/sdio.h b/drivers/staging/ks7010/sdio.h
new file mode 100644
index 0000000..78adeb9
--- /dev/null
+++ b/drivers/staging/ks7010/sdio.h
@@ -0,0 +1,176 @@
+/*
+ *   Driver for KeyStream, KS7010 based SDIO cards.
+ *
+ *   Copyright (C) 2006-2008 KeyStream Corp.
+ *   Copyright (C) 2009 Renesas Technology Corp.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2 as
+ *   published by the Free Software Foundation.
+ */
+#ifndef _KS7010_SDIO_H
+#define _KS7010_SDIO_H
+
+#ifdef DEVICE_ALIGNMENT
+#undef DEVICE_ALIGNMENT
+#endif
+#define DEVICE_ALIGNMENT 32
+
+/*  SDIO KeyStream vendor and device */
+#define SDIO_VENDOR_ID_KS_CODE_A       0x005b
+#define SDIO_VENDOR_ID_KS_CODE_B       0x0023
+/* Older sources suggest earlier versions were named 7910 or 79xx */
+#define SDIO_DEVICE_ID_KS_7010         0x7910
+
+/* Read Status Register */
+#define READ_STATUS            0x000000
+enum read_status_type {
+       READ_STATUS_BUSY,
+       READ_STATUS_IDLE
+};
+
+/* Read Index Register */
+#define READ_INDEX             0x000004
+
+/* Read Data Size Register */
+#define READ_DATA_SIZE         0x000008
+
+/* Write Status Register */
+#define WRITE_STATUS           0x00000C
+enum write_status_type {
+       WRITE_STATUS_BUSY,
+       WRITE_STATUS_IDLE
+};
+
+/* Write Index Register */
+#define WRITE_INDEX            0x000010
+
+/* Write Status/Read Data Size Register
+ * for network packet (less than 2048 bytes data)
+ */
+#define WSTATUS_RSIZE          0x000014
+#define WSTATUS_MASK           0x80    /* Write Status Register value */
+#define RSIZE_MASK             0x7F    /* Read Data Size Register value [10:4] 
*/
+
+/* ARM to SD interrupt Enable */
+#define INT_ENABLE             0x000020
+/* ARM to SD interrupt Pending */
+#define INT_PENDING            0x000024
+
+#define INT_GCR_B              BIT(7)
+#define INT_GCR_A              BIT(6)
+#define INT_WRITE_STATUS       BIT(5)
+#define INT_WRITE_INDEX        BIT(4)
+#define INT_WRITE_SIZE         BIT(3)
+#define INT_READ_STATUS        BIT(2)
+#define INT_READ_INDEX         BIT(1)
+#define INT_READ_SIZE          BIT(0)
+
+/* General Communication Register A */
+#define GCR_A                  0x000028
+enum gen_com_reg_a {
+       GCR_A_INIT,
+       GCR_A_REMAP,
+       GCR_A_RUN
+};
+
+/* General Communication Register B */
+#define GCR_B                  0x00002C
+enum gen_com_reg_b {
+       GCR_B_ACTIVE,
+       GCR_B_DOZE
+};
+
+/* Wakeup Register */
+#define WAKEUP                 0x008018
+#define WAKEUP_REQ             0x5a
+
+/* AHB Data Window  0x010000-0x01FFFF */
+#define DATA_WINDOW            0x010000
+#define WINDOW_SIZE            (64 * 1024)
+
+#define KS7010_IRAM_ADDRESS    0x06000000
+
+/**
+ * struct ks_sdio_card - SDIO device data.
+ *
+ * Structure is used as the &struct sdio_func private data.
+ *
+ * @func: Pointer to the SDIO function device.
+ * @priv: Pointer to the &struct net_device private data.
+ */
+struct ks_sdio_card {
+       struct sdio_func *func;
+       struct ks_wlan_private *priv;
+};
+
+/*
+ * Tx Queue
+ */
+
+#define        TX_DEVICE_BUFF_SIZE     1024
+
+/**
+ * struct tx_device_buffer - Queue item for the tx queue.
+ * @sendp: Pointer to the send request data.
+ * @size: Size of @sendp data.
+ * @complete_handler: Function called once data write to device is complete.
+ * @arg1: First argument to @complete_handler.
+ * @arg2: Second argument to @complete_handler.
+ */
+struct tx_device_buffer {
+       unsigned char *sendp;
+       unsigned int size;
+       void (*complete_handler)(void *, void *);
+       void *arg1;
+       void *arg2;
+};
+
+/**
+ * struct tx_device - Tx buffer queue.
+ * @tx_device_buffer: Queue buffer.
+ * @qhead: Head of tx queue.
+ * @qtail: Tail of tx queue.
+ * @tx_dev_lock: Queue lock.
+ */
+struct tx_device {
+       struct tx_device_buffer tx_dev_buff[TX_DEVICE_BUFF_SIZE];
+       unsigned int qhead;
+       unsigned int qtail;
+       spinlock_t tx_dev_lock; /* protect access to the queue */
+};
+
+/*
+ * Rx Queue
+ */
+
+#define        RX_DATA_SIZE    (2 + 2 + 2347 + 1)
+#define        RX_DEVICE_BUFF_SIZE     32
+
+/**
+ * struct rx_device_buffer - Queue item for the rx queue.
+ * @data: rx data.
+ * @size: Size of @data.
+ */
+struct rx_device_buffer {
+       unsigned char data[RX_DATA_SIZE];
+       unsigned int size;
+};
+
+/**
+ * struct rx_device - Rx buffer queue.
+ * @rx_device_buffer: Queue buffer.
+ * @qhead: Head of rx queue.
+ * @qtail: Tail of rx queue.
+ * @rx_dev_lock: Queue lock.
+ */
+struct rx_device {
+       struct rx_device_buffer rx_dev_buff[RX_DEVICE_BUFF_SIZE];
+       unsigned int qhead;
+       unsigned int qtail;
+       spinlock_t rx_dev_lock; /* protect access to the queue */
+};
+
+#define        ROM_FILE "ks7010sd.rom"
+
+#endif /* _KS7010_SDIO_H */
-- 
2.7.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to