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

Commit bc9ea6c7 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

imx27: define and use MX27_IO_ADDRESS 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Javier Martin <javier.martin@vista-silicon.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
parent a3f5ac78

arch/arm/mach-mx2/clock_imx27.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <mach/common.h>

#include <mach/hardware.h>



#define IO_ADDR_CCM(off)	(IO_ADDRESS(MX27_CCM_BASE_ADDR) + (off))

#define IO_ADDR_CCM(off)	(MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR) + (off))



/* Register offsets */

#define CCM_CSCR		IO_ADDR_CCM(0x0)
@@ -757,7 +757,7 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_enable(&uart1_clk);

#endif



	mxc_timer_init(&gpt1_clk, IO_ADDRESS(MX27_GPT1_BASE_ADDR),

	mxc_timer_init(&gpt1_clk, MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR),

			MX27_INT_GPT1);



	return 0;

arch/arm/mach-mx2/cpu_imx27.c

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static void query_silicon_parameter(void) 
	 * the silicon revision very early we read it here to

	 * avoid any further hooks

	*/

	val = __raw_readl(IO_ADDRESS(MX27_SYSCTRL_BASE_ADDR) + SYS_CHIP_ID);

	val = __raw_readl(MX27_IO_ADDRESS(MX27_SYSCTRL_BASE_ADDR

				+ SYS_CHIP_ID));



	cpu_silicon_rev = (int)(val >> 28);

	cpu_partnumber = (int)((val >> 12) & 0xFFFF);

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

+5 −0
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ 
/* IRAM */

#define MX27_IRAM_BASE_ADDR		0xffff4c00	/* internal ram */



#define MX27_IO_ADDRESS(x) (						\

	IMX_IO_ADDRESS(x, MX27_AIPI) ?:					\

	IMX_IO_ADDRESS(x, MX27_SAHB1) ?:				\

	IMX_IO_ADDRESS(x, MX27_X_MEMC))



/* fixed interrupt numbers */

#define MX27_INT_I2C2		1

#define MX27_INT_GPT6		2