Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 53566
b: refs/heads/master
c: 91f8d01
h: refs/heads/master
v: v3
  • Loading branch information
Alex Dubov authored and Pierre Ossman committed May 1, 2007
1 parent 4a9a664 commit 02b1f07
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 73 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 13cdf48ef15befbd36f8295091b9e0f9bd322963
refs/heads/master: 91f8d0118a0e1f25f809f3fde5a7616a1eaabc2b
10 changes: 3 additions & 7 deletions trunk/drivers/misc/tifm_7xx1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
*/

#include <linux/tifm.h>
#include <linux/dma-mapping.h>
#include <linux/freezer.h>

#define DRIVER_NAME "tifm_7xx1"
#define DRIVER_VERSION "0.8"
Expand Down Expand Up @@ -41,8 +39,7 @@ static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id)
{
struct tifm_adapter *fm = dev_id;
struct tifm_dev *sock;
unsigned int irq_status;
unsigned int cnt;
unsigned int irq_status, cnt;

spin_lock(&fm->lock);
irq_status = readl(fm->addr + FM_INTERRUPT_STATUS);
Expand Down Expand Up @@ -134,11 +131,10 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
{
struct tifm_adapter *fm = container_of(work, struct tifm_adapter,
media_switcher);
struct tifm_dev *sock;
unsigned long flags;
unsigned char media_id;
int cnt;
struct tifm_dev *sock;
unsigned int socket_change_set;
unsigned int socket_change_set, cnt;

spin_lock_irqsave(&fm->lock, flags);
socket_change_set = fm->socket_change_set;
Expand Down
24 changes: 12 additions & 12 deletions trunk/drivers/misc/tifm_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,23 +115,23 @@ static int tifm_device_remove(struct device *dev)

static int tifm_device_suspend(struct device *dev, pm_message_t state)
{
struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
driver);

if (dev->driver && drv->suspend)
return drv->suspend(fm_dev, state);
return drv->suspend(sock, state);
return 0;
}

static int tifm_device_resume(struct device *dev)
{
struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
driver);

if (dev->driver && drv->resume)
return drv->resume(fm_dev);
return drv->resume(sock);
return 0;
}

Expand All @@ -155,14 +155,14 @@ static struct device_attribute tifm_dev_attrs[] = {
};

static struct bus_type tifm_bus_type = {
.name = "tifm",
.dev_attrs = tifm_dev_attrs,
.match = tifm_bus_match,
.uevent = tifm_uevent,
.probe = tifm_device_probe,
.remove = tifm_device_remove,
.suspend = tifm_device_suspend,
.resume = tifm_device_resume
.name = "tifm",
.dev_attrs = tifm_dev_attrs,
.match = tifm_bus_match,
.uevent = tifm_uevent,
.probe = tifm_device_probe,
.remove = tifm_device_remove,
.suspend = tifm_device_suspend,
.resume = tifm_device_resume
};

static void tifm_free(struct class_device *cdev)
Expand Down
49 changes: 30 additions & 19 deletions trunk/drivers/mmc/tifm_sd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* Special thanks to Brad Campbell for extensive testing of this driver.
*
*/


Expand Down Expand Up @@ -39,6 +41,7 @@ module_param(fixed_timeout, bool, 0644);

#define TIFM_MMCSD_ERRMASK 0x01e0 /* set bits: CCRC, CTO, DCRC, DTO */
#define TIFM_MMCSD_EOC 0x0001 /* end of command phase */
#define TIFM_MMCSD_CD 0x0002 /* card detect */
#define TIFM_MMCSD_CB 0x0004 /* card enter busy state */
#define TIFM_MMCSD_BRS 0x0008 /* block received/sent */
#define TIFM_MMCSD_EOFB 0x0010 /* card exit busy state */
Expand All @@ -48,6 +51,8 @@ module_param(fixed_timeout, bool, 0644);
#define TIFM_MMCSD_CCRC 0x0100 /* command crc error */
#define TIFM_MMCSD_AF 0x0400 /* fifo almost full */
#define TIFM_MMCSD_AE 0x0800 /* fifo almost empty */
#define TIFM_MMCSD_OCRB 0x1000 /* OCR busy */
#define TIFM_MMCSD_CIRQ 0x2000 /* card irq (cmd40/sdio) */
#define TIFM_MMCSD_CERR 0x4000 /* card status error */

