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

Commit 07827831 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx51: decouple device tree boot from board files 



Now, imx51 device tree kernel calls pinctrl to set up pins.  The
function used to hook up non-DT pin setup is not needed for DT boot
any more.  Remove it from DT image.

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

arch/arm/mach-imx/imx51-dt.c

+0 −17
Original line number Diff line number Diff line
@@ -43,25 +43,8 @@ static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = { 
	{ /* sentinel */ }

};



static const struct of_device_id imx51_iomuxc_of_match[] __initconst = {

	{ .compatible = "fsl,imx51-iomuxc-babbage", .data = imx51_babbage_common_init, },

	{ /* sentinel */ }

};



static void __init imx51_dt_init(void)

{

	struct device_node *node;

	const struct of_device_id *of_id;

	void (*func)(void);



	node = of_find_matching_node(NULL, imx51_iomuxc_of_match);

	if (node) {

		of_id = of_match_node(imx51_iomuxc_of_match, node);

		func = of_id->data;

		func();

		of_node_put(node);

	}



	of_platform_populate(NULL, of_default_bus_match_table,

			     imx51_auxdata_lookup, NULL);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ extern void imx_src_prepare_restart(void); 
extern void imx_gpc_init(void);

extern void imx_gpc_pre_suspend(void);

extern void imx_gpc_post_resume(void);

extern void imx51_babbage_common_init(void);

extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);

extern void imx6q_clock_map_io(void);