Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

4 files changed, 514 insertions, 0 deletions

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
new file mode 100644
index 000000000000..aefedf04b9bb
--- /dev/null
+++ b/include/linux/mmc/card.h
@@ -0,0 +1,92 @@
+/*
+ *  linux/include/linux/mmc/card.h
+ *
+ * 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.
+ *
+ *  Card driver specific definitions.
+ */
+#ifndef LINUX_MMC_CARD_H
+#define LINUX_MMC_CARD_H
+
+#include <linux/mmc/mmc.h>
+
+struct mmc_cid {
+        unsigned int            manfid;
+        char                    prod_name[8];
+        unsigned int            serial;
+        unsigned short          oemid;
+        unsigned short          year;
+        unsigned char           hwrev;
+        unsigned char           fwrev;
+        unsigned char           month;
+};
+
+struct mmc_csd {
+        unsigned char           mmca_vsn;
+        unsigned short          cmdclass;
+        unsigned short          tacc_clks;
+        unsigned int            tacc_ns;
+        unsigned int            max_dtr;
+        unsigned int            read_blkbits;
+        unsigned int            capacity;
+};
+
+struct mmc_host;
+
+/*
+ * MMC device
+ */
+struct mmc_card {
+        struct list_head        node;           /* node in hosts devices list */
+        struct mmc_host         *host;          /* the host this device belongs to */
+        struct device           dev;            /* the device */
+        unsigned int            rca;            /* relative card address of device */
+        unsigned int            state;          /* (our) card state */
+#define MMC_STATE_PRESENT       (1<<0)          /* present in sysfs */
+#define MMC_STATE_DEAD          (1<<1)          /* device no longer in stack */
+#define MMC_STATE_BAD           (1<<2)          /* unrecognised device */
+        u32                     raw_cid[4];     /* raw card CID */
+        u32                     raw_csd[4];     /* raw card CSD */
+        struct mmc_cid          cid;            /* card identification */
+        struct mmc_csd          csd;            /* card specific */
+};
+
+#define mmc_card_present(c)     ((c)->state & MMC_STATE_PRESENT)
+#define mmc_card_dead(c)        ((c)->state & MMC_STATE_DEAD)
+#define mmc_card_bad(c)         ((c)->state & MMC_STATE_BAD)
+
+#define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
+#define mmc_card_set_dead(c)    ((c)->state |= MMC_STATE_DEAD)
+#define mmc_card_set_bad(c)     ((c)->state |= MMC_STATE_BAD)
+
+#define mmc_card_name(c)        ((c)->cid.prod_name)
+#define mmc_card_id(c)          ((c)->dev.bus_id)
+
+#define mmc_list_to_card(l)     container_of(l, struct mmc_card, node)
+#define mmc_get_drvdata(c)      dev_get_drvdata(&(c)->dev)
+#define mmc_set_drvdata(c,d)    dev_set_drvdata(&(c)->dev, d)
+
+/*
+ * MMC device driver (e.g., Flash card, I/O card...)
+ */
+struct mmc_driver {
+        struct device_driver drv;
+        int (*probe)(struct mmc_card *);
+        void (*remove)(struct mmc_card *);
+        int (*suspend)(struct mmc_card *, pm_message_t);
+        int (*resume)(struct mmc_card *);
+};
+
+extern int mmc_register_driver(struct mmc_driver *);
+extern void mmc_unregister_driver(struct mmc_driver *);
+
+static inline int mmc_card_claim_host(struct mmc_card *card)
+{
+        return __mmc_claim_host(card->host, card);
+}
+
+#define mmc_card_release_host(c)        mmc_release_host((c)->host)
+
+#endif
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
new file mode 100644
index 000000000000..f67686cef62a
--- /dev/null
+++ b/include/linux/mmc/host.h
@@ -0,0 +1,108 @@
+/*
+ *  linux/include/linux/mmc/host.h
+ *
+ * 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.
+ *
+ *  Host driver specific definitions.
+ */
+#ifndef LINUX_MMC_HOST_H
+#define LINUX_MMC_HOST_H
+
+#include <linux/mmc/mmc.h>
+
+struct mmc_ios {
+        unsigned int    clock;                  /* clock rate */
+        unsigned short  vdd;
+
+#define MMC_VDD_150     0
+#define MMC_VDD_155     1
+#define MMC_VDD_160     2
+#define MMC_VDD_165     3
+#define MMC_VDD_170     4
+#define MMC_VDD_180     5
+#define MMC_VDD_190     6
+#define MMC_VDD_200     7
+#define MMC_VDD_210     8
+#define MMC_VDD_220     9
+#define MMC_VDD_230     10
+#define MMC_VDD_240     11
+#define MMC_VDD_250     12
+#define MMC_VDD_260     13
+#define MMC_VDD_270     14
+#define MMC_VDD_280     15
+#define MMC_VDD_290     16
+#define MMC_VDD_300     17
+#define MMC_VDD_310     18
+#define MMC_VDD_320     19
+#define MMC_VDD_330     20
+#define MMC_VDD_340     21
+#define MMC_VDD_350     22
+#define MMC_VDD_360     23
+
+        unsigned char   bus_mode;               /* command output mode */
+
+#define MMC_BUSMODE_OPENDRAIN   1
+#define MMC_BUSMODE_PUSHPULL    2
+
+        unsigned char   power_mode;             /* power supply mode */
+
+#define MMC_POWER_OFF           0
+#define MMC_POWER_UP            1
+#define MMC_POWER_ON            2
+};
+
+struct mmc_host_ops {
+        void    (*request)(struct mmc_host *host, struct mmc_request *req);
+        void    (*set_ios)(struct mmc_host *host, struct mmc_ios *ios);
+};
+
+struct mmc_card;
+struct device;
+
+struct mmc_host {
+        struct device           *dev;
+        struct mmc_host_ops     *ops;
+        unsigned int            f_min;
+        unsigned int            f_max;
+        u32                     ocr_avail;
+        char                    host_name[8];
+
+        /* host specific block data */
+        unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
+        unsigned short          max_hw_segs;    /* see blk_queue_max_hw_segments */
+        unsigned short          max_phys_segs;  /* see blk_queue_max_phys_segments */
+        unsigned short          max_sectors;    /* see blk_queue_max_sectors */
+        unsigned short          unused;
+
+        /* private data */
+        struct mmc_ios          ios;            /* current io bus settings */
+        u32                     ocr;            /* the current OCR setting */
+
+        struct list_head        cards;          /* devices attached to this host */
+
+        wait_queue_head_t       wq;
+        spinlock_t              lock;           /* card_busy lock */
+        struct mmc_card         *card_busy;     /* the MMC card claiming host */
+        struct mmc_card         *card_selected; /* the selected MMC card */
+
+        struct work_struct      detect;
+};
+
+extern struct mmc_host *mmc_alloc_host(int extra, struct device *);
+extern int mmc_add_host(struct mmc_host *);
+extern void mmc_remove_host(struct mmc_host *);
+extern void mmc_free_host(struct mmc_host *);
+
+#define mmc_priv(x)     ((void *)((x) + 1))
+#define mmc_dev(x)      ((x)->dev)