Merge branch 'master' of git://git.denx.de/u-boot-atmel

This commit is contained in:
Tom Rini
2016-08-15 17:31:23 -04:00
41 changed files with 3686 additions and 78 deletions

View File

@@ -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;

View File

@@ -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