diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-05 11:06:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-05 11:06:36 +0200 |
| commit | 8d111444bde8949f1df442907e261b2558cec5cb (patch) | |
| tree | f1209ed54bf9c3a079c9cf2643e42b5cc7680047 /arch | |
| parent | 8df0fd939a9dab6b68ad06dbc6d51e6246091fa0 (diff) | |
| parent | c46d2916f6c03d3c8a2c38148af2e45cdadaf61f (diff) | |
| download | linux-8d111444bde8949f1df442907e261b2558cec5cb.tar.gz linux-8d111444bde8949f1df442907e261b2558cec5cb.tar.bz2 linux-8d111444bde8949f1df442907e261b2558cec5cb.zip | |
Merge branch 'mxs/fixes-for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
* 'mxs/fixes-for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: apx4devkit: fix FEC enabling PHY clock
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -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); |