* [U-Boot] [PATCH] omap_hsmmc.c: Fix build warning on non-omap3
@ 2017-02-09 18:45 Tom Rini
2017-02-09 19:52 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Tom Rini @ 2017-02-09 18:45 UTC (permalink / raw)
To: u-boot
It was incorrect to always include "asm/arch-omap3/mux.h" constantly.
This introduced warnings on non-omap3 where certain values will conflict
between the various families. Conditionally guard the inclusion in
order to correct the problem.
Fixes: 6aca17c9b7e8 ("drivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xx")
Signed-off-by: Tom Rini <trini@konsulko.com>
---
drivers/mmc/omap_hsmmc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index b63ce565f2bf..7ed532843bca 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -37,8 +37,10 @@
#include <asm/gpio.h>
#include <asm/arch/sys_proto.h>
#endif
+#ifdef CONFIG_MMC_OMAP36XX_PINS
+#include <asm/arch/mux.h>
+#endif
#include <dm.h>
-#include <asm/arch-omap3/mux.h>
DECLARE_GLOBAL_DATA_PTR;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] omap_hsmmc.c: Fix build warning on non-omap3
2017-02-09 18:45 [U-Boot] [PATCH] omap_hsmmc.c: Fix build warning on non-omap3 Tom Rini
@ 2017-02-09 19:52 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2017-02-09 19:52 UTC (permalink / raw)
To: u-boot
On Thu, Feb 09, 2017 at 01:45:12PM -0500, Tom Rini wrote:
> It was incorrect to always include "asm/arch-omap3/mux.h" constantly.
> This introduced warnings on non-omap3 where certain values will conflict
> between the various families. Conditionally guard the inclusion in
> order to correct the problem.
>
> Fixes: 6aca17c9b7e8 ("drivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xx")
> Signed-off-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170209/81869554/attachment.sig>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-09 19:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-09 18:45 [U-Boot] [PATCH] omap_hsmmc.c: Fix build warning on non-omap3 Tom Rini
2017-02-09 19:52 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.