Skip to content

Commit

Permalink
Refresh patches & fixup packages
Browse files Browse the repository at this point in the history
  • Loading branch information
N-Storm committed Sep 25, 2024
1 parent 0c12b0d commit cde283c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package/kernel/mt76/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PKG_SOURCE_PROTO:=git

PKG_SOURCE_DATE:=2024-09-23
PKG_SOURCE_VERSION:=09ae763c65539f2177430c44a1eb5dcb2b734bdd
PKG_MIRROR_HASH:=771d9992ef837f0c4a58329ed425fb8b00334ab73834216596b3ee9872ab3f79
PKG_MIRROR_HASH:=a68df9981167ccb1731537035f7a48bf481b1f090c9ecf856eda4d931ab545d4

PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_USE_NINJA:=0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>

--- 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

Expand Down Expand Up @@ -45,7 +45,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
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);
}

Expand Down Expand Up @@ -97,7 +97,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
static int aqr_config_intr(struct phy_device *phydev)
{
bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED;
@@ -815,7 +883,7 @@ static struct phy_driver aqr_driver[] =
@@ -848,7 +916,7 @@ static struct phy_driver aqr_driver[] =
PHY_ID_MATCH_MODEL(PHY_ID_AQR112),
.name = "Aquantia AQR112",
.probe = aqr107_probe,
Expand All @@ -106,7 +106,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
.config_intr = aqr_config_intr,
.handle_interrupt = aqr_handle_interrupt,
.get_tunable = aqr107_get_tunable,
@@ -838,7 +906,7 @@ static struct phy_driver aqr_driver[] =
@@ -871,7 +939,7 @@ static struct phy_driver aqr_driver[] =
PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
.name = "Aquantia AQR412",
.probe = aqr107_probe,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>

--- a/drivers/net/phy/aquantia/aquantia_main.c
+++ b/drivers/net/phy/aquantia/aquantia_main.c
@@ -252,10 +252,16 @@ static int aqr_config_aneg_set_prot(stru
@@ -258,10 +258,16 @@ static int aqr_config_aneg_set_prot(stru
phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE,
aquantia_syscfg[if_type].start_rate);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>

--- 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
Expand All @@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>

#define MDIO_PHYXS_VEND_IF_STATUS 0xe812
#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3)
@@ -1022,6 +1024,30 @@ static struct phy_driver aqr_driver[] =
@@ -1055,6 +1057,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,
},
Expand Down Expand Up @@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
};

module_phy_driver(aqr_driver);
@@ -1042,6 +1068,8 @@ static struct mdio_device_id __maybe_unu
@@ -1075,6 +1101,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) },
Expand Down

0 comments on commit cde283c

Please sign in to comment.