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

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

imx31: define and use MX31_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: Daniel Mack <daniel@caiaq.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
parent bc9ea6c7

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -625,7 +625,8 @@ int __init mx31_clocks_init(unsigned long fref) 
		__raw_writel(reg, MXC_CCM_PMCR1);

		__raw_writel(reg, MXC_CCM_PMCR1);

	}

	}





	mxc_timer_init(&ipg_clk, IO_ADDRESS(MX31_GPT1_BASE_ADDR), MX31_INT_GPT);

	mxc_timer_init(&ipg_clk, MX31_IO_ADDRESS(MX31_GPT1_BASE_ADDR),

			MX31_INT_GPT);





	return 0;

	return 0;

}

}

arch/arm/mach-mx3/crm_regs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define CKIH_CLK_FREQ_27MHZ     27000000

#define CKIH_CLK_FREQ_27MHZ     27000000

#define CKIL_CLK_FREQ           32768

#define CKIL_CLK_FREQ           32768





#define MXC_CCM_BASE		IO_ADDRESS(MX31_CCM_BASE_ADDR)

#define MXC_CCM_BASE		MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR)





/* Register addresses */

/* Register addresses */

#define MXC_CCM_CCMR		(MXC_CCM_BASE + 0x00)

#define MXC_CCM_CCMR		(MXC_CCM_BASE + 0x00)

arch/arm/mach-mx3/iomux-imx31.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
/*

/*

 * IOMUX register (base) addresses

 * IOMUX register (base) addresses

 */

 */

#define IOMUX_BASE	IO_ADDRESS(MX31_IOMUXC_BASE_ADDR)

#define IOMUX_BASE	MX31_IO_ADDRESS(MX31_IOMUXC_BASE_ADDR)

#define IOMUXINT_OBS1	(IOMUX_BASE + 0x000)

#define IOMUXINT_OBS1	(IOMUX_BASE + 0x000)

#define IOMUXINT_OBS2	(IOMUX_BASE + 0x004)

#define IOMUXINT_OBS2	(IOMUX_BASE + 0x004)

#define IOMUXGPR	(IOMUX_BASE + 0x008)

#define IOMUXGPR	(IOMUX_BASE + 0x008)

arch/arm/plat-mxc/ehci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ int mxc_set_usbcontrol(int port, unsigned int flags) 
	unsigned int v;

	unsigned int v;





	if (cpu_is_mx31()) {

	if (cpu_is_mx31()) {

		v = readl(IO_ADDRESS(MX31_OTG_BASE_ADDR +

		v = readl(MX31_IO_ADDRESS(MX31_OTG_BASE_ADDR +

				     USBCTRL_OTGBASE_OFFSET));

				     USBCTRL_OTGBASE_OFFSET));





		switch (port) {

		switch (port) {
@@ -79,7 +79,7 @@ int mxc_set_usbcontrol(int port, unsigned int flags) 
			break;

			break;

		}

		}





		writel(v, IO_ADDRESS(MX31_OTG_BASE_ADDR +

		writel(v, MX31_IO_ADDRESS(MX31_OTG_BASE_ADDR +

				     USBCTRL_OTGBASE_OFFSET));

				     USBCTRL_OTGBASE_OFFSET));

		return 0;

		return 0;

	}

	}

arch/arm/plat-mxc/include/mach/board-mx31ads.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <mach/hardware.h>

#include <mach/hardware.h>





/* Base address of PBC controller */

/* Base address of PBC controller */

#define PBC_BASE_ADDRESS        IO_ADDRESS(CS4_BASE_ADDR)

#define PBC_BASE_ADDRESS        MX31_CS4_BASE_ADDR_VIRT

/* Offsets for the PBC Controller register */

/* Offsets for the PBC Controller register */





/* PBC Board status register offset */

/* PBC Board status register offset */