diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
| commit | 1c4b5038afcc7cdb1064713f65571da05aa0de0e (patch) | |
| tree | bbb554b1128dc15453a91fc50408446da2e0ddd2 /drivers/net/tsec.c | |
| parent | 7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (diff) | |
| parent | 21fc5a16855602b2fd4b39e40679f854101a0fa3 (diff) | |
Merge branch '2020-07-17-misc-fixes'
A large number of assorted fixes, including but not limited to:
- Correct fixdep and CONFIG_IS_ENABLED(...)
- lz4 on big endian
- Assorted LMB hardening
- Remove bd_t typedef
Diffstat (limited to 'drivers/net/tsec.c')
| -rw-r--r-- | drivers/net/tsec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 3d75acb6b4e..5d12e4b7755 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -554,7 +554,7 @@ static void startup_tsec(struct tsec_private *priv) * This allows U-Boot to find the first active controller. */ #ifndef CONFIG_DM_ETH -static int tsec_init(struct eth_device *dev, bd_t *bd) +static int tsec_init(struct eth_device *dev, struct bd_info *bd) #else static int tsec_init(struct udevice *dev) #endif @@ -701,7 +701,8 @@ static int init_phy(struct tsec_private *priv) * Initialize device structure. Returns success if PHY * initialization succeeded (i.e. if it recognizes the PHY) */ -static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info) +static int tsec_initialize(struct bd_info *bis, + struct tsec_info_struct *tsec_info) { struct tsec_private *priv; struct eth_device *dev; @@ -760,7 +761,8 @@ static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info) * * Returns the number of TSEC devices that were initialized */ -int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsecs, int num) +int tsec_eth_init(struct bd_info *bis, struct tsec_info_struct *tsecs, + int num) { int i; int count = 0; @@ -775,7 +777,7 @@ int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsecs, int num) return count; } -int tsec_standard_init(bd_t *bis) +int tsec_standard_init(struct bd_info *bis) { struct fsl_pq_mdio_info info; |