Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 151093
b: refs/heads/master
c: 5ced504
h: refs/heads/master
i:
  151091: 954d596
v: v3
  • Loading branch information
unsik Kim authored and Jens Axboe committed Jun 16, 2009
1 parent a1047e7 commit d49dd5b
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e475bba2fdee9c3dbfe25f026f8fb8de69508ad2
refs/heads/master: 5ced504b1bd1979378de35c56aa5d3d79fb5033f
28 changes: 1 addition & 27 deletions trunk/drivers/block/mg_disk.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/mg_disk.h>

#define MG_RES_SEC (CONFIG_MG_DISK_RES << 1)

/* name for block device */
#define MG_DISK_NAME "mgd"
/* name for platform device */
#define MG_DEV_NAME "mg_disk"

#define MG_DISK_MAJ 0
#define MG_DISK_MAX_PART 16
Expand Down Expand Up @@ -103,33 +102,8 @@
#define MG_TMAX_SWRST_TO_RDY 500
#define MG_TMAX_RSTOUT 3000

/* device attribution */
/* use mflash as boot device */
#define MG_BOOT_DEV (1 << 0)
/* use mflash as storage device */
#define MG_STORAGE_DEV (1 << 1)
/* same as MG_STORAGE_DEV, but bootloader already done reset sequence */
#define MG_STORAGE_DEV_SKIP_RST (1 << 2)

#define MG_DEV_MASK (MG_BOOT_DEV | MG_STORAGE_DEV | MG_STORAGE_DEV_SKIP_RST)

/* names of GPIO resource */
#define MG_RST_PIN "mg_rst"
/* except MG_BOOT_DEV, reset-out pin should be assigned */
#define MG_RSTOUT_PIN "mg_rstout"

/* private driver data */
struct mg_drv_data {
/* disk resource */
u32 use_polling;

/* device attribution */
u32 dev_attr;

/* internally used */
struct mg_host *host;
};

/* main structure for mflash driver */
struct mg_host {
struct device *dev;
Expand Down
45 changes: 45 additions & 0 deletions trunk/include/linux/mg_disk.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* include/linux/mg_disk.c
*
* Private data for mflash platform driver
*
* (c) 2008 mGine Co.,LTD
* (c) 2008 unsik Kim <donari75@gmail.com>
*
* 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 __MG_DISK_H__
#define __MG_DISK_H__

/* name for platform device */
#define MG_DEV_NAME "mg_disk"

/* names of GPIO resource */
#define MG_RST_PIN "mg_rst"
/* except MG_BOOT_DEV, reset-out pin should be assigned */
#define MG_RSTOUT_PIN "mg_rstout"

/* device attribution */
/* use mflash as boot device */
#define MG_BOOT_DEV (1 << 0)
/* use mflash as storage device */
#define MG_STORAGE_DEV (1 << 1)
/* same as MG_STORAGE_DEV, but bootloader already done reset sequence */
#define MG_STORAGE_DEV_SKIP_RST (1 << 2)

/* private driver data */
struct mg_drv_data {
/* disk resource */
u32 use_polling;

/* device attribution */
u32 dev_attr;

/* internally used */
void *host;
};

#endif

0 comments on commit d49dd5b

Please sign in to comment.