From d51e9a1d04ab77ee26da534172c0c3891dc8ac4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= Date: Mon, 15 Aug 2016 21:04:41 +0200 Subject: clk.h: inline clk_get_by_name() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix compile warning for non OF_CONTROL builds: ---8<--- In file included from /Volumes/devel/u-boot/drivers/gpio/atmel_pio4.c:10:0: /Volumes/devel/u-boot/include/clk.h:107:12: warning: 'clk_get_by_name' defined but not used [-Wunused-function] --->8--- Signed-off-by: Andreas Bießmann Acked-by: Stephen Warren --- include/clk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/clk.h b/include/clk.h index 161bc2825fc..dc18b0310a4 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; -- cgit v1.2.3 From a0d0d86f5cfeefda87986f3825ed1a85efa24448 Mon Sep 17 00:00:00 2001 From: Wenyou Yang Date: Wed, 10 Aug 2016 10:51:05 +0800 Subject: mmc: atmel_sdhci: Convert to the driver model support Convert the driver to the driver model while retaining the existing legacy code. This allows the driver to support boards that have converted to driver model as well as those that have not. Signed-off-by: Wenyou Yang Reviewed-by: Simon Glass Reviewed-by: Jaehoon Chung Reviewed-by: Heiko Schocher --- include/sdhci.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/sdhci.h b/include/sdhci.h index fcef4dc065a..6844c73bdc5 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 -- cgit v1.2.3