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

Commit 69ac71d3 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: call mxc_device_init() in soc specific function 



mxc_device_init() is a core_initcall function used to register devices
for mxc_aips_bus and mxc_ahb_bus, which are needed by gpio and dma
device registration.

Instead of being a core_initcall function, we have it called in soc
specific initialization function before gpio and dma devices get
registered, so that it will not be called for other platforms when
we enable multi-platform support for imx.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 1e66210a

arch/arm/mach-imx/common.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ extern void mxc_arch_reset_init(void __iomem *); 
extern int mx53_revision(void);

extern int mx53_display_revision(void);

extern void imx_set_aips(void __iomem *);

extern int mxc_device_init(void);



enum mxc_cpu_pwr_mode {

	WAIT_CLOCKED,		/* wfi only */

arch/arm/mach-imx/devices/devices.c

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct device mxc_ahb_bus = { 
	.parent		= &platform_bus,

};



static int __init mxc_device_init(void)

int __init mxc_device_init(void)

{

	int ret;
@@ -45,4 +45,3 @@ static int __init mxc_device_init(void) 
done:

	return ret;

}
 
core_initcall(mxc_device_init);

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

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ static const struct resource imx21_audmux_res[] __initconst = { 


void __init imx21_soc_init(void)

{

	mxc_device_init();



	mxc_register_gpio("imx21-gpio", 0, MX21_GPIO1_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);

	mxc_register_gpio("imx21-gpio", 1, MX21_GPIO2_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);

	mxc_register_gpio("imx21-gpio", 2, MX21_GPIO3_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);

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

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ static const struct resource imx25_audmux_res[] __initconst = { 


void __init imx25_soc_init(void)

{

	mxc_device_init();



	/* i.mx25 has the i.mx35 type gpio */

	mxc_register_gpio("imx35-gpio", 0, MX25_GPIO1_BASE_ADDR, SZ_16K, MX25_INT_GPIO1, 0);

	mxc_register_gpio("imx35-gpio", 1, MX25_GPIO2_BASE_ADDR, SZ_16K, MX25_INT_GPIO2, 0);

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

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ static const struct resource imx27_audmux_res[] __initconst = { 


void __init imx27_soc_init(void)

{

	mxc_device_init();



	/* i.mx27 has the i.mx21 type gpio */

	mxc_register_gpio("imx21-gpio", 0, MX27_GPIO1_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);

	mxc_register_gpio("imx21-gpio", 1, MX27_GPIO2_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);