Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326783
b: refs/heads/master
c: 0782783
h: refs/heads/master
i:
  326781: ebf904f
  326779: ee15ecd
  326775: 7a77660
  326767: 1660397
  326751: 678dae0
  326719: df41132
  326655: 4e22137
v: v3
  • Loading branch information
Shawn Guo committed Sep 11, 2012
1 parent 625ef91 commit 60a29f0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b6798f88bc1458eb7ab671b874880fd7ba77cfb4
refs/heads/master: 07827831822517b3713661c943e42389977407ff
17 changes: 0 additions & 17 deletions trunk/arch/arm/mach-imx/imx51-dt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/plat-mxc/include/mach/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 60a29f0

Please sign in to comment.