Signed-off-by: Ryan Chen <rchen14b@gmail.com>
--- a/drivers/clk/clk-en7523.c
+++ b/drivers/clk/clk-en7523.c
-@@ -961,9 +961,11 @@ static int en7581_pci_enable(struct clk_
+@@ -960,9 +960,11 @@ static int en7581_pci_enable(struct clk_
struct regmap *map = cg->map;
u32 mask;
regmap_set_bits(map, REG_PCI_CONTROL, mask);
return 0;
-@@ -975,9 +977,8 @@ static void en7581_pci_disable(struct cl
+@@ -974,9 +976,8 @@ static void en7581_pci_disable(struct cl
struct regmap *map = cg->map;
u32 mask;
if (!phydev->drv->led_polarity_set)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -907,8 +907,9 @@ struct phy_plca_status {
+@@ -902,8 +902,9 @@ struct phy_plca_status {
/* Modes for PHY LED configuration */
enum phy_led_modes {
* __phy_read_mmd - Convenience function for reading a register
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -2037,6 +2037,11 @@ extern struct phy_driver genphy_c45_driv
+@@ -2032,6 +2032,11 @@ extern struct phy_driver genphy_c45_driv
/* The gen10g_* functions are the old Clause 45 stub */
int gen10g_config_aneg(struct phy_device *phydev);
}
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -1050,7 +1050,8 @@ struct phy_driver {
+@@ -1045,7 +1045,8 @@ struct phy_driver {
* driver for the given phydev. If NULL, matching is based on
* phy_id and phy_id_mask.
*/
static ssize_t
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -1955,6 +1955,9 @@ char *phy_attached_info_irq(struct phy_d
+@@ -1950,6 +1950,9 @@ char *phy_attached_info_irq(struct phy_d
__malloc;
void phy_attached_info(struct phy_device *phydev);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -1271,9 +1271,13 @@ struct phy_driver {
+@@ -1266,9 +1266,13 @@ struct phy_driver {
#define PHY_ANY_ID "MATCH ANY PHY"
#define PHY_ANY_UID 0xffffffff
/**
* phy_id_compare - compare @id1 with @id2 taking account of @mask
-@@ -1290,6 +1294,19 @@ static inline bool phy_id_compare(u32 id
+@@ -1285,6 +1289,19 @@ static inline bool phy_id_compare(u32 id
}
/**
-LINUX_VERSION-6.12 = .70
-LINUX_KERNEL_HASH-6.12.70 = 9b4ccec7d8ceff4824f149e476ec06e83c86546ae8af82582871647809a62ef0
+LINUX_VERSION-6.12 = .71
+LINUX_KERNEL_HASH-6.12.71 = 143e8bc76cc41f831b51aa5e75819bed55bed41f299d35922820f1d2d2b02600
sysfs_remove_link(&dev->dev.kobj, "phydev");
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -1042,6 +1042,12 @@ struct phy_driver {
+@@ -1037,6 +1037,12 @@ struct phy_driver {
/** @handle_interrupt: Override default interrupt handling */
irqreturn_t (*handle_interrupt)(struct phy_device *phydev);
PHY_INTERFACE_MODE_MAX,
} phy_interface_t;
-@@ -250,6 +251,8 @@ static inline const char *phy_modes(phy_
+@@ -245,6 +246,8 @@ static inline const char *phy_modes(phy_
return "gmii";
case PHY_INTERFACE_MODE_SGMII:
return "sgmii";
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -381,6 +381,7 @@ struct phy_package_shared {
+@@ -376,6 +376,7 @@ struct phy_package_shared {
/* used as bit number in atomic bitops */
#define PHY_SHARED_F_INIT_DONE 0
#define PHY_SHARED_F_PROBE_DONE 1
/**
* struct mii_bus - Represents an MDIO bus
-@@ -2282,6 +2283,11 @@ static inline bool phy_package_probe_onc
+@@ -2277,6 +2278,11 @@ static inline bool phy_package_probe_onc
return __phy_package_set_once(phydev, PHY_SHARED_F_PROBE_DONE);
}
if (phydev->mii_ts && phydev->mii_ts->link_state)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -690,6 +690,7 @@ struct phy_device {
+@@ -685,6 +685,7 @@ struct phy_device {
unsigned downshifted_rate:1;
unsigned is_on_sfp_module:1;
unsigned mac_managed_pm:1;
&phy->mdio.reset_assert_delay);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -316,7 +316,7 @@ static inline const char *phy_modes(phy_
+@@ -311,7 +311,7 @@ static inline const char *phy_modes(phy_
#define PHY_INIT_TIMEOUT 100000
#define PHY_FORCE_TIMEOUT 10
/* Used when trying to connect to a specific phy (mii bus id:phy device id) */
#define PHY_ID_FMT "%s:%02x"
-@@ -436,10 +436,10 @@ struct mii_bus {
+@@ -431,10 +431,10 @@ struct mii_bus {
struct mdio_device *mdio_map[PHY_MAX_ADDR];
/** @phy_mask: PHY addresses to be ignored when probing */