ARM: mxs: use debug_ll_io_init for low-level debug
The only user of the static mapping done in mx23_map_io and mx28_map_io is low-level debug now. Use debug_ll_io_init() instead, so that the static mapping is used nowhere and can be removed completely later. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
parent
69d75a02db
commit
1f629564d0
|
@ -11,16 +11,13 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <mach/mx23.h>
|
|
||||||
#include <mach/mx28.h>
|
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_IMX23_UART
|
#ifdef CONFIG_DEBUG_IMX23_UART
|
||||||
#define UART_PADDR MX23_DUART_BASE_ADDR
|
#define UART_PADDR 0x80070000
|
||||||
#elif defined (CONFIG_DEBUG_IMX28_UART)
|
#elif defined (CONFIG_DEBUG_IMX28_UART)
|
||||||
#define UART_PADDR MX28_DUART_BASE_ADDR
|
#define UART_PADDR 0x80074000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define UART_VADDR MXS_IO_ADDRESS(UART_PADDR)
|
#define UART_VADDR 0xfe100000
|
||||||
|
|
||||||
.macro addruart, rp, rv, tmp
|
.macro addruart, rp, rv, tmp
|
||||||
ldr \rp, =UART_PADDR @ physical
|
ldr \rp, =UART_PADDR @ physical
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include <linux/phy.h>
|
#include <linux/phy.h>
|
||||||
#include <linux/pinctrl/consumer.h>
|
#include <linux/pinctrl/consumer.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>
|
||||||
#include <mach/common.h>
|
#include <mach/common.h>
|
||||||
|
@ -507,7 +508,7 @@ static const char *imx28_dt_compat[] __initdata = {
|
||||||
};
|
};
|
||||||
|
|
||||||
DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)")
|
DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)")
|
||||||
.map_io = mx23_map_io,
|
.map_io = debug_ll_io_init,
|
||||||
.init_irq = irqchip_init,
|
.init_irq = irqchip_init,
|
||||||
.handle_irq = icoll_handle_irq,
|
.handle_irq = icoll_handle_irq,
|
||||||
.init_time = imx23_timer_init,
|
.init_time = imx23_timer_init,
|
||||||
|
@ -517,7 +518,7 @@ DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)")
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)")
|
DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)")
|
||||||
.map_io = mx28_map_io,
|
.map_io = debug_ll_io_init,
|
||||||
.init_irq = irqchip_init,
|
.init_irq = irqchip_init,
|
||||||
.handle_irq = icoll_handle_irq,
|
.handle_irq = icoll_handle_irq,
|
||||||
.init_time = imx28_timer_init,
|
.init_time = imx28_timer_init,
|
||||||
|
|
Loading…
Reference in New Issue