diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-11 12:04:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-11 12:04:54 -0400 |
| commit | bb488ac34d9fbb892d870b0cbeabdbc5dc432653 (patch) | |
| tree | de8154a1242fee7495aa3b108888851d0ee56949 /drivers | |
| parent | 1bccb23b7bb67e029cc6b22bf7d25243ef71c43c (diff) | |
| parent | 42e05704d8c0e84e8d0eb0bb52253adaa7c9eb86 (diff) | |
| download | u-boot-bb488ac34d9fbb892d870b0cbeabdbc5dc432653.tar.gz | |
Merge tag 'ti-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Fix boot issues on Nokia RX-51
- Configure AM6 CPSW for 10Mbps in rgmii mode.
- Minor changes for J721e
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ti/am65-cpsw-nuss.c | 4 | ||||
| -rw-r--r-- | drivers/video/am335x-fb.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index 2b77213001..7531a07203 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -61,6 +61,7 @@ #define AM65_CPSW_MACSL_CTL_REG 0x0 #define AM65_CPSW_MACSL_CTL_REG_IFCTL_A BIT(15) +#define AM65_CPSW_MACSL_CTL_EXT_EN BIT(18) #define AM65_CPSW_MACSL_CTL_REG_GIG BIT(7) #define AM65_CPSW_MACSL_CTL_REG_GMII_EN BIT(5) #define AM65_CPSW_MACSL_CTL_REG_LOOPBACK BIT(1) @@ -187,6 +188,9 @@ static int am65_cpsw_update_link(struct am65_cpsw_priv *priv) AM65_CPSW_MACSL_CTL_REG_GMII_EN; if (phy->speed == 1000) mac_control |= AM65_CPSW_MACSL_CTL_REG_GIG; + if (phy->speed == 10 && phy_interface_is_rgmii(phy)) + /* Can be used with in band mode only */ + mac_control |= AM65_CPSW_MACSL_CTL_EXT_EN; if (phy->duplex == DUPLEX_FULL) mac_control |= AM65_CPSW_MACSL_CTL_REG_FULL_DUPLEX; if (phy->speed == 100) diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c index eb5add2a20..0f066df451 100644 --- a/drivers/video/am335x-fb.c +++ b/drivers/video/am335x-fb.c @@ -13,15 +13,15 @@ */ #include <common.h> #include <dm.h> -#include <asm/io.h> +#include <lcd.h> +#include <video.h> +#include <asm/arch/clock.h> #include <asm/arch/hardware.h> #include <asm/arch/omap.h> -#include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> +#include <asm/io.h> #include <asm/utils.h> #include <linux/err.h> -#include <lcd.h> -#include <video.h> #include "am335x-fb.h" #define LCDC_FMAX 200000000 |