kernel: qca-ssdk: update to 12.4

[openwrt/openwrt.git] / package / kernel / qca-ssdk / patches / 0002-qca807x-add-a-LED-quirk-for-Xiaomi-AX3600.patch

diff --git a/package/kernel/qca-ssdk/patches/0002-qca807x-add-a-LED-quirk-for-Xiaomi-AX3600.patch b/package/kernel/qca-ssdk/patches/0002-qca807x-add-a-LED-quirk-for-Xiaomi-AX3600.patch
index 9d456b23990b67b9051997f4e22107d99696aec0..cfbb6cc771351e56477d8c7223e7d5205d851232 100644 (file)
--- a/package/kernel/qca-ssdk/patches/0002-qca807x-add-a-LED-quirk-for-Xiaomi-AX3600.patch
+++ b/package/kernel/qca-ssdk/patches/0002-qca807x-add-a-LED-quirk-for-Xiaomi-AX3600.patch
@@ -1,7 +1,7 @@
-From a750e569aeb4f7b454dbde18cd6d0f2bb1875dfa Mon Sep 17 00:00:00 2001
+From 957ee476ddec289973e0af07917da7bfee660af0 Mon Sep 17 00:00:00 2001
 From: Robert Marko <robimarko@gmail.com>
-Date: Wed, 26 Jan 2022 14:47:33 +0100
-Subject: [PATCH 2/2] qca807x: add a LED quirk for Xiaomi AX3600
+Date: Tue, 7 Nov 2023 12:24:17 +0100
+Subject: [PATCH 2/3] qca807x: add a LED quirk for Xiaomi AX3600
 
 AX3600 requires the same LED quirk so that PHY LED-s will blink even
 once Linux resets the PHY.
@@ -15,15 +15,15 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
 
 --- a/src/hsl/phy/malibu_phy.c
 +++ b/src/hsl/phy/malibu_phy.c
-@@ -2718,8 +2718,9 @@ malibu_phy_hw_init(a_uint32_t dev_id, a_
-                       led_status |= MALIBU_LED_1000_CTRL1_100_10_MASK;
-                       malibu_phy_mmd_write(dev_id, phy_addr, MALIBU_PHY_MMD7_NUM,
-                               MALIBU_PHY_MMD7_LED_1000_CTRL1, led_status);
+@@ -1811,8 +1811,9 @@ malibu_phy_hw_init(a_uint32_t dev_id, a_
+                       hsl_phy_modify_mmd(dev_id, phy_addr, A_FALSE, MALIBU_PHY_MMD7_NUM,
+                               MALIBU_PHY_MMD7_LED_1000_CTRL1, MALIBU_LED_1000_CTRL1_100_10_MASK,
+                               MALIBU_LED_1000_CTRL1_100_10_MASK);
 -                      if (of_machine_is_compatible("xiaomi,ax9000")) {
 -                              /* add 1000M link LED behavior for Xiaomi AX9000 */
-+                      /* add 1000M link LED behavior for Xiaomi boards */
 +                      if (of_machine_is_compatible("xiaomi,ax9000") ||
 +                          of_machine_is_compatible("xiaomi,ax3600")) {
-                               led_status = malibu_phy_mmd_read(dev_id, phy_addr, MALIBU_PHY_MMD7_NUM,
-                                       MALIBU_PHY_MMD7_LED_100_CTRL1);
-                               led_status &= ~MALIBU_LED_100_CTRL1_1000_MASK;
++                              /* add 1000M link LED behavior for Xiaomi boards */
+                               hsl_phy_modify_mmd(dev_id, phy_addr, A_FALSE, MALIBU_PHY_MMD7_NUM,
+                                                  MALIBU_PHY_MMD7_LED_100_CTRL1,
+                                                  MALIBU_LED_100_CTRL1_1000_MASK,