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

Merge branch '2023-02-17-assorted-fixes'

Browse source 
- avb_verify bugfix, and cpsw_mdio bugfix
This commit is contained in:
Tom Rini 2023-02-17 14:18:46 -05:00
commit 1198b38ba9
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/avb_verify.c
View file

@ -619,10 +619,11 @@ static int get_open_session(struct AvbOpsData *ops_data)
memset(&arg, 0, sizeof(arg));
tee_optee_ta_uuid_to_octets(arg.uuid, &uuid);
rc = tee_open_session(tee, &arg, 0, NULL);
if (!rc) {
ops_data->tee = tee;
ops_data->session = arg.session;
}
if (rc || arg.ret)
continue;
ops_data->tee = tee;
ops_data->session = arg.session;
}
return 0;

6
drivers/net/ti/cpsw_mdio.c
View file

@ -51,7 +51,7 @@ struct cpsw_mdio_regs {
#define USERACCESS_PHY_REG_SHIFT (21)
#define USERACCESS_PHY_ADDR_SHIFT (16)
#define USERACCESS_DATA GENMASK(15, 0)
} user[0];
} user[2];
};
#define CPSW_MDIO_DIV_DEF 0xff
@ -366,8 +366,8 @@ u32 cpsw_mdio_get_alive(struct mii_dev *bus)
struct cpsw_mdio *mdio = bus->priv;
u32 val;
val = readl(&mdio->regs->control);
return val & GENMASK(15, 0);
val = readl(&mdio->regs->alive);
return val & GENMASK(7, 0);
}
struct mii_dev *cpsw_mdio_init(const char *name, phys_addr_t mdio_base,