#define TIFM_MMCSD_ODTO 0x0040 /* open drain / extended timeout */
Expand Down Expand Up @@ -83,16 +88,16 @@ enum {
};

struct tifm_sd {
struct tifm_dev *dev;
struct tifm_dev *dev;

unsigned short eject:1,
open_drain:1,
no_dma:1;
unsigned short cmd_flags;
unsigned short eject:1,
open_drain:1,
no_dma:1;
unsigned short cmd_flags;

unsigned int clk_freq;
unsigned int clk_div;
unsigned long timeout_jiffies;
unsigned int clk_freq;
unsigned int clk_div;
unsigned long timeout_jiffies;

struct tasklet_struct finish_tasklet;
struct timer_list timer;
Expand Down Expand Up @@ -627,7 +632,8 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
}

if (host->req) {
printk(KERN_ERR DRIVER_NAME ": unfinished request detected\n");
printk(KERN_ERR "%s : unfinished request detected\n",
sock->dev.bus_id);
spin_unlock_irqrestore(&sock->lock, flags);
goto err_out;
}
Expand Down Expand Up @@ -737,7 +743,8 @@ static void tifm_sd_end_cmd(unsigned long data)
host->req = NULL;

if (!mrq) {
printk(KERN_ERR DRIVER_NAME ": no request to complete?\n");
printk(KERN_ERR " %s : no request to complete?\n",
sock->dev.bus_id);
spin_unlock_irqrestore(&sock->lock, flags);
return;
}
Expand Down Expand Up @@ -775,8 +782,10 @@ static void tifm_sd_abort(unsigned long data)
{
struct tifm_sd *host = (struct tifm_sd*)data;

printk(KERN_ERR DRIVER_NAME
": card failed to respond for a long period of time\n");
printk(KERN_ERR
"%s : card failed to respond for a long period of time "
"(%x, %x)\n",
host->dev->dev.bus_id, host->req->cmd->opcode, host->cmd_flags);

tifm_eject(host->dev);
}
Expand All @@ -790,8 +799,11 @@ static void tifm_sd_ios(struct mmc_host *mmc, struct mmc_ios *ios)

spin_lock_irqsave(&sock->lock, flags);

dev_dbg(&sock->dev, "Setting bus width %d, power %d\n", ios->bus_width,
ios->power_mode);
dev_dbg(&sock->dev, "ios: clock = %u, vdd = %x, bus_mode = %x, "
"chip_select = %x, power_mode = %x, bus_width = %x\n",
ios->clock, ios->vdd, ios->bus_mode, ios->chip_select,
ios->power_mode, ios->bus_width);

if (ios->bus_width == MMC_BUS_WIDTH_4) {
writel(TIFM_MMCSD_4BBUS | readl(sock->addr + SOCK_MMCSD_CONFIG),
sock->addr + SOCK_MMCSD_CONFIG);
Expand Down Expand Up @@ -937,7 +949,8 @@ static int tifm_sd_probe(struct tifm_dev *sock)

if (!(TIFM_SOCK_STATE_OCCUPIED
& readl(sock->addr + SOCK_PRESENT_STATE))) {
printk(KERN_WARNING DRIVER_NAME ": card gone, unexpectedly\n");
printk(KERN_WARNING "%s : card gone, unexpectedly\n",
sock->dev.bus_id);
return rc;
}

Expand Down Expand Up @@ -974,11 +987,9 @@ static int tifm_sd_probe(struct tifm_dev *sock)

if (!rc)
rc = mmc_add_host(mmc);
if (rc)
goto out_free_mmc;
if (!rc)
return 0;

return 0;
out_free_mmc:
mmc_free_host(mmc);
return rc;
}
Expand Down
69 changes: 35 additions & 34 deletions trunk/include/linux/tifm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@

#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/wait.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/kthread.h>
#include <linux/workqueue.h>

/* Host registers (relative to pci base address): */
enum {
FM_SET_INTERRUPT_ENABLE = 0x008,
FM_CLEAR_INTERRUPT_ENABLE = 0x00c,
FM_INTERRUPT_STATUS = 0x014 };
FM_INTERRUPT_STATUS = 0x014
};

