diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-15 17:31:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-15 17:31:23 -0400 |
| commit | 0fcb9f07a1d086fc6951c08d2fc1cf6048bd54e2 (patch) | |
| tree | aa56e05011e5b79a0d940a335558918b36e97a90 /include | |
| parent | 2ef98d33166e5c22a61eba29c20e236b72f1e8a2 (diff) | |
| parent | a0d0d86f5cfeefda87986f3825ed1a85efa24448 (diff) | |
| download | u-boot-imx-0fcb9f07a1d086fc6951c08d2fc1cf6048bd54e2.zip u-boot-imx-0fcb9f07a1d086fc6951c08d2fc1cf6048bd54e2.tar.gz u-boot-imx-0fcb9f07a1d086fc6951c08d2fc1cf6048bd54e2.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'include')
| -rw-r--r-- | include/clk.h | 2 | ||||
| -rw-r--r-- | include/sdhci.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/clk.h b/include/clk.h index 161bc28..dc18b03 100644 --- a/include/clk.h +++ b/include/clk.h @@ -104,7 +104,7 @@ static inline int clk_get_by_index(struct udevice *dev, int index, return -ENOSYS; } -static int clk_get_by_name(struct udevice *dev, const char *name, +static inline int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk) { return -ENOSYS; diff --git a/include/sdhci.h b/include/sdhci.h index fcef4dc..6844c73 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -166,6 +166,8 @@ #define SDHCI_CAN_64BIT 0x10000000 #define SDHCI_CAPABILITIES_1 0x44 +#define SDHCI_CLOCK_MUL_MASK 0x00FF0000 +#define SDHCI_CLOCK_MUL_SHIFT 16 #define SDHCI_MAX_CURRENT 0x48 |