-
Notifications
You must be signed in to change notification settings - Fork 19.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3a4c500
commit ce88975
Showing
9 changed files
with
30 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.6 = .57 | ||
LINUX_KERNEL_HASH-6.6.57 = 66ce426ef96f99b8e1ef7ac72e780c730ef8b970f7aa5708501c4274d7abb7b3 | ||
LINUX_VERSION-6.6 = .58 | ||
LINUX_KERNEL_HASH-6.6.58 = e7df81e588d70fab5ec3ec3bb04ac53d51f0860fc3b1ec45e0a4167a026899db |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,8 +64,8 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
#define MDIO_AN_RX_LP_STAT1 0xe820 | ||
#define MDIO_AN_RX_LP_STAT1_1000BASET_FULL BIT(15) | ||
#define MDIO_AN_RX_LP_STAT1_1000BASET_HALF BIT(14) | ||
@@ -497,6 +503,29 @@ static int aqr107_wait_processor_intensi | ||
return 0; | ||
@@ -473,6 +479,29 @@ static void aqr107_chip_info(struct phy_ | ||
fw_major, fw_minor, build_id, prov_id); | ||
} | ||
|
||
+static int aqr107_config_mdi(struct phy_device *phydev) | ||
|
@@ -94,7 +94,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
static int aqr107_config_init(struct phy_device *phydev) | ||
{ | ||
struct aqr107_priv *priv = phydev->priv; | ||
@@ -535,6 +564,10 @@ static int aqr107_config_init(struct phy | ||
@@ -502,6 +531,10 @@ static int aqr107_config_init(struct phy | ||
if (ret) | ||
return ret; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
|
||
--- a/drivers/net/phy/aquantia/aquantia_main.c | ||
+++ b/drivers/net/phy/aquantia/aquantia_main.c | ||
@@ -512,7 +512,7 @@ static int aqr107_config_mdi(struct phy_ | ||
@@ -488,7 +488,7 @@ static int aqr107_config_mdi(struct phy_ | ||
ret = of_property_read_u32(np, "marvell,mdi-cfg-order", &mdi_conf); | ||
|
||
/* Do nothing in case property "marvell,mdi-cfg-order" is not present */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ Signed-off-by: Alex Marginean <[email protected]> | |
|
||
--- a/drivers/net/phy/aquantia/aquantia_main.c | ||
+++ b/drivers/net/phy/aquantia/aquantia_main.c | ||
@@ -90,6 +90,29 @@ | ||
@@ -96,6 +96,29 @@ | ||
#define AQR107_OP_IN_PROG_SLEEP 1000 | ||
#define AQR107_OP_IN_PROG_TIMEOUT 100000 | ||
|
||
|
@@ -45,7 +45,7 @@ Signed-off-by: Alex Marginean <[email protected]> | |
static int aqr107_get_sset_count(struct phy_device *phydev) | ||
{ | ||
return AQR107_SGMII_STAT_SZ; | ||
@@ -196,6 +219,51 @@ static int aqr_config_aneg(struct phy_de | ||
@@ -202,6 +225,51 @@ static int aqr_config_aneg(struct phy_de | ||
return genphy_c45_check_and_restart_aneg(phydev, changed); | ||
} | ||
|
||
|
@@ -97,7 +97,7 @@ Signed-off-by: Alex Marginean <[email protected]> | |
static int aqr_config_intr(struct phy_device *phydev) | ||
{ | ||
bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED; | ||
@@ -806,7 +874,7 @@ static struct phy_driver aqr_driver[] = | ||
@@ -839,7 +907,7 @@ static struct phy_driver aqr_driver[] = | ||
PHY_ID_MATCH_MODEL(PHY_ID_AQR112), | ||
.name = "Aquantia AQR112", | ||
.probe = aqr107_probe, | ||
|
@@ -106,7 +106,7 @@ Signed-off-by: Alex Marginean <[email protected]> | |
.config_intr = aqr_config_intr, | ||
.handle_interrupt = aqr_handle_interrupt, | ||
.get_tunable = aqr107_get_tunable, | ||
@@ -829,7 +897,7 @@ static struct phy_driver aqr_driver[] = | ||
@@ -862,7 +930,7 @@ static struct phy_driver aqr_driver[] = | ||
PHY_ID_MATCH_MODEL(PHY_ID_AQR412), | ||
.name = "Aquantia AQR412", | ||
.probe = aqr107_probe, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
|
||
--- a/drivers/net/phy/aquantia/aquantia_main.c | ||
+++ b/drivers/net/phy/aquantia/aquantia_main.c | ||
@@ -30,6 +30,8 @@ | ||
@@ -31,6 +31,8 @@ | ||
#define PHY_ID_AQR113C 0x31c31c12 | ||
#define PHY_ID_AQR114C 0x31c31c22 | ||
#define PHY_ID_AQR813 0x31c31cb2 | ||
|
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
|
||
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812 | ||
#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) | ||
@@ -1013,6 +1015,30 @@ static struct phy_driver aqr_driver[] = | ||
@@ -1046,6 +1048,30 @@ static struct phy_driver aqr_driver[] = | ||
.led_hw_control_get = aqr_phy_led_hw_control_get, | ||
.led_polarity_set = aqr_phy_led_polarity_set, | ||
}, | ||
|
@@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
}; | ||
|
||
module_phy_driver(aqr_driver); | ||
@@ -1033,6 +1059,8 @@ static struct mdio_device_id __maybe_unu | ||
@@ -1066,6 +1092,8 @@ static struct mdio_device_id __maybe_unu | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR113C) }, | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR114C) }, | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR813) }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,7 +49,7 @@ Reviewed-by: Russell King (Oracle) <[email protected]> | |
|
||
--- a/drivers/net/phy/aquantia/aquantia_main.c | ||
+++ b/drivers/net/phy/aquantia/aquantia_main.c | ||
@@ -477,7 +477,7 @@ static int aqr107_config_init(struct phy | ||
@@ -506,7 +506,7 @@ static int aqr107_config_init(struct phy | ||
{ | ||
struct aqr107_priv *priv = phydev->priv; | ||
u32 led_active_low; | ||
|
@@ -58,7 +58,7 @@ Reviewed-by: Russell King (Oracle) <[email protected]> | |
|
||
/* Check that the PHY interface type is compatible */ | ||
if (phydev->interface != PHY_INTERFACE_MODE_SGMII && | ||
@@ -504,10 +504,9 @@ static int aqr107_config_init(struct phy | ||
@@ -537,10 +537,9 @@ static int aqr107_config_init(struct phy | ||
|
||
/* Restore LED polarity state after reset */ | ||
for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters