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

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

imx35: define and use MX35_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: Jürgen Beisert <j.beisert@pengutronix.de>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
parent df9375fa

arch/arm/mach-mx3/clock-imx35.c

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <mach/hardware.h>

#include <mach/common.h>



#define CCM_BASE	IO_ADDRESS(MX35_CCM_BASE_ADDR)

#define CCM_BASE	MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR)



#define CCM_CCMR        0x00

#define CCM_PDR0        0x04
@@ -504,7 +504,8 @@ int __init mx35_clocks_init() 
	__raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2);

	__raw_writel(0, CCM_BASE + CCM_CGR3);



	mxc_timer_init(&gpt_clk, IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT);

	mxc_timer_init(&gpt_clk,

			MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT);



	return 0;

}

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

+7 −0
Original line number Diff line number Diff line
@@ -104,6 +104,13 @@ 
#define MX35_NFC_BASE_ADDR		0xbb000000

#define MX35_PCMCIA_MEM_BASE_ADDR	0xbc000000



#define MX35_IO_ADDRESS(x) (						\

	IMX_IO_ADDRESS(x, MX35_AIPS1) ?:				\

	IMX_IO_ADDRESS(x, MX35_AIPS2) ?:				\

	IMX_IO_ADDRESS(x, MX35_AVIC) ?:					\

	IMX_IO_ADDRESS(x, MX35_X_MEMC) ?:				\

	IMX_IO_ADDRESS(x, MX35_SPBA0))



/*

 * Interrupt numbers

 */