diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-14 22:53:03 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-14 22:53:03 (GMT) |
| commit | 4f58002013ba1e89eb8fda015ff495bd37cd4016 (patch) | |
| tree | 983b76b4bbf34116a0ec21444e790ff6bdaacfd5 /drivers | |
| parent | 11b66916e0e03c8930cdce72e68e8e06ff313b48 (diff) | |
| parent | 1079af4817b562e176259c2beadb67ef0d046d91 (diff) | |
| download | u-boot-fsl-qoriq-4f58002013ba1e89eb8fda015ff495bd37cd4016.tar.xz | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ddr/fsl/interactive.c | 4 | ||||
| -rw-r--r-- | drivers/net/phy/marvell.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c index 202ad13..653bbab 100644 --- a/drivers/ddr/fsl/interactive.c +++ b/drivers/ddr/fsl/interactive.c @@ -154,7 +154,9 @@ static void lowest_common_dimm_parameters_edit(fsl_ddr_info_t *pinfo, static const struct options_string options[] = { COMMON_TIMING(tckmin_x_ps), COMMON_TIMING(tckmax_ps), +#if defined(CONFIG_SYS_FSL_DDR3) || defined(CONFIG_SYS_FSL_DDR4) COMMON_TIMING(taamin_ps), +#endif COMMON_TIMING(trcd_ps), COMMON_TIMING(trp_ps), COMMON_TIMING(tras_ps), @@ -422,7 +424,9 @@ static void print_lowest_common_dimm_parameters( const common_timing_params_t *plcd_dimm_params) { static const struct options_string options[] = { +#if defined(CONFIG_SYS_FSL_DDR3) || defined(CONFIG_SYS_FSL_DDR4) COMMON_TIMING(taamin_ps), +#endif COMMON_TIMING(trcd_ps), COMMON_TIMING(trp_ps), COMMON_TIMING(tras_ps), diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 8041922..b7f300e 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -482,7 +482,10 @@ static int m88e1145_config(struct phy_device *phydev) genphy_config_aneg(phydev); - phy_reset(phydev); + /* soft reset */ + reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMCR); + reg |= BMCR_RESET; + phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, reg); return 0; } |