Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e688f0d authored by Eric Bénard's avatar Eric Bénard Committed by Sascha Hauer
Browse files

imx25: fix low level debug 



DEBUG_LL is actually broken on i.MX25, this patch fix it.

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent a7d403cf

arch/arm/mach-mx25/clock.c

+3 −0
Original line number Diff line number Diff line
@@ -292,6 +292,9 @@ int __init mx25_clocks_init(void) 
	__raw_writel((1 << 19), CRM_BASE + CCM_CGCR0);

	__raw_writel((0xf << 16) | (3 << 26), CRM_BASE + CCM_CGCR1);

	__raw_writel((1 << 5), CRM_BASE + CCM_CGCR2);

#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)

	clk_enable(&uart1_clk);

#endif



	/* Clock source for lcdc and csi is upll */

	__raw_writel(__raw_readl(CRM_BASE+0x64) | (1 << 7) | (1 << 0),

arch/arm/plat-mxc/include/mach/debug-macro.S

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"

#endif

#include <mach/mx25.h>

#define UART_PADDR	UART1_BASE_ADDR

#define UART_VADDR	MX25_AIPS1_IO_ADDRESS(UART1_BASE_ADDR)

#define UART_PADDR	MX25_UART1_BASE_ADDR

#define UART_VADDR	MX25_AIPS1_IO_ADDRESS(MX25_UART1_BASE_ADDR)

#endif



#ifdef CONFIG_ARCH_MX2

arch/arm/plat-mxc/include/mach/mx25.h

+3 −5
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
	IMX_IO_ADDRESS(x, MX25_AIPS2) ?:			\

	IMX_IO_ADDRESS(x, MX25_AVIC))



#define MX25_AIPS1_IO_ADDRESS(x) \

	(((x) - MX25_AIPS1_BASE_ADDR) + MX25_AIPS1_BASE_ADDR_VIRT)



#define MX25_UART1_BASE_ADDR		0x43f90000

#define MX25_UART2_BASE_ADDR		0x43f94000

#define MX25_AUDMUX_BASE_ADDR		0x43fb0000
@@ -70,9 +73,4 @@ 
#define MX25_INT_UART1		45

#define MX25_INT_FEC		57



#if defined(IMX_NEEDS_DEPRECATED_SYMBOLS)

#define UART1_BASE_ADDR			MX25_UART1_BASE_ADDR

#define UART2_BASE_ADDR			MX25_UART2_BASE_ADDR

#endif



#endif /* ifndef __MACH_MX25_H__ */