mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-22 04:56:15 +00:00
69dd5a788f
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.37 Added: generic/hack-6.6/900-fix-build-to-handle-return-value.patch[1] Manually rebased: generic/pending-6.6/834-ledtrig-libata.patch Removed upstreamed: bcm27xx/patches-6.6/950-0398-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch[2] All other patches automatically rebased. 1. Patch suggested by @DragonBluep to circumvent upstream breakage of kernel 6.6.37 compilation. See comments in https://github.com/openwrt/openwrt/pull/15879 for additional discussion. 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.37&id=1618f7a875ffd916596392fd29880c0429b8af60 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/15879 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
127 lines
4.2 KiB
Diff
127 lines
4.2 KiB
Diff
From c6187bb277ed61836b3dd6da913d2a6d107f93e4 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Bell <jonathan@raspberrypi.com>
|
|
Date: Fri, 9 Feb 2024 13:47:23 +0000
|
|
Subject: [PATCH 0891/1085] drivers: mmc: sdhci-brcmstb: fix usage of
|
|
SD_PIN_SEL on BCM2712
|
|
|
|
The SDIO_CFG register SD_PIN_SEL conflates two settings - whether eMMC
|
|
HS or SD UHS timings are applied to the interface, and whether or not
|
|
the card-detect line is functional. SD_PIN_SEL can only be changed when
|
|
the SD clock isn't running, so add a bcm2712-specific clock setup.
|
|
|
|
Toggling SD_PIN_SEL at runtime means the integrated card-detect feature
|
|
can't be used, so this controller needs a cd-gpios property.
|
|
|
|
Also fix conditionals for usage of the delay-line PHY - no-1-8-v will
|
|
imply no bits set in hsemmc_mask or uhs_mask, so remove it.
|
|
|
|
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|
---
|
|
drivers/mmc/host/sdhci-brcmstb.c | 61 ++++++++++++++++++++++----------
|
|
1 file changed, 43 insertions(+), 18 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/sdhci-brcmstb.c
|
|
+++ b/drivers/mmc/host/sdhci-brcmstb.c
|
|
@@ -39,7 +39,8 @@
|
|
|
|
#define SDIO_CFG_SD_PIN_SEL 0x44
|
|
#define SDIO_CFG_SD_PIN_SEL_MASK 0x3
|
|
-#define SDIO_CFG_SD_PIN_SEL_CARD BIT(1)
|
|
+#define SDIO_CFG_SD_PIN_SEL_SD BIT(1)
|
|
+#define SDIO_CFG_SD_PIN_SEL_MMC BIT(0)
|
|
|
|
#define SDIO_CFG_MAX_50MHZ_MODE 0x1ac
|
|
#define SDIO_CFG_MAX_50MHZ_MODE_STRAP_OVERRIDE BIT(31)
|
|
@@ -103,6 +104,42 @@ static void sdhci_brcmstb_hs400es(struct
|
|
writel(reg, host->ioaddr + SDHCI_VENDOR);
|
|
}
|
|
|
|
+static void sdhci_bcm2712_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
+{
|
|
+ u16 clk;
|
|
+ u32 reg;
|
|
+ bool is_emmc_rate = false;
|
|
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
+ struct sdhci_brcmstb_priv *brcmstb_priv = sdhci_pltfm_priv(pltfm_host);
|
|
+
|
|
+ host->mmc->actual_clock = 0;
|
|
+
|
|
+ sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
|
|
+
|
|
+ switch (host->mmc->ios.timing) {
|
|
+ case MMC_TIMING_MMC_HS400:
|
|
+ case MMC_TIMING_MMC_HS200:
|
|
+ case MMC_TIMING_MMC_DDR52:
|
|
+ case MMC_TIMING_MMC_HS:
|
|
+ is_emmc_rate = true;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ reg = readl(brcmstb_priv->cfg_regs + SDIO_CFG_SD_PIN_SEL);
|
|
+ reg &= ~SDIO_CFG_SD_PIN_SEL_MASK;
|
|
+ if (is_emmc_rate)
|
|
+ reg |= SDIO_CFG_SD_PIN_SEL_MMC;
|
|
+ else
|
|
+ reg |= SDIO_CFG_SD_PIN_SEL_SD;
|
|
+ writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_SD_PIN_SEL);
|
|
+
|
|
+ if (clock == 0)
|
|
+ return;
|
|
+
|
|
+ clk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock);
|
|
+ sdhci_enable_clk(host, clk);
|
|
+}
|
|
+
|
|
static void sdhci_brcmstb_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
{
|
|
u16 clk;
|
|
@@ -162,22 +199,16 @@ static void sdhci_brcmstb_cfginit_2712(s
|
|
{
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_brcmstb_priv *brcmstb_priv = sdhci_pltfm_priv(pltfm_host);
|
|
- bool want_dll = false;
|
|
u32 uhs_mask = (MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104);
|
|
u32 hsemmc_mask = (MMC_CAP2_HS200_1_8V_SDR | MMC_CAP2_HS200_1_2V_SDR |
|
|
MMC_CAP2_HS400_1_8V | MMC_CAP2_HS400_1_2V);
|
|
u32 reg;
|
|
|
|
- if (!(host->quirks2 & SDHCI_QUIRK2_NO_1_8_V)) {
|
|
- if((host->mmc->caps & uhs_mask) || (host->mmc->caps2 & hsemmc_mask))
|
|
- want_dll = true;
|
|
- }
|
|
-
|
|
/*
|
|
- * If we want a speed that requires tuning,
|
|
- * then select the delay line PHY as the clock source.
|
|
- */
|
|
- if (want_dll) {
|
|
+ * If we support a speed that requires tuning,
|
|
+ * then select the delay line PHY as the clock source.
|
|
+ */
|
|
+ if ((host->mmc->caps & uhs_mask) || (host->mmc->caps2 & hsemmc_mask)) {
|
|
reg = readl(brcmstb_priv->cfg_regs + SDIO_CFG_MAX_50MHZ_MODE);
|
|
reg &= ~SDIO_CFG_MAX_50MHZ_MODE_ENABLE;
|
|
reg |= SDIO_CFG_MAX_50MHZ_MODE_STRAP_OVERRIDE;
|
|
@@ -191,12 +222,6 @@ static void sdhci_brcmstb_cfginit_2712(s
|
|
reg &= ~SDIO_CFG_CTRL_SDCD_N_TEST_LEV;
|
|
reg |= SDIO_CFG_CTRL_SDCD_N_TEST_EN;
|
|
writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_CTRL);
|
|
- } else {
|
|
- /* Enable card detection line */
|
|
- reg = readl(brcmstb_priv->cfg_regs + SDIO_CFG_SD_PIN_SEL);
|
|
- reg &= ~SDIO_CFG_SD_PIN_SEL_MASK;
|
|
- reg |= SDIO_CFG_SD_PIN_SEL_CARD;
|
|
- writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_SD_PIN_SEL);
|
|
}
|
|
}
|
|
|
|
@@ -331,7 +356,7 @@ static struct sdhci_ops sdhci_brcmstb_op
|
|
};
|
|
|
|
static struct sdhci_ops sdhci_brcmstb_ops_2712 = {
|
|
- .set_clock = sdhci_set_clock,
|
|
+ .set_clock = sdhci_bcm2712_set_clock,
|
|
.set_power = sdhci_brcmstb_set_power,
|
|
.set_bus_width = sdhci_set_bus_width,
|
|
.reset = sdhci_reset,
|