Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-17 07:16:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge tag 'fsl-qoriq-2024-2-8' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq

Browse source 
Add TJA1120 driver support
fsl-layerscape/soc.c: do not destroy bootcmd environment
This commit is contained in:
Tom Rini 2024-02-08 09:10:41 -05:00
commit a7fb2f57ad
3 changed files with 45 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/cpu/armv8/fsl-layerscape/soc.c
View file

@ -811,6 +811,8 @@ __weak int fsl_setenv_bootcmd(void)
enum boot_src src = get_boot_src();
char bootcmd_str[MAX_BOOTCMD_SIZE];
bootcmd_str[0] = 0;
switch (src) {
#ifdef IFC_NOR_BOOTCOMMAND
case BOOT_SOURCE_IFC_NOR:
@ -859,6 +861,9 @@ __weak int fsl_setenv_bootcmd(void)
break;
}
if (!bootcmd_str[0])
return 0;
ret = env_set("bootcmd", bootcmd_str);
if (ret) {
printf("Failed to set bootcmd: ret = %d\n", ret);

43
drivers/net/phy/nxp-c45-tja11xx.c
View file

@ -14,6 +14,7 @@
#include <phy.h>
#define PHY_ID_TJA_1103 0x001BB010
#define PHY_ID_TJA_1120 0x001BB031
#define VEND1_DEVICE_CONTROL 0x0040
#define DEVICE_CONTROL_RESET BIT(15)
@ -306,13 +307,35 @@ static int nxp_c45_config(struct phy_device *phydev)
return nxp_c45_start_op(phydev);
}
static int nxp_c45_speed(struct phy_device *phydev)
{
int val;
val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1);
if (val < 0)
return val;
if (val & MDIO_PMA_CTRL1_SPEED100)
phydev->speed = SPEED_100;
else if (val & MDIO_PMA_CTRL1_SPEED1000)
phydev->speed = SPEED_1000;
else
phydev->speed = 0;
return 0;
}
static int nxp_c45_startup(struct phy_device *phydev)
{
u32 reg;
int ret;
reg = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_STAT1);
phydev->link = !!(reg & MDIO_STAT1_LSTATUS);
phydev->speed = SPEED_100;
ret = nxp_c45_speed(phydev);
if (ret < 0)
return ret;
phydev->duplex = DUPLEX_FULL;
return 0;
}
@ -330,11 +353,25 @@ static int nxp_c45_probe(struct phy_device *phydev)
return 0;
}
U_BOOT_PHY_DRIVER(nxp_c45_tja11xx) = {
#define NXP_C45_COMMON_FEATURES (SUPPORTED_TP | \
SUPPORTED_MII)
U_BOOT_PHY_DRIVER(nxp_c45_tja1103) = {
.name = "NXP C45 TJA1103",
.uid = PHY_ID_TJA_1103,
.mask = 0xfffff0,
.features = PHY_100BT1_FEATURES,
.features = NXP_C45_COMMON_FEATURES | SUPPORTED_100baseT_Full,
.probe = &nxp_c45_probe,
.config = &nxp_c45_config,
.startup = &nxp_c45_startup,
.shutdown = &genphy_shutdown,
};
U_BOOT_PHY_DRIVER(nxp_c45_tja1120) = {
.name = "NXP C45 TJA1120",
.uid = PHY_ID_TJA_1120,
.mask = 0xfffff0,
.features = NXP_C45_COMMON_FEATURES | SUPPORTED_1000baseT_Full,
.probe = &nxp_c45_probe,
.config = &nxp_c45_config,
.startup = &nxp_c45_startup,

4
include/phy.h
View file

@ -51,10 +51,6 @@ struct udevice;
PHY_100BT_FEATURES | \
PHY_DEFAULT_FEATURES)
#define PHY_100BT1_FEATURES (SUPPORTED_TP | \
SUPPORTED_MII | \
SUPPORTED_100baseT_Full)
#define PHY_GBIT_FEATURES (PHY_BASIC_FEATURES | \
PHY_1000BT_FEATURES)