diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 14:05:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:35:42 +0200 |
| commit | 14d597b74aed3c44af0ee8f5ea24b970a50aec99 (patch) | |
| tree | 7cd25aa0621ccc82dd2b613656e74aacdf4afdde /arch/arm/mach-mxs | |
| parent | 8caec0d048609ccf8c75025b0d73af10f74e2157 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
| download | blackbird-op-linux-14d597b74aed3c44af0ee8f5ea24b970a50aec99.tar.gz blackbird-op-linux-14d597b74aed3c44af0ee8f5ea24b970a50aec99.zip | |
Merge tag 'v3.5-rc6' into next/dt
New pull requests are based on Linux 3.5-rc6
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/mach-apx4devkit.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/mach-apx4devkit.c b/arch/arm/mach-mxs/mach-apx4devkit.c index 5e90b9dcdef8..f5f061757deb 100644 --- a/arch/arm/mach-mxs/mach-apx4devkit.c +++ b/arch/arm/mach-mxs/mach-apx4devkit.c @@ -205,6 +205,16 @@ static int apx4devkit_phy_fixup(struct phy_device *phy) return 0; } +static void __init apx4devkit_fec_phy_clk_enable(void) +{ + struct clk *clk; + + /* Enable fec phy clock */ + clk = clk_get_sys("enet_out", NULL); + if (!IS_ERR(clk)) + clk_prepare_enable(clk); +} + static void __init apx4devkit_init(void) { mx28_soc_init(); @@ -225,6 +235,7 @@ static void __init apx4devkit_init(void) phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK, apx4devkit_phy_fixup); + apx4devkit_fec_phy_clk_enable(); mx28_add_fec(0, &mx28_fec_pdata); mx28_add_mxs_mmc(0, &apx4devkit_mmc_pdata); |
