kernel: bump 5.15 to 5.15.117

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 346-v5.18-01-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch

diff --git a/target/linux/generic/backport-5.15/346-v5.18-01-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch b/target/linux/generic/backport-5.15/346-v5.18-01-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch
index b254e7c0b3fbcba0c506fa536a0e7c411919222f..f225a2105701945afde0f17ef2b702cfc0e165a2 100644 (file)
--- a/target/linux/generic/backport-5.15/346-v5.18-01-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch
+++ b/target/linux/generic/backport-5.15/346-v5.18-01-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch
@@ -31,13 +31,13 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
 
 --- a/drivers/ata/ahci.h
 +++ b/drivers/ata/ahci.h
-@@ -240,8 +240,6 @@ enum {
-                                                       as default lpm_policy */
-       AHCI_HFLAG_SUSPEND_PHYS         = (1 << 26), /* handle PHYs during
-                                                       suspend/resume */
--      AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = (1 << 27), /* ignore -EOPNOTSUPP
--                                                      from phy_power_on() */
-       AHCI_HFLAG_NO_SXS               = (1 << 28), /* SXS not supported */
+@@ -241,8 +241,6 @@ enum {
+                                                     as default lpm_policy */
+       AHCI_HFLAG_SUSPEND_PHYS         = BIT(26), /* handle PHYs during
+                                                     suspend/resume */
+-      AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = BIT(27), /* ignore -EOPNOTSUPP
+-                                                    from phy_power_on() */
+       AHCI_HFLAG_NO_SXS               = BIT(28), /* SXS not supported */
  
        /* ap->flags bits */
 --- a/drivers/ata/ahci_mvebu.c