mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-30 12:49:36 +00:00
ARM: imx: use debug_ll_io_init() for imx6q
Use debug_ll_io_init() to map low level debug port for imx6q, so that arch/arm/mach-imx/lluart.c can be removed. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
parent
cd4842f558
commit
3e549a6946
4 changed files with 2 additions and 54 deletions
|
@ -88,7 +88,6 @@ obj-$(CONFIG_MACH_EUKREA_CPUIMX35SD) += mach-cpuimx35.o
|
||||||
obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o
|
obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o
|
||||||
obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o
|
obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o
|
||||||
|
|
||||||
obj-$(CONFIG_DEBUG_LL) += lluart.o
|
|
||||||
obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
|
obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
|
||||||
obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
|
obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
|
||||||
obj-$(CONFIG_HAVE_IMX_SRC) += src.o
|
obj-$(CONFIG_HAVE_IMX_SRC) += src.o
|
||||||
|
|
|
@ -116,11 +116,6 @@ void tzic_handle_irq(struct pt_regs *);
|
||||||
|
|
||||||
extern void imx_enable_cpu(int cpu, bool enable);
|
extern void imx_enable_cpu(int cpu, bool enable);
|
||||||
extern void imx_set_cpu_jump(int cpu, void *jump_addr);
|
extern void imx_set_cpu_jump(int cpu, void *jump_addr);
|
||||||
#ifdef CONFIG_DEBUG_LL
|
|
||||||
extern void imx_lluart_map_io(void);
|
|
||||||
#else
|
|
||||||
static inline void imx_lluart_map_io(void) {}
|
|
||||||
#endif
|
|
||||||
extern void v7_cpu_resume(void);
|
extern void v7_cpu_resume(void);
|
||||||
extern u32 *pl310_get_save_ptr(void);
|
extern u32 *pl310_get_save_ptr(void);
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
|
|
|
@ -1,47 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2011 Freescale Semiconductor, Inc.
|
|
||||||
* Copyright 2011 Linaro Ltd.
|
|
||||||
*
|
|
||||||
* The code contained herein is licensed under the GNU General Public
|
|
||||||
* License. You may obtain a copy of the GNU General Public License
|
|
||||||
* Version 2 or later at the following locations:
|
|
||||||
*
|
|
||||||
* http://www.opensource.org/licenses/gpl-license.html
|
|
||||||
* http://www.gnu.org/copyleft/gpl.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <linux/init.h>
|
|
||||||
#include <asm/page.h>
|
|
||||||
#include <asm/sizes.h>
|
|
||||||
#include <asm/mach/map.h>
|
|
||||||
|
|
||||||
#include "hardware.h"
|
|
||||||
|
|
||||||
#define IMX6Q_UART1_BASE_ADDR 0x02020000
|
|
||||||
#define IMX6Q_UART2_BASE_ADDR 0x021e8000
|
|
||||||
#define IMX6Q_UART3_BASE_ADDR 0x021ec000
|
|
||||||
#define IMX6Q_UART4_BASE_ADDR 0x021f0000
|
|
||||||
#define IMX6Q_UART5_BASE_ADDR 0x021f4000
|
|
||||||
|
|
||||||
/*
|
|
||||||
* IMX6Q_UART_BASE_ADDR is put in the middle to force the expansion
|
|
||||||
* of IMX6Q_UART##n##_BASE_ADDR.
|
|
||||||
*/
|
|
||||||
#define IMX6Q_UART_BASE_ADDR(n) IMX6Q_UART##n##_BASE_ADDR
|
|
||||||
#define IMX6Q_UART_BASE(n) IMX6Q_UART_BASE_ADDR(n)
|
|
||||||
#define IMX6Q_DEBUG_UART_BASE IMX6Q_UART_BASE(CONFIG_DEBUG_IMX6Q_UART_PORT)
|
|
||||||
|
|
||||||
static struct map_desc imx_lluart_desc = {
|
|
||||||
#ifdef CONFIG_DEBUG_IMX6Q_UART
|
|
||||||
.virtual = IMX_IO_P2V(IMX6Q_DEBUG_UART_BASE),
|
|
||||||
.pfn = __phys_to_pfn(IMX6Q_DEBUG_UART_BASE),
|
|
||||||
.length = 0x4000,
|
|
||||||
.type = MT_DEVICE,
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
void __init imx_lluart_map_io(void)
|
|
||||||
{
|
|
||||||
if (imx_lluart_desc.virtual)
|
|
||||||
iotable_init(&imx_lluart_desc, 1);
|
|
||||||
}
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include <asm/hardware/cache-l2x0.h>
|
#include <asm/hardware/cache-l2x0.h>
|
||||||
#include <asm/hardware/gic.h>
|
#include <asm/hardware/gic.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
#include <asm/mach/map.h>
|
||||||
#include <asm/mach/time.h>
|
#include <asm/mach/time.h>
|
||||||
#include <asm/system_misc.h>
|
#include <asm/system_misc.h>
|
||||||
|
|
||||||
|
@ -216,7 +217,7 @@ static void __init imx6q_init_late(void)
|
||||||
|
|
||||||
static void __init imx6q_map_io(void)
|
static void __init imx6q_map_io(void)
|
||||||
{
|
{
|
||||||
imx_lluart_map_io();
|
debug_ll_io_init();
|
||||||
imx_scu_map_io();
|
imx_scu_map_io();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue