Skip to content

Commit

Permalink
ARM: imx53: decouple device tree boot from board files
Browse files Browse the repository at this point in the history
Now, imx53 device tree kernel calls pinctrl to set up pins.  The
functions used to hook up non-DT pin setup is not needed for DT boot
any more.  Remove them from DT image.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  • Loading branch information
Shawn Guo committed Sep 11, 2012
1 parent 1a60a4d commit 721a441
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
20 changes: 0 additions & 20 deletions arch/arm/mach-imx/imx53-dt.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,6 @@ static const struct of_dev_auxdata imx53_auxdata_lookup[] __initconst = {
{ /* sentinel */ }
};

static const struct of_device_id imx53_iomuxc_of_match[] __initconst = {
{ .compatible = "fsl,imx53-iomuxc-ard", .data = imx53_ard_common_init, },
{ .compatible = "fsl,imx53-iomuxc-evk", .data = imx53_evk_common_init, },
{ .compatible = "fsl,imx53-iomuxc-qsb", .data = imx53_qsb_common_init, },
{ .compatible = "fsl,imx53-iomuxc-smd", .data = imx53_smd_common_init, },
{ /* sentinel */ }
};

static void __init imx53_qsb_init(void)
{
struct clk *clk;
Expand All @@ -73,18 +65,6 @@ static void __init imx53_qsb_init(void)

static void __init imx53_dt_init(void)
{
struct device_node *node;
const struct of_device_id *of_id;
void (*func)(void);

node = of_find_matching_node(NULL, imx53_iomuxc_of_match);
if (node) {
of_id = of_match_node(imx53_iomuxc_of_match, node);
func = of_id->data;
func();
of_node_put(node);
}

if (of_machine_is_compatible("fsl,imx53-qsb"))
imx53_qsb_init();

Expand Down
4 changes: 0 additions & 4 deletions arch/arm/plat-mxc/include/mach/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@ 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 void imx53_ard_common_init(void);
extern void imx53_evk_common_init(void);
extern void imx53_qsb_common_init(void);
extern void imx53_smd_common_init(void);
extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
extern void imx6q_clock_map_io(void);

Expand Down

0 comments on commit 721a441

Please sign in to comment.