diff options
author | Tom Rini <trini@konsulko.com> | 2016-11-25 22:39:54 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-11-25 22:39:54 (GMT) |
commit | ed77ccd014b4073c4d282028cfb22f8d1742fec1 (patch) | |
tree | 0d3cf0fd0e45bf10c7897a24f3560589f7740e20 /drivers | |
parent | 136179bec19f4bc84227cba138214ea392a723ea (diff) | |
parent | 020198b0c7d251cf6bde76024ecf0ee711860534 (diff) | |
download | u-boot-ed77ccd014b4073c4d282028cfb22f8d1742fec1.tar.xz |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ldpaa_eth/ldpaa_eth.c | 3 | ||||
-rw-r--r-- | drivers/serial/serial_lpuart.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 75b2b6b..4e61700 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -420,13 +420,14 @@ static int ldpaa_eth_open(struct eth_device *net_dev, bd_t *bd) goto err_dpmac_setup; #ifdef CONFIG_PHYLIB - if (priv->phydev) + if (priv->phydev) { err = phy_startup(priv->phydev); if (err) { printf("%s: Could not initialize\n", priv->phydev->dev->name); goto err_dpamc_bind; } + } #else priv->phydev = (struct phy_device *)malloc(sizeof(struct phy_device)); memset(priv->phydev, 0, sizeof(struct phy_device)); diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 042e9a2..beb4243 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -170,9 +170,14 @@ static int lpuart_serial_probe(struct udevice *dev) } #else +u32 __weak get_lpuart_clk(void) +{ + return CONFIG_SYS_CLK_FREQ; +} + static void _lpuart32_serial_setbrg(struct lpuart_fsl *base, int baudrate) { - u32 clk = CONFIG_SYS_CLK_FREQ; + u32 clk = get_lpuart_clk(); u32 sbr; sbr = (clk / (16 * baudrate)); |