/* Socket registers (relative to socket base address): */
enum {
Expand Down Expand Up @@ -58,22 +58,23 @@ enum {
SOCK_MS_DATA = 0x188,
SOCK_MS_STATUS = 0x18c,
SOCK_MS_SYSTEM = 0x190,
SOCK_FIFO_ACCESS = 0x200 };
SOCK_FIFO_ACCESS = 0x200
};

#define TIFM_CTRL_LED 0x00000040
#define TIFM_CTRL_FAST_CLK 0x00000100

#define TIFM_SOCK_STATE_OCCUPIED 0x00000008
#define TIFM_SOCK_STATE_POWERED 0x00000080

#define TIFM_FIFO_ENABLE 0x00000001 /* Meaning of this constant is unverified */
#define TIFM_FIFO_READY 0x00000001 /* Meaning of this constant is unverified */
#define TIFM_FIFO_ENABLE 0x00000001
#define TIFM_FIFO_READY 0x00000001
#define TIFM_FIFO_INT_SETALL 0x0000ffff
#define TIFM_FIFO_INTMASK 0x00000005 /* Meaning of this constant is unverified */
#define TIFM_FIFO_INTMASK 0x00000005

#define TIFM_DMA_RESET 0x00000002 /* Meaning of this constant is unverified */
#define TIFM_DMA_TX 0x00008000 /* Meaning of this constant is unverified */
#define TIFM_DMA_EN 0x00000001 /* Meaning of this constant is unverified */
#define TIFM_DMA_RESET 0x00000002
#define TIFM_DMA_TX 0x00008000
#define TIFM_DMA_EN 0x00000001
#define TIFM_DMA_TSIZE 0x0000007f

#define TIFM_TYPE_XD 1
Expand All @@ -86,44 +87,44 @@ struct tifm_device_id {

struct tifm_driver;
struct tifm_dev {
char __iomem *addr;
spinlock_t lock;
unsigned char type;
unsigned int socket_id;
char __iomem *addr;
spinlock_t lock;
unsigned char type;
unsigned int socket_id;

void (*card_event)(struct tifm_dev *sock);
void (*data_event)(struct tifm_dev *sock);

struct device dev;
struct device dev;
};

struct tifm_driver {
struct tifm_device_id *id_table;
int (*probe)(struct tifm_dev *dev);
void (*remove)(struct tifm_dev *dev);
int (*suspend)(struct tifm_dev *dev,
pm_message_t state);
int (*resume)(struct tifm_dev *dev);
int (*probe)(struct tifm_dev *dev);
void (*remove)(struct tifm_dev *dev);
int (*suspend)(struct tifm_dev *dev,
pm_message_t state);
int (*resume)(struct tifm_dev *dev);

struct device_driver driver;
struct device_driver driver;
};

struct tifm_adapter {
char __iomem *addr;
spinlock_t lock;
unsigned int irq_status;
unsigned int socket_change_set;
unsigned int id;
unsigned int num_sockets;
struct completion *finish_me;
char __iomem *addr;
spinlock_t lock;
unsigned int irq_status;
unsigned int socket_change_set;
unsigned int id;
unsigned int num_sockets;
struct completion *finish_me;

struct work_struct media_switcher;
struct class_device cdev;
struct work_struct media_switcher;
struct class_device cdev;

void (*eject)(struct tifm_adapter *fm,
struct tifm_dev *sock);
void (*eject)(struct tifm_adapter *fm,
struct tifm_dev *sock);

struct tifm_dev *sockets[0];
struct tifm_dev *sockets[0];
};

struct tifm_adapter *tifm_alloc_adapter(unsigned int num_sockets,
Expand All @@ -147,7 +148,7 @@ void tifm_queue_work(struct work_struct *work);

static inline void *tifm_get_drvdata(struct tifm_dev *dev)
{
return dev_get_drvdata(&dev->dev);
return dev_get_drvdata(&dev->dev);
}

static inline void tifm_set_drvdata(struct tifm_dev *dev, void *data)
Expand Down

0 comments on commit 02b1f07

Please sign in to comment.