mmc: Merge branch fixes into next

Merge the mmc fixes for v6.12-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.13.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --cc drivers/mmc/host/sdhci-pci-gli.c
index cf2486e,68ce492..4c2ae71
--- 1/drivers/mmc/host/sdhci-pci-gli.c
--- 2/drivers/mmc/host/sdhci-pci-gli.c
+++ b/drivers/mmc/host/sdhci-pci-gli.c
@@@ -1191,39 -934,9 +1203,34 @@@ static void sdhci_gl9767_set_clock(stru
        }
  
        sdhci_enable_clk(host, clk);
- 
-       pci_read_config_dword(pdev, PCIE_GLI_9767_CFG, &value);
-       value &= ~PCIE_GLI_9767_CFG_LOW_PWR_OFF;
-       pci_write_config_dword(pdev, PCIE_GLI_9767_CFG, value);
- 
-       gl9767_vhs_read(pdev);
+       gl9767_set_low_power_negotiation(pdev, true);
  }
  
 +static void sdhci_gl9767_set_card_detect_debounce_time(struct sdhci_host *host)
 +{
 +      u32 value;
 +
 +      value = sdhci_readl(host, SDHCI_GLI_9767_SD_HOST_OPERATION_CTL);
 +      value &= ~(SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE |
 +                 SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE);
 +      if (sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)
 +              value |= FIELD_PREP(SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE,
 +                                  SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_PLUG_IN_VALUE) |
 +                       FIELD_PREP(SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE,
 +                                  SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE_1MS);
 +      else
 +              value |= FIELD_PREP(SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE,
 +                                  SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_PLUG_OUT_VALUE) |
 +                       FIELD_PREP(SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE,
 +                                  SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE_10MS);
 +      sdhci_writel(host, value, SDHCI_GLI_9767_SD_HOST_OPERATION_CTL);
 +}
 +
 +static void sdhci_gl9767_card_event(struct sdhci_host *host)
 +{
 +      sdhci_gl9767_set_card_detect_debounce_time(host);
 +}
 +
  static void gli_set_9767(struct sdhci_host *host)
  {
        u32 value;