This series enables the MMC controller in the T-Head TH1520 SoC and enables the eMMC and microSD on both the BeagleV Ahead and the Sipeed LicheePi 4A. The drivers/mmc/host patches from v6 were applied by Ulf and are already in the linux-next [1][2] as well as the bindings patch [3]. Thus v7 was only a defconfig patch and three device tree patches. This v8 is a followup to change the dwcmshc node names to match the documentation. Jisheng - can you apply the dts patches to your for-next tree? I tested with the riscv defconfig on the Ahead [4] and LPi4a [5]. I only tested eMMC and microSD and plan to enable SDIO WiFi in the future. References: [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=49f23745b064cdb6270402403ef58125d78ba183 [2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=aff35fbc7830510ef7cbcf8e32a041a55de3dc51 [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=af076680db846ed54b00b9a763473d1043446993 [4] https://gist.github.com/pdp7/881342620ec1509685f23a387e2fc8d7 [5] https://gist.github.com/pdp7/97017ad88d83fccac18eba69bff817b7 Changes in PATCH v8: - change dwcmshc node labels to match TH1520 System Reference Manual: emmc, sdio0, sdio1 Changes in PATCH v7: //lore.kernel.org/r/20231129-th1520_mmc_dts-v7-0-c77fc19caa6f@xxxxxxxxxxxx - fix sorting of DT properties in the mmc nodes Changes in PATCH v6: https://lore.kernel.org/linux-riscv/20231114-th1520-mmc-v6-0-3273c661a571@xxxxxxxxxxxx/ - set the mmc nodes to disabled in the th1520.dtsi Changes in PATCH v5: https://lore.kernel.org/r/20231109-th1520-mmc-v5-0-018bd039cf17@xxxxxxxxxxxx - fix logic in th1520_sdhci_set_phy() to correctly check that both MMC_CAP2_NO_SD and MMC_CAP2_NO_SDIO are set in host->mmc->caps2 - add Acked-by's from Adrian Changes in PATCH v4: https://lore.kernel.org/linux-riscv/20231101-th1520-mmc-v4-0-86e0216b5994@xxxxxxxxxxxx/ - set DWCMSHC_CARD_IS_EMMC when (MMC_CAP2_NO_SD | MMC_CAP2_NO_SDIO) as checking MMC_CAP_NONREMOVABLE is not sufficient - change prefix of phy functions from th1520 to dwcmshc as they are not th1520 specific - remove unneeded check of priv in dwcmshc_phy_1_8v_init() - remove unneeded check of auto-tuning in th1520_execute_tuning() - fix order of new nodes in th1520-beaglev-ahead.dts: move sdhci_clk before uart_sclk, move mmc0 and mmc1 before uart0 - fix comment typos pointed out by Adrian - add trailers that I missed from v2 Changes in PATCH v3: https://lore.kernel.org/r/20231023-th1520-mmc-v3-0-abc5e7491166@xxxxxxxxxxxx - always call th1520_sdhci_set_phy() in th1520_set_uhs_signaling() and not only when timing is MMC_TIMING_MMC_HS400. This allows the microSD slot to work as th1520_phy_3_3v_init() is called from th1520_sdhci_set_phy(). - add mmc1 node for mmc controller connected to the microSD slot - add enable mmc1 and add properties for microSD on the Ahead and LPi4A Changes in PATCH v2: https://lore.kernel.org/r/20231017-th1520-mmc-v2-0-4678c8cc4048@xxxxxxxxxxxx - make use of BIT(), GENMASK(), FIELD_PREP(), FIELD_GET() - add EXPORT_SYMBOL_GPL(__sdhci_execute_tuning) - call th1520_phy_1_8v_init() when FLAG_IO_FIXED_1V8 is set - set DWCMSHC_CARD_IS_EMMC when mmc caps contains MMC_CAP_NONREMOVABLE - remove manipulation of AT_CTRL_AT_EN from th1520_set_uhs_signaling() - remove unneccessary cycle of enabling and disabling AT_CTRL_AT_EN in th1520_execute_tuning() - remove th1520_phy_1_8v_init_no_pull() - remove th1520_phy_3_3v_init_no_pull() - remove FLAG_PULL_UP_EN from priv->flags - remove thead,phy-pull-up device tree property Changes in PACH v1: https://lore.kernel.org/all/20230921-th1520-mmc-v1-0-49f76c274fb3@xxxxxxxxxxxx/ - ADMA mode now works correctly due to a patch from Jisheng on the list ("riscv: dts: thead: set dma-noncoherent to soc bus") and this commit from Icenowy that is now merged: 8eb8fe67e2c8 ("riscv: errata: fix T-Head dcache.cva encoding"). - Expose __sdhci_execute_tuning from sdhci.c so that it can be called from th1520_execute_tuning() - Refactor the define macros for all the PHY related registers to make it easier to understand the bit fields that the code is manipulating - Replace magic numbers in the PHY register writes with proper defines - Replace non_removable in dwcmshc_priv with check of mmc_host.caps - Drop dt prop "thead,io-fixed-1v8" and instead check for existing properties: "mmc-ddr-1_8v", "mmc-hs200-1_8v", or "mmc-hs400-1_8v" - Rename dt prop from "thead,pull-up" to "thead,phy-pull-up" and improve the description in the dt binding - Replace pull_up_en in dwcmshc_priv with bit field in new flags field - Create th1520_set_uhs_signaling() and call dwcmshc_set_uhs_signaling() from it instead of adding th1520 code to dwcmshc_set_uhs_signaling() - Return -EIO instead of -1 upon errors in th1520_execute_tuning() Changes in RFC v2: https://lore.kernel.org/linux-riscv/20230724-th1520-emmc-v2-0-132ed2e2171e@xxxxxxxxxxxx/ - Expand dwcmshc_priv based on driver in the T-Head 5.10 kernel: delay_line, non_removable, pull_up_en, io_fixed_1v8 - New boolean property "thead,pull-up" indicates phy pull-up config - New boolean property "thead,io-fixed-1v8" indicates that io voltage should be set to 1.8V during reset - Add th1520_phy_1_8v_init() as voltage_switch op - Add th1520_execute_tuning() as the platform_execute_tuning op - Added th1520_sdhci_reset() as the .reset op. This function will set io voltage to 1.8V after calling the standard sdhci_reset() function. - Modified dwcmshc_set_uhs_signaling() to enable SDHCI_CTRL_VDD_180 when io_fixed_1v8 is true - Add many defines for register offsets and settings based on the mmc support in the T-Head downstream v5.10 kernel RFC v1 series: https://lore.kernel.org/r/20230724-th1520-emmc-v1-0-cca1b2533da2@xxxxxxxxxxxx Signed-off-by: Drew Fustini <dfustini@xxxxxxxxxxxx> --- Drew Fustini (4): riscv: defconfig: Enable mmc and dma drivers for T-Head TH1520 riscv: dts: thead: Add TH1520 mmc controllers and sdhci clock riscv: dts: thead: Enable BeagleV Ahead eMMC and microSD riscv: dts: thead: Enable LicheePi 4A eMMC and microSD arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 20 +++++++++++++ .../boot/dts/thead/th1520-lichee-module-4a.dtsi | 20 +++++++++++++ arch/riscv/boot/dts/thead/th1520.dtsi | 34 ++++++++++++++++++++++ arch/riscv/configs/defconfig | 2 ++ 4 files changed, 76 insertions(+) --- base-commit: 1f5c003694fab4b1ba6cbdcc417488b975c088d0 change-id: 20231129-th1520_mmc_dts-e472bcc70d0d Best regards, -- Drew Fustini <dfustini@xxxxxxxxxxxx>
