diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-07 08:31:47 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-07 08:31:47 +0100 |
commit | 4c8221be2ce41cf8d8e0d4338acaffaa7f68278d (patch) | |
tree | de561c76fb7cf9d225fb936af7575613c3d62b23 /include | |
parent | 2d022b509797fe102345bb3ab13dadbb361499c6 (diff) | |
parent | a0030a8f91caf50b8c02404be73c5a331af979de (diff) | |
download | barebox-4c8221be2ce41cf8d8e0d4338acaffaa7f68278d.tar.gz barebox-4c8221be2ce41cf8d8e0d4338acaffaa7f68278d.tar.xz |
Merge branch 'for-next/mci'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/amba/mmci.h | 42 | ||||
-rw-r--r-- | include/mci.h | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h new file mode 100644 index 0000000000..0bf558124c --- /dev/null +++ b/include/linux/amba/mmci.h @@ -0,0 +1,42 @@ +/* + * include/linux/amba/mmci.h + */ +#ifndef AMBA_MMCI_H +#define AMBA_MMCI_H + +/* + * These defines is places here due to access is needed from machine + * configuration files. The ST Micro version does not have ROD and + * reuse the voltage registers for direction settings. + */ +#define MCI_ST_DATA2DIREN (1 << 2) +#define MCI_ST_CMDDIREN (1 << 3) +#define MCI_ST_DATA0DIREN (1 << 4) +#define MCI_ST_DATA31DIREN (1 << 5) +#define MCI_ST_FBCLKEN (1 << 7) +#define MCI_ST_DATA74DIREN (1 << 8) + +#define SDI_CLKCR_CLKDIV_INIT 0x000000FD + +/** + * struct mmci_platform_data - platform configuration for the MMCI + * (also known as PL180) block. + * @f_max: the maximum operational frequency for this host in this + * platform configuration. When this is specified it takes precedence + * over the module parameter for the same frequency. + * @ocr_mask: available voltages on the 4 pins from the block, this + * is ignored if a regulator is used, see the MMC_VDD_* masks in + * mmc/host.h + * @capabilities: the capabilities of the block as implemented in + * this platform, signify anything MMC_CAP_* from mmc/host.h + */ +struct mmci_platform_data { + unsigned long f_max; + unsigned int ocr_mask; + unsigned long capabilities; + + uint32_t sigdir; + uint32_t clkdiv_init; +}; + +#endif diff --git a/include/mci.h b/include/mci.h index 1ca00c70f7..07ac2731f7 100644 --- a/include/mci.h +++ b/include/mci.h @@ -293,6 +293,7 @@ struct mci_host { unsigned f_max; /**< host interface upper limit */ unsigned clock; /**< Current clock used to talk to the card */ unsigned bus_width; /**< used data bus width to the card */ + unsigned max_req_size; /** init the host interface */ int (*init)(struct mci_host*, struct device_d*); |