projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.denx.de/git/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
sdhci.h
diff --git
a/include/sdhci.h
b/include/sdhci.h
index
74d06ae
..
aa4a0e9
100644
(file)
--- a/
include/sdhci.h
+++ b/
include/sdhci.h
@@
-12,6
+12,7
@@
#include <asm/io.h>
#include <mmc.h>
#include <asm/io.h>
#include <mmc.h>
+#include <fdtdec.h>
/*
* Controller registers
/*
* Controller registers
@@
-244,9
+245,15
@@
struct sdhci_host {
const struct sdhci_ops *ops;
int index;
const struct sdhci_ops *ops;
int index;
+ int bus_width;
+ struct fdt_gpio_state pwr_gpio; /* Power GPIO */
+ struct fdt_gpio_state cd_gpio; /* Card Detect GPIO */
+
void (*set_control_reg)(struct sdhci_host *host);
void (*set_clock)(int dev_index, unsigned int div);
uint voltages;
void (*set_control_reg)(struct sdhci_host *host);
void (*set_clock)(int dev_index, unsigned int div);
uint voltages;
+
+ struct mmc_config cfg;
};
#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
};
#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS