Lan743/6.1 include nvidia specific changes

Updating Lan7431 nvidia-oot driver for kernel 6.1
to include NV specific changes

Include changes from:
    https://git-master.nvidia.com/r/c/linux-nv-oot/+/2924162
    https://git-master.nvidia.com/r/c/linux-nv-oot/+/2932422
for userland phy and SC7 support

Bug 4330040
Bug 4270736

Change-Id: I20e052f24757d0ac17501906b267bc746c3d43d2
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3000975
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Tested-by: Jeremy Alves <jalves@nvidia.com>
Reviewed-by: Jeremy Alves <jalves@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Jeremy Alves
2023-10-19 19:06:06 -07:00
committed by mobile promotions
parent 7cf41996cb
commit b8fca78022
2 changed files with 188 additions and 7 deletions

View File

@@ -1,5 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/* Copyright (C) 2018 Microchip Technology Inc. */
/*
* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
*/
#ifndef _LAN743X_H
#define _LAN743X_H
@@ -914,6 +917,8 @@ struct lan743x_intr {
struct lan743x_phy {
bool fc_autoneg;
u8 fc_request_control;
bool fixed;
u32 mdio_addr;
};
/* TX */
@@ -1009,6 +1014,7 @@ enum lan743x_sgmii_lsd {
struct lan743x_adapter {
struct net_device *netdev;
struct mii_bus *mdiobus;
phy_interface_t phy_mode;
int msg_enable;
#ifdef CONFIG_PM
u32 wolopts;