diff options
Diffstat (limited to 'arch/arm/boards/meerkat96/lowlevel.c')
| -rw-r--r-- | arch/arm/boards/meerkat96/lowlevel.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boards/meerkat96/lowlevel.c b/arch/arm/boards/meerkat96/lowlevel.c index 1c9baeacfb..03a1a11466 100644 --- a/arch/arm/boards/meerkat96/lowlevel.c +++ b/arch/arm/boards/meerkat96/lowlevel.c @@ -3,10 +3,10 @@ #include <debug_ll.h> #include <io.h> #include <linux/sizes.h> -#include <mach/debug_ll.h> -#include <mach/iomux-mx7.h> -#include <mach/imx7-ccm-regs.h> -#include <mach/generic.h> +#include <mach/imx/debug_ll.h> +#include <mach/imx/iomux-mx7.h> +#include <mach/imx/imx7-ccm-regs.h> +#include <mach/imx/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <asm/cache.h> @@ -14,7 +14,8 @@ extern char __dtb_z_imx7d_meerkat96_start[]; static void setup_uart(void) { - imx7_early_setup_uart_clock(); + /* FIXME: Below UART6 is muxed, not UART1 */ + imx7_early_setup_uart_clock(1); imx7_setup_pad(MX7D_PAD_SD1_WP__UART6_DCE_TX); imx7_uart_setup_ll(); putc_ll('>'); |