Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 373959
b: refs/heads/master
c: d260a7a
h: refs/heads/master
i:
  373957: e162235
  373955: 47a1859
  373951: bb0171b
v: v3
  • Loading branch information
Shawn Guo committed Apr 4, 2013
1 parent 190f199 commit d6df701
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 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: f231a9fe7f802962ac225e56c91597680e282186
refs/heads/master: d260a7af0fbd2257b3d88b3e72b8b11a0398f796
12 changes: 0 additions & 12 deletions trunk/arch/arm/mach-mxs/mach-mxs.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ static inline void enable_clk_enet_out(void)

static void __init imx28_evk_init(void)
{
enable_clk_enet_out();
update_fec_mac_prop(OUI_FSL);

mxsfb_pdata.mode_list = mx28evk_video_modes;
Expand Down Expand Up @@ -391,11 +390,6 @@ static void __init m28evk_init(void)
mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
}

static void __init sc_sps1_init(void)
{
enable_clk_enet_out();
}

static int apx4devkit_phy_fixup(struct phy_device *phy)
{
phy->dev_flags |= MICREL_PHY_50MHZ_CLK;
Expand Down Expand Up @@ -494,7 +488,6 @@ static void __init tx28_post_init(void)

static void __init cfa10049_init(void)
{
enable_clk_enet_out();
update_fec_mac_prop(OUI_CRYSTALFONTZ);

mxsfb_pdata.mode_list = cfa10049_video_modes;
Expand All @@ -506,14 +499,11 @@ static void __init cfa10049_init(void)

static void __init cfa10037_init(void)
{
enable_clk_enet_out();
update_fec_mac_prop(OUI_CRYSTALFONTZ);
}

static void __init apf28_init(void)
{
enable_clk_enet_out();

mxsfb_pdata.mode_list = apf28dev_video_modes;
mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes);
mxsfb_pdata.default_bpp = 16;
Expand All @@ -538,8 +528,6 @@ static void __init mxs_machine_init(void)
cfa10049_init();
else if (of_machine_is_compatible("armadeus,imx28-apf28"))
apf28_init();
else if (of_machine_is_compatible("schulercontrol,imx28-sps1"))
sc_sps1_init();

of_platform_populate(NULL, of_default_bus_match_table,
mxs_auxdata_lookup, NULL);
Expand Down

0 comments on commit d6df701

Please sign in to comment.