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

Commit ff255feb authored by Sascha Hauer's avatar Sascha Hauer
Browse files

ARM i.MX: iomux v1 initialization away from initcall 



This saves us from soc level dispatching in generic files

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 5ae30b47

arch/arm/mach-imx/mm-imx1.c

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

#include <mach/gpio.h>

#include <mach/irqs.h>

#include <mach/iomux-v1.h>



static struct map_desc imx_io_desc[] __initdata = {

	imx_map_entry(MX1, IO, MT_DEVICE),
@@ -39,6 +40,8 @@ void __init imx1_init_early(void) 
{

	mxc_set_cpu_type(MXC_CPU_MX1);

	mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));

	imx_iomuxv1_init(MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR),

			MX1_NUM_GPIO_PORT);

}



static struct mxc_gpio_port imx1_gpio_ports[] = {

arch/arm/mach-imx/mm-imx21.c

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/mach/map.h>

#include <mach/gpio.h>

#include <mach/irqs.h>

#include <mach/iomux-v1.h>



/* MX21 memory map definition */

static struct map_desc imx21_io_desc[] __initdata = {
@@ -65,6 +66,8 @@ void __init imx21_init_early(void) 
{

	mxc_set_cpu_type(MXC_CPU_MX21);

	mxc_arch_reset_init(MX21_IO_ADDRESS(MX21_WDOG_BASE_ADDR));

	imx_iomuxv1_init(MX21_IO_ADDRESS(MX21_GPIO_BASE_ADDR),

			MX21_NUM_GPIO_PORT);

}



static struct mxc_gpio_port imx21_gpio_ports[] = {

arch/arm/mach-imx/mm-imx27.c

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/mach/map.h>

#include <mach/gpio.h>

#include <mach/irqs.h>

#include <mach/iomux-v1.h>



/* MX27 memory map definition */

static struct map_desc imx27_io_desc[] __initdata = {
@@ -65,6 +66,8 @@ void __init imx27_init_early(void) 
{

	mxc_set_cpu_type(MXC_CPU_MX27);

	mxc_arch_reset_init(MX27_IO_ADDRESS(MX27_WDOG_BASE_ADDR));

	imx_iomuxv1_init(MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR),

			MX27_NUM_GPIO_PORT);

}



static struct mxc_gpio_port imx27_gpio_ports[] = {

arch/arm/plat-mxc/include/mach/iomux-v1.h

+2 −0
Original line number Diff line number Diff line
@@ -100,4 +100,6 @@ extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count, 
		const char *label);

extern void mxc_gpio_release_multiple_pins(const int *pin_list, int count);



extern int __init imx_iomuxv1_init(void __iomem *base, int numports);



#endif /* __MACH_IOMUX_V1_H__ */

arch/arm/plat-mxc/iomux-v1.c

+3 −21
Original line number Diff line number Diff line
@@ -211,28 +211,10 @@ void mxc_gpio_release_multiple_pins(const int *pin_list, int count) 
}

EXPORT_SYMBOL(mxc_gpio_release_multiple_pins);



static int imx_iomuxv1_init(void)

int __init imx_iomuxv1_init(void __iomem *base, int numports)

{

#ifdef CONFIG_ARCH_MX1

	if (cpu_is_mx1()) {

		imx_iomuxv1_baseaddr = MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR);

		imx_iomuxv1_numports = MX1_NUM_GPIO_PORT;

	} else

#endif

#ifdef CONFIG_MACH_MX21

	if (cpu_is_mx21()) {

		imx_iomuxv1_baseaddr = MX21_IO_ADDRESS(MX21_GPIO_BASE_ADDR);

		imx_iomuxv1_numports = MX21_NUM_GPIO_PORT;

	} else

#endif

#ifdef CONFIG_MACH_MX27

	if (cpu_is_mx27()) {

		imx_iomuxv1_baseaddr = MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR);

		imx_iomuxv1_numports = MX27_NUM_GPIO_PORT;

	} else

#endif

		return -ENODEV;

	imx_iomuxv1_baseaddr = base;

	imx_iomuxv1_numports = numports;



	return 0;

}
 
pure_initcall(imx_iomuxv1_init);