commit b47abc36aaa4695ed50226ca1f3bd8f0b58bdaa6
author Eric Nelson <eric.nelson@boundarydevices.com> Wed Nov 13 16:36:19 2013 -0700
committer Stefano Babic <sbabic@denx.de> Tue Dec 17 17:12:34 2013 +0100
tree 0648fcddcea3a3f23b5b32fb9546997e558e1466
parent 570aa2fac3322e2e8c9dc5b4c1ac4ac95c22f9f6

i.MX6 (DQ/DLS): use macros for mux and pad declarations

This allows the use of either or both declarations from
the files mx6q_pins.h and mx6dl_pins.h.

All board files should include <asm/arch/mx6-pins.h>
with one of the following defined in boards.cfg
    MX6Q   - for boards targeting i.MX6Q or i.MX6D
    MX6DL  - for boards targeting i.MX6DL
    MX6S   - for boards targeting i.MX6S
    MX6QDL - for boards that support any of the above with
             run-time detection

Pad declarations will be MX6_PAD_x for single-variant boards
and MX6Q_PAD_x and MX6DL_PAD_x for boards supporting both
processor classes.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Stefano Babic <sbabic@denx.de>

board/barco/titanium/titanium.c

diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c
index c3775ef..6db4488 100644
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -9,7 +9,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
-#include <asm/arch/mx6q_pins.h>
+#include <asm/arch/mx6-pins.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>