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

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

ARM: imx: get rid of mxc_gpio_init 



This function is defined once for each imx family and so is in the way
when compiling a kernel for more than one SoC.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 3aad49e1

arch/arm/mach-imx/devices.c

+8 −14
Original line number Diff line number Diff line
@@ -454,26 +454,21 @@ DEFINE_IMX_SSI_DEVICE(1, 2, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1); 


#ifdef CONFIG_MACH_MX21

DEFINE_MXC_GPIO_PORTS(MX21, imx21);



int __init imx21_register_gpios(void)

{

	return mxc_gpio_init(imx21_gpio_ports, ARRAY_SIZE(imx21_gpio_ports));

}

#endif



#ifdef CONFIG_MACH_MX27

DEFINE_MXC_GPIO_PORTS(MX27, imx27);

#endif



int __init mxc_register_gpios(void)

int __init imx27_register_gpios(void)

{

#ifdef CONFIG_MACH_MX21

	if (cpu_is_mx21())

		return mxc_gpio_init(imx21_gpio_ports, ARRAY_SIZE(imx21_gpio_ports));

	else

#endif

#ifdef CONFIG_MACH_MX27

	if (cpu_is_mx27())

	return mxc_gpio_init(imx27_gpio_ports, ARRAY_SIZE(imx27_gpio_ports));

	else

#endif

		return 0;

}

#endif



#ifdef CONFIG_MACH_MX21

static struct resource mx21_usbhc_resources[] = {
@@ -500,4 +495,3 @@ struct platform_device mx21_usbhc_device = { 
	.resource	= mx21_usbhc_resources,

};

#endif

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

+3 −0
Original line number Diff line number Diff line
@@ -77,7 +77,10 @@ void __init mx21_map_io(void) 
	iotable_init(imx21_io_desc, ARRAY_SIZE(imx21_io_desc));

}



int imx21_register_gpios(void);



void __init mx21_init_irq(void)

{

	imx21_register_gpios();

	mxc_init_irq(MX21_IO_ADDRESS(MX21_AVIC_BASE_ADDR));

}

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

+3 −0
Original line number Diff line number Diff line
@@ -77,7 +77,10 @@ void __init mx27_map_io(void) 
	iotable_init(imx27_io_desc, ARRAY_SIZE(imx27_io_desc));

}



int imx27_register_gpios(void);



void __init mx27_init_irq(void)

{

	imx27_register_gpios();

	mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));

}

arch/arm/mach-mx1/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static struct mxc_gpio_port imx_gpio_ports[] = { 
	}

};



int __init mxc_register_gpios(void)

int __init imx1_register_gpios(void)

{

	return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports));

}

arch/arm/mach-mx1/generic.c

+3 −0
Original line number Diff line number Diff line
@@ -46,7 +46,10 @@ void __init mx1_map_io(void) 
	iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc));

}



int imx1_register_gpios(void);



void __init mx1_init_irq(void)

{

	imx1_register_gpios();

	mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR));

}