spacemit mmc driver
Subsystems (4)
v3 cover spacemit mmc driver
This series adds MMC support for the SpacemiT K1: an SDHCI platform driver, the SD card device-tree overlay, defconfig options, and SPL boot-device selection from the SoC strap/config registers. The SDHCI driver is usable in both SPL and U-Boot proper.
A flashing guide (doc/board/spacemit/k1-flash.rst) describes how to write images to eMMC.
This series sits on top of three series still under review, and must be applied after them, in this order:
1. K1 clock/reset/dts migration [1] (8 patches)
2. K1 SPL bring-up v4 [2] (14 patches)
3. K1 pinctrl/GPIO and SPI NOR v2 [3] (9 patches)
Then this series (9 patches)
For each series:
b4 am <cover-msgid>
git am ./*.mbx
---
Changes in v3:
- pinctrl: Fix "fast" by "uhs".
- pinctrl: Add syscon dependency.
- mmc: Fix quick by capability.
- doc: Add SD boot support.
- Link to v2: https://lore.kernel.org/u-boot/[email protected]/T/#m2aba875a2696a7bb9b704618d22ae2fd7f7f5acc
Changes in v2:
- cmd: drop patches on eminfo & tlv_eeprom.
- configs: Enable ADMA and SYSCON support.
- dts: Use vmmc-supply as vqmmc-supply on the SD card node.
- mmc: k1: Enable ADMA mode support, use CMD23 for multi-block
read/write, correct pinctrl state from "fast" to "uhs".
- mmc: sdhci: Add new quirk patch to enable CMD23 for multi-block
transfers.
- pinctrl: k1: Add new IO power domain configuration support for
dual-voltage GPIO banks.
- spacemit: k1: Use FIELD_GET() to parse boot strap mode.
- Link to v1: https://lore.kernel.org/u-boot/[email protected]/
To: [email protected]
To: [email protected]
---
Eric Chung (9):
spacemit: k1: select boot device via config registers
pinctrl: k1: add IO power domain configuration support
mmc: sdhci: enable CMD23 for multi-block transfers
mmc: k1: add sdhci platform driver
dts: k1: add SD card support in u-boot overlay
configs: k1: enable SD and eMMC support
doc: spacemit: flash on K1 SoC based boards
config: k1: enable ENV support for eMMC
spacemit: k1: load product name from environment variable
arch/riscv/dts/k1-bananapi-f3-u-boot.dtsi | 87 +++- arch/riscv/dts/k1-musepi-pro-u-boot.dtsi | 82 +++- board/spacemit/k1/MAINTAINERS | 3 +- board/spacemit/k1/spl.c | 120 ++++-- configs/spacemit_k1_defconfig | 26 +- doc/board/spacemit/index.rst | 1 + doc/board/spacemit/k1-mmc.rst | 320 ++++++++++++++ drivers/mmc/Kconfig | 7 + drivers/mmc/Makefile | 1 + drivers/mmc/mmc.c | 18 +- drivers/mmc/spacemit_sdhci.c | 680 ++++++++++++++++++++++++++++++ drivers/pinctrl/spacemit/Kconfig | 2 +- drivers/pinctrl/spacemit/pinctrl-k1.c | 83 +++- include/mmc.h | 6 +- 14 files changed, 1381 insertions(+), 55 deletions(-)
---
base-commit: e7a6b33b153be98fcca16729e189f90c2d91a98c
change-id: 20260629-m4-98e01659fefb
Best regards,
Signature · 1 line
Eric Chung <[email protected]>
PATCH v3 1/9 spacemit: k1: select boot device via config registers
Add logic to determine the current boot device by reading the SoC's configuration registers, rather than using a hardcoded default.
---
v2:
- Use FIELD_GET() to parse boot strap mode.
- Remove comments on hacking. Since the sequence between eMMC and SD device is exchanged in the upstream DTS. So it isn't a hacking any more.
--- board/spacemit/k1/spl.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-)
board/spacemit/k1/spl.c +68 -1
@@ -13,6 +13,7 @@#include <dm/device.h> #include <dm/uclass.h> #include <i2c.h> +#include <linux/bitfield.h> #include <linux/delay.h> #include <log.h> #include <power/regulator.h>
@@ -21,6 +22,17 @@#include <tlv_eeprom.h> #include "tlv_codes.h" +/* boot mode configs */ +#define BOOT_DEV_FLAG_REG 0xd4282d10 +#define BOOT_PIN_SEL_REG 0xd4282c20 + +#define BOOT_STRAP_MODE_OFFSET 9 +#define BOOT_STRAP_MODE_MASK 3 +#define BOOT_STRAP_MODE_EMMC 0 +#define BOOT_STRAP_MODE_SPI 1 +#define BOOT_STRAP_MODE_NAND 2 +#define BOOT_STRAP_MODE_SD 3 +#define MUX_MODE4 4#define EDGE_NONE BIT(6)#define PULL_UP (6 << 13)/* bit[15:13] 110 */
@@ -45,6 +57,17 @@ typedef void (*puts_func_t)(const char *s);typedef int (*ddr_init_func_t )(u64 ddr_base,u32 cs_num,u32 data_rate,puts_func_t puts); +enum board_boot_mode { +BOOT_MODE_NONE =0 , +BOOT_MODE_USB =0x55a , +BOOT_MODE_EMMC , +BOOT_MODE_NAND , +BOOT_MODE_SPI , +BOOT_MODE_SD , +BOOT_MODE_SHELL =0x55f , +BOOT_MODE_BOOTSTRAP , +}; +struct ddr_cfg {u32 data_rate;u32 cs_num;
@@ -379,7 +402,51 @@ void board_init_f(ulong dummy)u32 spl_boot_device (void ) { -return BOOT_DEVICE_SPI ; +void __iomem *boot_dev = (void __iomem *)BOOT_DEV_FLAG_REG ; +void __iomem *boot_strap = (void __iomem *)BOOT_PIN_SEL_REG ; +u32 mode, sel, ret =0 ; + + mode =readl (boot_dev); +if (mode ==BOOT_MODE_NONE || mode >BOOT_MODE_SD ) { + sel =FIELD_GET (BOOT_STRAP_MODE_MASK <<BOOT_STRAP_MODE_OFFSET , +readl (boot_strap)); +switch (sel) { +case BOOT_STRAP_MODE_EMMC : + mode =BOOT_MODE_EMMC ; +break ; +case BOOT_STRAP_MODE_NAND : + mode =BOOT_MODE_NAND ; +break ; +case BOOT_STRAP_MODE_SPI : + mode =BOOT_MODE_SPI ; +break ; +case BOOT_STRAP_MODE_SD : +default : + mode =BOOT_MODE_SD ; +break ; + } + } +switch (mode) { +case BOOT_MODE_EMMC : + ret =BOOT_DEVICE_MMC1 ; +break ; +case BOOT_MODE_NAND : + ret =BOOT_DEVICE_NAND ; +break ; +case BOOT_MODE_SPI : + ret =BOOT_DEVICE_SPI ; +break ; +case BOOT_MODE_USB : + ret =BOOT_DEVICE_USB ; +break ; +case BOOT_MODE_SD : + ret =BOOT_DEVICE_MMC2 ; +break ; +default : + ret =BOOT_DEVICE_MMC1 ; +break ; + } +return ret; }void spl_board_init (void )
Signature · 1 line
2.51.0
PATCH v3 2/9 pinctrl: k1: add IO power domain configuration support
In reply to Eric ChungDual-voltage GPIO banks default to 3.3V, but when externally supplied with 1.8V the internal logic must be explicitly reconfigured to match.
Add the ability to program IO power domain control registers through the APBC block. These registers require unlocking the AIB Secure Access Register (ASAR) before every read/write, since configuring a 1.8V domain while 3.3V is externally supplied can cause back-powering and pin damage.
---
v3:
- Add SYSCON dependency in Kconfig.
- Fix not sorted issue in the driver.
--- drivers/pinctrl/spacemit/Kconfig | 2 +- drivers/pinctrl/spacemit/pinctrl-k1.c | 83 ++++++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 3 deletions(-)
drivers/pinctrl/spacemit/Kconfig +1 -1
@@ -1,6 +1,6 @@ config PINCTRL_SPACEMIT_K1 bool "Spacemit K1 SoC pinctrl driver" - depends on PINCTRL_GENERIC && DM + depends on PINCTRL_GENERIC && DM && SYSCON help Supports pin multiplexing control on Spacemit K1 SoCs.
drivers/pinctrl/spacemit/pinctrl-k1.c +81 -2
137 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v3 3/9 mmc: sdhci: enable CMD23 for multi-block transfers
In reply to Eric ChungEnable the host controller's support for the CMD23 (SET_BLOCK_COUNT) command to manage multi-block read/write operations. This allows the MMC core to use CMD23 in preference to the legacy CMD18/CMD25 plus CMD12 sequence, reducing command overhead and improving I/O performance on multi-block transfers.
---
v3:
- Avoid to use quirk to enable CMD23. Use capability instead.
--- drivers/mmc/mmc.c | 18 ++++++++++++++---- include/mmc.h | 6 +++++- 2 files changed, 19 insertions(+), 5 deletions(-)
drivers/mmc/mmc.c +14 -4
@@ -461,6 +461,14 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,struct mmc_cmd cmd;struct mmc_data data; +if (mmc->host_caps &MMC_CAP_CMD23 ) { + cmd.cmdidx =MMC_CMD_SET_BLOCK_COUNT ; + cmd.cmdarg = blkcnt &0x0000ffff ; + cmd.resp_type =MMC_RSP_R1 ; +if (mmc_send_cmd (mmc, &cmd,NULL )) +return 0 ; + } +if (blkcnt >1 ) cmd.cmdidx =MMC_CMD_READ_MULTIPLE_BLOCK ;else
@@ -481,7 +489,7 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,if (mmc_send_cmd (mmc, &cmd, &data))return 0 ; -if (blkcnt >1 ) { +if (blkcnt >1 && !(mmc->host_caps &MMC_CAP_CMD23 )) {if (mmc_send_stop_transmission (mmc, false)) {#if !defined(CONFIG_XPL_BUILD ) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT )log_err ("mmc fail to send stop cmd\n" );
@@ -1436,6 +1444,8 @@ static int sd_get_capabilities(struct mmc *mmc)if (mmc->scr[0 ] &SD_DATA_4BIT ) mmc->card_caps |=MMC_MODE_4BIT ; +if (!(mmc->scr[0 ] &SD_SCR_CMD23_SUPPORT )) + mmc->host_caps &= ~MMC_CAP_CMD23 ;/* Version 1.0 doesn't support switching */ if (mmc->version ==SD_VERSION_1_0 )
@@ -2963,9 +2973,9 @@ int mmc_get_op_cond(struct mmc *mmc, bool quiet)return err;#ifdef CONFIG_MMC_QUIRKS - mmc->quirks =MMC_QUIRK_RETRY_SET_BLOCKLEN | -MMC_QUIRK_RETRY_SEND_CID | -MMC_QUIRK_RETRY_APP_CMD ; + mmc->quirks |=MMC_QUIRK_RETRY_SET_BLOCKLEN | +MMC_QUIRK_RETRY_SEND_CID | +MMC_QUIRK_RETRY_APP_CMD ;#endif err =mmc_power_cycle (mmc);
include/mmc.h +5 -1
@@ -67,6 +67,7 @@ struct bd_info;#define MMC_CAP_NONREMOVABLE BIT(14)#define MMC_CAP_NEEDS_POLL BIT(15)#define MMC_CAP_CD_ACTIVE_HIGH BIT(16) +#define MMC_CAP_CMD23 BIT(17)#define MMC_MODE_8BIT BIT(30)#define MMC_MODE_4BIT BIT(29)
@@ -141,6 +142,8 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx)#define SD_HIGHSPEED_BUSY 0x00020000#define SD_HIGHSPEED_SUPPORTED 0x00020000 +#define SD_SCR_CMD23_SUPPORT BIT(1) +#define UHS_SDR12_BUS_SPEED 0#define HIGH_SPEED_BUS_SPEED 1#define UHS_SDR25_BUS_SPEED 1
@@ -343,7 +346,8 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx)#define MMC_QUIRK_RETRY_SEND_CID BIT(0)#define MMC_QUIRK_RETRY_SET_BLOCKLEN BIT(1) -#define MMC_QUIRK_RETRY_APP_CMD BIT(2) +#define MMC_QUIRK_RETRY_APP_CMD BIT(2) +#define MMC_QUIRK_BLK_CMD23 BIT(3)enum mmc_voltage {MMC_SIGNAL_VOLTAGE_000 =0 ,
Signature · 1 line
2.51.0
Re: [PATCH v3 3/9] mmc: sdhci: enable CMD23 for multi-block transfers
Quoted 5 lines · Eric Chung
Enable the host controller's support for the CMD23 (
SET_BLOCK_COUNT) command to manage multi-block read/write operations. This allows the MMC core to use CMD23 in preference to the legacy CMD18/CMD25 plus CMD12 sequence, reducing command overhead and improving I/O performance on multi-block transfers.
The commit message claims this enables "host controller" support, but the changes are entirely in the MMC core (mmc.c) and header. No SDHCI host driver sets MMC_CAP_CMD23 in this patch. mmc_write_blocks() in mmc_write.c is not touched. CMD25 still always follows with CMD12.
Quoted 17 lines
Signed-off-by Eric Chung <[email protected]>---
v3:
- Avoid to use quirk to enable CMD23. Use capability instead.--- drivers/mmc/mmc.c | 18 ++++++++++++++---- include/mmc.h | 6 +++++- 2 files changed, 19 insertions(+), 5 deletions(-)drivers/mmc/mmc.c +0
-0@@ -461,6 +461,14 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,struct mmc_cmd cmd;
drivers/mmc/mmc.c static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start, · line 471
Quoted 10 lines
drivers/mmc/mmc.c +8
-0struct mmc_data data; +if (mmc->host_caps &MMC_CAP_CMD23 ) { + cmd.cmdidx =MMC_CMD_SET_BLOCK_COUNT ; + cmd.cmdarg = blkcnt &0x0000ffff ; + cmd.resp_type =MMC_RSP_R1 ; +if (mmc_send_cmd (mmc, &cmd,NULL )) +return 0 ; + } +
CMD23 is only meaningful before CMD18 (multi-block read). Sending it before CMD17 (single block, blkcnt == 1) is undefined per the SD spec, which
states: "SET_BLOCK_COUNT - Specify block count for CMD18 and CMD25."
The guard must be:
if (blkcnt > 1 && (mmc->host_caps & MMC_CAP_CMD23)) {
Quoted 13 lines
drivers/mmc/mmc.c +1
-1if (blkcnt >1 ) cmd.cmdidx =MMC_CMD_READ_MULTIPLE_BLOCK ;else @@ -481,7 +489,7 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,if (mmc_send_cmd (mmc, &cmd, &data))return 0 ; -if (blkcnt >1 ) { +if (blkcnt >1 && !(mmc->host_caps &MMC_CAP_CMD23 )) {if (mmc_send_stop_transmission (mmc, false)) {#if !defined(CONFIG_XPL_BUILD ) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT )log_err ("mmc fail to send stop cmd\n" );
drivers/mmc/mmc.c static int sd_get_capabilities(struct mmc *mmc) · line 1448
Quoted 5 lines
drivers/mmc/mmc.c +2
-0@@ -1436,6 +1444,8 @@ static int sd_get_capabilities(struct mmc *mmc)if (mmc->scr[0 ] &SD_DATA_4BIT ) mmc->card_caps |=MMC_MODE_4BIT ; +if (!(mmc->scr[0 ] &SD_SCR_CMD23_SUPPORT )) + mmc->host_caps &= ~MMC_CAP_CMD23 ;
Clearing CMD23 capability when the card does not advertise support via SCR[33] only for SD cards via sd_get_capabilities()but for eMMC the MMC_CAP_CMD23 flag set by the host driver will remain unconditionally. Similar handing should be done in mmc_get_capabilities().
drivers/mmc/mmc.c int mmc_get_op_cond(struct mmc *mmc, bool quiet) · line 2978
Quoted 13 lines
drivers/mmc/mmc.c +3
-3/* Version 1.0 doesn't support switching */ if (mmc->version ==SD_VERSION_1_0 )@@ -2963,9 +2973,9 @@ int mmc_get_op_cond(struct mmc *mmc, bool quiet)return err;#ifdef CONFIG_MMC_QUIRKS - mmc->quirks =MMC_QUIRK_RETRY_SET_BLOCKLEN | -MMC_QUIRK_RETRY_SEND_CID | -MMC_QUIRK_RETRY_APP_CMD ; + mmc->quirks |=MMC_QUIRK_RETRY_SET_BLOCKLEN | +MMC_QUIRK_RETRY_SEND_CID | +MMC_QUIRK_RETRY_APP_CMD ;
Unrelated to CMD23 support.
Quoted 25 lines
drivers/mmc/mmc.c +0
-0#endif err =mmc_power_cycle (mmc);include/mmc.h +3
-0@@ -67,6 +67,7 @@ struct bd_info;#define MMC_CAP_NONREMOVABLE BIT(14)#define MMC_CAP_NEEDS_POLL BIT(15)#define MMC_CAP_CD_ACTIVE_HIGH BIT(16) +#define MMC_CAP_CMD23 BIT(17)#define MMC_MODE_8BIT BIT(30)#define MMC_MODE_4BIT BIT(29)@@ -141,6 +142,8 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx)#define SD_HIGHSPEED_BUSY 0x00020000#define SD_HIGHSPEED_SUPPORTED 0x00020000 +#define SD_SCR_CMD23_SUPPORT BIT(1) +#define UHS_SDR12_BUS_SPEED 0#define HIGH_SPEED_BUS_SPEED 1#define UHS_SDR25_BUS_SPEED 1
include/mmc.h static inline bool mmc_is_tuning_cmd(uint cmdidx) · line 350
Quoted 6 lines
include/mmc.h +2
-1@@ -343,7 +346,8 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx)#define MMC_QUIRK_RETRY_SEND_CID BIT(0)#define MMC_QUIRK_RETRY_SET_BLOCKLEN BIT(1) -#define MMC_QUIRK_RETRY_APP_CMD BIT(2) +#define MMC_QUIRK_RETRY_APP_CMD BIT(2) +#define MMC_QUIRK_BLK_CMD23 BIT(3)
BLK_CMD23 quirk leftover from the previous patch
Regards,
Tanmay Kathpalia
Re: [PATCH v3 3/9] mmc: sdhci: enable CMD23 for multi-block transfers
Quoted 8 lines · Tanmay
Quoted 5 lines · Eric Chung
Enable the host controller's support for the CMD23 (
SET_BLOCK_COUNT) command to manage multi-block read/write operations. This allows the MMC core to use CMD23 in preference to the legacy CMD18/CMD25 plus CMD12 sequence, reducing command overhead and improving I/O performance on multi-block transfers.
Quoted 5 lines
The commit message claims this enables "host controller" support, but the changes are entirely in the MMC core (
mmc.c) and header. No SDHCI host driver setsMMC_CAP_CMD23in this patch.mmc_write_blocks()inmmc_write.cis not touched. CMD25 still always follows with CMD12.
Thanks. I'll apply all fixes.
Re: [PATCH v3 3/9] mmc: sdhci: enable CMD23 for multi-block transfers
Hi Eric,
Glad the review feedback was useful.
I have some SD/eMMC spec background that could help make the CMD23 implementation more complete. If you're interested, I'd be happy to collaborate on the implementation before you post v4.
Let me know.
Regards,
Tanmay Kathpalia
Quoted 15 lines · Eric Chung
Quoted 7 lines · Tanmay
Quoted 5 lines · Eric Chung
Enable the host controller's support for the CMD23 (
SET_BLOCK_COUNT) command to manage multi-block read/write operations. This allows the MMC core to use CMD23 in preference to the legacy CMD18/CMD25 plus CMD12 sequence, reducing command overhead and improving I/O performance on multi-block transfers.Quoted 5 lines
The commit message claims this enables "host controller" support, but the changes are entirely in the MMC core (
mmc.c) and header. No SDHCI host driver setsMMC_CAP_CMD23in this patch.mmc_write_blocks()inmmc_write.cis not touched. CMD25 still always follows with CMD12.Thanks. I'll apply all fixes.
PATCH v3 4/9 mmc: k1: add sdhci platform driver
In reply to Eric ChungAdd SDHCI platform driver support for SpacemiT K1 SoC. This driver implements the necessary platform-specific operations for the SDHCI controller, enabling MMC/SD card functionality on K1-based platforms.
---
v3:
- Enable CMD23 in capability.
v2:
- Enable ADMA mode support.
- Use CMD23 for multi-block read/write.
- Move ASR/AIB register into pinctrl driver.
- Correct pinctrl state from "fast" to "uhs".
- Migrate tuning support from the spacemit linux driver.
--- drivers/mmc/Kconfig | 7 + drivers/mmc/Makefile | 1 + drivers/mmc/spacemit_sdhci.c | 680 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 688 insertions(+)
drivers/mmc/Kconfig +7 -0
@@ -722,6 +722,13 @@ config MMC_SDHCI_SNPS If unsure, say N. +config MMC_SDHCI_SPACEMIT + bool "Spacemit SDHCI controller" + depends on MMC_SDHCI + help + Support for Secure Digital Host Controller Interface (SDHCI) on + Spacemit K1 SoC. + config MMC_SDHCI_STI bool "SDHCI support for STMicroelectronics SoC" depends on MMC_SDHCI && OF_CONTROL && ARCH_STI
drivers/mmc/Makefile +1 -0
@@ -71,6 +71,7 @@ obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.o obj-$(CONFIG_MMC_SDHCI_ADI) += adi_sdhci.o obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o obj-$(CONFIG_MMC_SDHCI_SNPS) += snps_sdhci.o +obj-$(CONFIG_MMC_SDHCI_SPACEMIT) += spacemit_sdhci.o obj-$(CONFIG_MMC_SDHCI_STI) += sti_sdhci.o obj-$(CONFIG_MMC_SDHCI_TANGIER) += tangier_sdhci.o obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.o
drivers/mmc/spacemit_sdhci.c new file +680 -0
680 lines not on this page · raw message
Signature · 1 line
2.51.0
Re: [PATCH v3 4/9] mmc: k1: add sdhci platform driver
Quoted 71 lines · Eric Chung
Add SDHCI platform driver support for SpacemiT K1 SoC. This driver implements the necessary platform-specific operations for the SDHCI controller, enabling MMC/SD card functionality on K1-based platforms.
Signed-off-by Eric Chung <[email protected]>---
v3:
- Enable CMD23 in capability.
v2:
- Enable ADMA mode support.
- Use CMD23 for multi-block read/write.
- Move ASR/AIB register into pinctrl driver.
- Correct pinctrl state from "fast" to "uhs".
- Migrate tuning support from the spacemit linux driver.--- drivers/mmc/Kconfig | 7 + drivers/mmc/Makefile | 1 + drivers/mmc/spacemit_sdhci.c | 680 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 688 insertions(+)drivers/mmc/Kconfig +7
-0@@ -722,6 +722,13 @@ config MMC_SDHCI_SNPS If unsure, say N. +config MMC_SDHCI_SPACEMIT + bool "Spacemit SDHCI controller" + depends on MMC_SDHCI + help + Support for Secure Digital Host Controller Interface (SDHCI) on + Spacemit K1 SoC. + config MMC_SDHCI_STI bool "SDHCI support for STMicroelectronics SoC" depends on MMC_SDHCI && OF_CONTROL && ARCH_STIdrivers/mmc/Makefile +1
-0@@ -71,6 +71,7 @@ obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.o obj-$(CONFIG_MMC_SDHCI_ADI) += adi_sdhci.o obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o obj-$(CONFIG_MMC_SDHCI_SNPS) += snps_sdhci.o +obj-$(CONFIG_MMC_SDHCI_SPACEMIT) += spacemit_sdhci.o obj-$(CONFIG_MMC_SDHCI_STI) += sti_sdhci.o obj-$(CONFIG_MMC_SDHCI_TANGIER) += tangier_sdhci.o obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.odrivers/mmc/spacemit_sdhci.c new file +14
-0@@ -0,0 +1,680 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Driver for Spacemit K1 Mobile Storage Host Controller +* +* Copyright (C) 2023-2026 Spacemit Inc. +* Copyright (C) 2026 RISCstar Ltd. +*/ + +#define LOG_CATEGORY UCLASS_MMC + +#include <clk.h> +#include <dm.h> +#include <fdtdec.h> +#include <log.h>
drivers/mmc/spacemit_sdhci.c line 24
Quoted 10 lines
drivers/mmc/spacemit_sdhci.c new file +10
-0+#include <malloc.h> +#include <sdhci.h> +#include <reset-uclass.h> +#include <mapmem.h> +#include <dm/pinctrl.h> +#include <linux/libfdt.h> +#include <linux/delay.h> +#include <power/regulator.h> + +#define FIELD_PREP (mask, val) (((val) << __ffs(mask)) & (mask))
<linux/bitfield.h> is already used elsewhere include it instead.
Quoted 556 lines
drivers/mmc/spacemit_sdhci.c new file +556
-0+ +/* SDH register definitions */ +#define SPACEMIT_SDHC_OP_EXT_REG 0x108 +#define SDHC_OVRRD_CLK_OEN BIT(11) +#define SDHC_FORCE_CLK_ON BIT(12) + +#define SPACEMIT_SDHC_LEGACY_CTRL_REG 0x10C +#define SDHC_GEN_PAD_CLK_ON BIT(6) + +#define SPACEMIT_SDHC_MMC_CTRL_REG 0x114 +#define SDHC_MISC_INT_EN BIT(1) +#define SDHC_MISC_INT BIT(2) +#define SDHC_ENHANCE_STROBE_EN BIT(8) +#define SDHC_MMC_HS400 BIT(9) +#define SDHC_MMC_HS200 BIT(10) +#define SDHC_MMC_CARD_MODE BIT(12) + +#define SPACEMIT_SDHC_TX_CFG_REG 0x11C +#define SDHC_TX_INT_CLK_SEL BIT(30) +#define SDHC_TX_MUX_SEL BIT(31) + +#define SPACEMIT_SDHC_PHY_CTRL_REG 0x160 +#define SDHC_PHY_FUNC_EN BIT(0) +#define SDHC_PHY_PLL_LOCK BIT(1) +#define SDHC_HOST_LEGACY_MODE BIT(31) + +#define SPACEMIT_SDHC_PHY_FUNC_REG 0x164 +#define SDHC_PHY_TEST_EN BIT(7) +#define SDHC_HS200_USE_RFIFO BIT(15) + +#define SPACEMIT_SDHC_PHY_DLLCFG 0x168 +#define SDHC_DLL_PREDLY_NUM GENMASK(3, 2) +#define SDHC_DLL_FULLDLY_RANGE GENMASK(5, 4) +#define SDHC_DLL_VREG_CTRL GENMASK(7, 6) +#define SDHC_DLL_ENABLE BIT(31) + +#define SPACEMIT_SDHC_PHY_DLLCFG1 0x16C +#define SDHC_DLL_REG1_CTRL GENMASK(7, 0) +#define SDHC_DLL_REG2_CTRL GENMASK(15, 8) +#define SDHC_DLL_REG3_CTRL GENMASK(23, 16) +#define SDHC_DLL_REG4_CTRL GENMASK(31, 24) + +#define SPACEMIT_SDHC_PHY_DLLSTS 0x170 +#define SDHC_DLL_LOCK_STATE BIT(0) + +#define SPACEMIT_SDHC_PHY_PADCFG_REG 0x178 +#define SDHC_PHY_DRIVE_SEL GENMASK(2, 0) +#define SDHC_RX_BIAS_CTRL BIT(5) + +#define SPACEMIT_SDHC_RX_CFG_REG 0x118 +#define SDHC_RX_SDCLK_SEL0_MASK GENMASK(1, 0) +#define SDHC_RX_SDCLK_SEL1_MASK GENMASK(3, 2) +#define SDHC_RX_SDCLK_SEL1 FIELD_PREP(SDHC_RX_SDCLK_SEL1_MASK, 1) + +#define SPACEMIT_SDHC_DLINE_CTRL_REG 0x130 +#define SDHC_DLINE_PU BIT(0) +#define SDHC_RX_DLINE_CODE_MASK GENMASK(23, 16) +#define SDHC_TX_DLINE_CODE_MASK GENMASK(31, 24) + +#define SPACEMIT_SDHC_DLINE_CFG_REG 0x134 +#define SDHC_RX_DLINE_REG_MASK GENMASK(7, 0) +#define SDHC_RX_DLINE_GAIN BIT(8) +#define SDHC_TX_DLINE_REG_MASK GENMASK(23, 16) + +#define SPACEMIT_RX_DLINE_REG 9 +#define SPACEMIT_RX_TUNE_DELAY_MIN 0x0 +#define SPACEMIT_RX_TUNE_DELAY_MAX 0xFF + +#define SPACEMIT_TX_TUNING_DLINE_REG 0x00 +#define SPACEMIT_TX_TUNING_DELAYCODE 127 + +struct spacemit_sdhci_plat { +struct mmc_config cfg; +struct mmc mmc; +struct reset_ctl_bulk resets; +struct clk_bulk clks; +}; + +struct spacemit_sdhci_priv { +struct sdhci_host host; +}; + +/* All helper functions will update clr/set while preserve rest bits */ +static inline void spacemit_sdhci_setbits (struct sdhci_host *host,u32 val, +int reg) +{ +sdhci_writel (host,sdhci_readl (host, reg) | val, reg); +} + +static inline void spacemit_sdhci_clrbits (struct sdhci_host *host,u32 val, +int reg) +{ +sdhci_writel (host,sdhci_readl (host, reg) & ~val, reg); +} + +static inline void spacemit_sdhci_clrsetbits (struct sdhci_host *host,u32 clr, +u32 set,int reg) +{ +u32 val =sdhci_readl (host, reg); + + val = (val & ~clr) | set; +sdhci_writel (host, val, reg); +} + +#if CONFIG_IS_ENABLED (MMC_SUPPORTS_TUNING ) +static void spacemit_sdhci_set_rx_delay (struct sdhci_host *host,u8 delay) +{ +spacemit_sdhci_clrsetbits (host,SDHC_RX_DLINE_CODE_MASK , +FIELD_PREP (SDHC_RX_DLINE_CODE_MASK , delay), +SPACEMIT_SDHC_DLINE_CTRL_REG ); +} + +static void spacemit_sdhci_set_tx_delay (struct sdhci_host *host,u8 delay) +{ +spacemit_sdhci_clrsetbits (host,SDHC_TX_DLINE_CODE_MASK , +FIELD_PREP (SDHC_TX_DLINE_CODE_MASK , delay), +SPACEMIT_SDHC_DLINE_CTRL_REG ); +} + +static void spacemit_sdhci_set_tx_dline_reg (struct sdhci_host *host, +u8 dline_reg) +{ +spacemit_sdhci_clrsetbits (host,SDHC_TX_DLINE_REG_MASK , +FIELD_PREP (SDHC_TX_DLINE_REG_MASK , dline_reg), +SPACEMIT_SDHC_DLINE_CFG_REG ); +} + +static void spacemit_sdhci_tx_tuning_prepare (struct sdhci_host *host) +{ +spacemit_sdhci_setbits (host,SDHC_TX_MUX_SEL ,SPACEMIT_SDHC_TX_CFG_REG ); +spacemit_sdhci_setbits (host,SDHC_DLINE_PU , +SPACEMIT_SDHC_DLINE_CTRL_REG ); +udelay (5 ); +} + +static void spacemit_sdhci_prepare_tuning (struct sdhci_host *host) +{ +spacemit_sdhci_clrsetbits (host,SDHC_RX_DLINE_REG_MASK , +FIELD_PREP (SDHC_RX_DLINE_REG_MASK ,SPACEMIT_RX_DLINE_REG ), +SPACEMIT_SDHC_DLINE_CFG_REG ); + +spacemit_sdhci_setbits (host,SDHC_DLINE_PU , +SPACEMIT_SDHC_DLINE_CTRL_REG ); +udelay (5 ); + +spacemit_sdhci_clrsetbits (host,SDHC_RX_SDCLK_SEL1_MASK , +SDHC_RX_SDCLK_SEL1 , +SPACEMIT_SDHC_RX_CFG_REG ); + +if (host->mmc->selected_mode ==MMC_HS_200 ) +spacemit_sdhci_setbits (host,SDHC_HS200_USE_RFIFO , +SPACEMIT_SDHC_PHY_FUNC_REG ); +} +#endif /* MMC_SUPPORTS_TUNING */ + +/* +* Reference: PMU_SDH0_CLK_RES_CTRL (0x054), SDH0_CLK_SEL=0x0, +* SDH0_CLK_DIV=0x1. The default clock source is 204.8 MHz +* (pll1_d6_409p6Mhz / 2). +* +* During start-up, use a 200 kHz frequency. +*/ +#define SDHC_MIN_CLOCK (200 * 1000) + +static void spacemit_sdhci_phy_init (struct udevice *dev, +struct sdhci_host *host) +{ +u32 reg =0 ; + +if (dev_read_bool (dev,"no-sd" ) &&dev_read_bool (dev,"no-sdio" )) { +/* MMC card mode */ + reg =sdhci_readl (host,SPACEMIT_SDHC_MMC_CTRL_REG ); + reg |=SDHC_MMC_CARD_MODE ; +sdhci_writel (host, reg,SPACEMIT_SDHC_MMC_CTRL_REG ); + +/* Use PHY functional mode */ + reg =sdhci_readl (host,SPACEMIT_SDHC_PHY_CTRL_REG ); + reg |= (SDHC_PHY_FUNC_EN |SDHC_PHY_PLL_LOCK ); +sdhci_writel (host, reg,SPACEMIT_SDHC_PHY_CTRL_REG ); + + reg =sdhci_readl (host,SPACEMIT_SDHC_PHY_PADCFG_REG ); + reg |=SDHC_RX_BIAS_CTRL ; +sdhci_writel (host, reg,SPACEMIT_SDHC_PHY_PADCFG_REG ); + }else { + reg =sdhci_readl (host,SPACEMIT_SDHC_TX_CFG_REG ); + reg |=SDHC_TX_INT_CLK_SEL ; +sdhci_writel (host, reg,SPACEMIT_SDHC_TX_CFG_REG ); + } + + reg =sdhci_readl (host,SPACEMIT_SDHC_MMC_CTRL_REG ); + reg &= ~SDHC_ENHANCE_STROBE_EN ; +sdhci_writel (host, reg,SPACEMIT_SDHC_MMC_CTRL_REG ); +} + +static int spacemit_sdhci_set_vqmmc_voltage (struct mmc *mmc,int voltage) +{ +#if CONFIG_IS_ENABLED (DM_REGULATOR ) +int ret; + +if (!mmc->vqmmc_supply) +return 0 ; + + ret =regulator_set_value (mmc->vqmmc_supply, voltage); +if (ret) { +log_err ("failed to set vqmmc voltage to %d.%dV\n" , + voltage /1000000 , (voltage /100000 ) %10 ); +return ret; + } + ret =regulator_set_enable_if_allowed (mmc->vqmmc_supply, true); +if (ret) { +log_err ("failed to enable vqmmc supply\n" ); +return ret; + } +#endif +return 0 ; +} + +static void spacemit_sdhci_set_voltage (struct sdhci_host *host) +{ +if (IS_ENABLED (CONFIG_MMC_IO_VOLTAGE )) { +struct mmc *mmc = host->mmc; +u32 ctrl; + + ctrl =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + +switch (mmc->signal_voltage) { +case MMC_SIGNAL_VOLTAGE_330 : +case MMC_SIGNAL_VOLTAGE_180 : { +bool to_180 = mmc->signal_voltage == +MMC_SIGNAL_VOLTAGE_180 ; +bool ok; +int voltage_mv = to_180 ?1800000 :3300000 ; + +if (spacemit_sdhci_set_vqmmc_voltage (mmc, voltage_mv)) +return ; +if (!IS_SD (mmc)) +return ; +if (to_180) + ctrl |=SDHCI_CTRL_VDD_180 ; +else + ctrl &= ~SDHCI_CTRL_VDD_180 ; +sdhci_writew (host, ctrl,SDHCI_HOST_CONTROL2 ); + +mdelay (5 ); + + ctrl =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + ok = !!(ctrl &SDHCI_CTRL_VDD_180 ) == to_180; +if (ok) +return ; + +log_err ("%d.%dV regulator output not stable\n" , + voltage_mv /1000000 , + (voltage_mv /100000 ) %10 ); +break ; + } +default : +/* No signal voltage switch required */ +return ; + } + } +} + +static void spacemit_sdhci_set_clk_gate (struct sdhci_host *host,int auto_gate) +{ +u32 reg; + + reg =sdhci_readl (host,SPACEMIT_SDHC_OP_EXT_REG ); +if (auto_gate) + reg &= ~(SDHC_OVRRD_CLK_OEN |SDHC_FORCE_CLK_ON ); +else + reg |= (SDHC_OVRRD_CLK_OEN |SDHC_FORCE_CLK_ON ); +sdhci_writel (host, reg,SPACEMIT_SDHC_OP_EXT_REG ); +} + +static bool spacemit_sdhci_is_voltage_switch_cmd (struct sdhci_host *host) +{ +struct mmc *mmc = host->mmc; +u32 cmd; + +if (!IS_SD (mmc)) +return false; + + cmd =SDHCI_GET_CMD (sdhci_readw (host,SDHCI_COMMAND )); +return cmd ==SD_CMD_SWITCH_UHS18V && + mmc->signal_voltage ==MMC_SIGNAL_VOLTAGE_180 ; +} + +static int spacemit_sdhci_wait_dat0 (struct udevice *dev,int state, +int timeout_us) +{ +struct mmc *mmc =mmc_get_mmc_dev (dev); +struct sdhci_host *host = mmc->priv; +unsigned long timeout =timer_get_us () + timeout_us; +u32 tmp; + +/* +* readx_poll_timeout is unsuitable because sdhci_readl accepts +* two arguments +*/ +do { + tmp =sdhci_readl (host,SDHCI_PRESENT_STATE ); +if (!!(tmp &SDHCI_DATA_0_LVL_MASK ) == !!state) { +if (spacemit_sdhci_is_voltage_switch_cmd (host)) +spacemit_sdhci_set_clk_gate (host,1 ); +return 0 ; + } + }while (!timeout_us || !time_after (timer_get_us (), timeout)); + +return -ETIMEDOUT ; +} + +static void spacemit_sdhci_set_control_reg (struct sdhci_host *host) +{ +struct mmc *mmc = host->mmc; +u32 reg; + +spacemit_sdhci_set_voltage (host); + +if (spacemit_sdhci_is_voltage_switch_cmd (host)) +spacemit_sdhci_set_clk_gate (host,0 ); + +/* +* Set TX_INT_CLK_SEL to guarantee hold time at default speed, +* HS, SDR12/SDR25/SDR50 modes. See SDHC_TX_CFG_REG (0x11c). +*/ + reg =sdhci_readl (host,SPACEMIT_SDHC_TX_CFG_REG ); +if (mmc->selected_mode ==MMC_LEGACY || + mmc->selected_mode ==MMC_HS || + mmc->selected_mode ==SD_HS || + mmc->selected_mode ==UHS_SDR12 || + mmc->selected_mode ==UHS_SDR25 || + mmc->selected_mode ==UHS_SDR50 ) { + reg |=SDHC_TX_INT_CLK_SEL ; + }else { + reg &= ~SDHC_TX_INT_CLK_SEL ; + } +sdhci_writel (host, reg,SPACEMIT_SDHC_TX_CFG_REG ); + +/* Set pinctrl state */ +if (IS_ENABLED (CONFIG_PINCTRL )) { +if (mmc->clock >=200000000 ) +pinctrl_select_state (mmc->dev,"uhs" ); +else +pinctrl_select_state (mmc->dev,"default" ); + } + +if (mmc->selected_mode ==MMC_HS_200 || + mmc->selected_mode ==MMC_HS_400 || + mmc->selected_mode ==MMC_HS_400_ES ) { + reg =sdhci_readw (host,SPACEMIT_SDHC_MMC_CTRL_REG ); +if (mmc->selected_mode ==MMC_HS_200 ) + reg |=SDHC_MMC_HS200 ; +else + reg |=SDHC_MMC_HS400 ; +sdhci_writew (host, reg,SPACEMIT_SDHC_MMC_CTRL_REG ); + }else { + reg =sdhci_readw (host,SPACEMIT_SDHC_MMC_CTRL_REG ); + reg &= ~(SDHC_MMC_HS200 |SDHC_MMC_HS400 |SDHC_ENHANCE_STROBE_EN ); +sdhci_writew (host, reg,SPACEMIT_SDHC_MMC_CTRL_REG ); + } + +sdhci_set_uhs_timing (host); +} + +#if CONFIG_IS_ENABLED (MMC_SUPPORTS_TUNING ) +static int spacemit_sdhci_execute_tuning (struct mmc *mmc,u8 opcode) +{ +struct sdhci_host *host = mmc->priv; +int current_len =0 , current_start =0 ; +int max_pass_len =0 , max_pass_start =0 ; +u8 final_delay; +int ret =0 ; +int i; + +/* +* Tuning is required for SDR50/SDR104, HS200/HS400 cards and +* if clock frequency is greater than 100MHz in these modes. +*/ +if (host->clock <100 *1000 *1000 || + !(mmc->selected_mode ==MMC_HS_200 || + mmc->selected_mode ==UHS_SDR50 || + mmc->selected_mode ==UHS_SDR104 )) +return 0 ; + +if (IS_SD (host->mmc)) { +spacemit_sdhci_set_tx_dline_reg (host,SPACEMIT_TX_TUNING_DLINE_REG ); +spacemit_sdhci_set_tx_delay (host,SPACEMIT_TX_TUNING_DELAYCODE ); +spacemit_sdhci_tx_tuning_prepare (host); + +log_debug ("TX tuning: dline_reg=%d, delaycode=%d\n" , +SPACEMIT_TX_TUNING_DLINE_REG ,SPACEMIT_TX_TUNING_DELAYCODE ); + } + +spacemit_sdhci_prepare_tuning (host); + +for (i =SPACEMIT_RX_TUNE_DELAY_MIN ; i <=SPACEMIT_RX_TUNE_DELAY_MAX ; i++) { +spacemit_sdhci_set_rx_delay (host, i); + ret =mmc_send_tuning (host->mmc, opcode); + +log_debug ("RX delay %d: %s\n" , + i, ret ==0 ?"pass" :"fail" ); + +if (ret ==0 ) { +/* Test passed - extend current window */ +if (current_len ==0 ) + current_start = i; + current_len++; + }else { +/* Test failed - check if current window is best so far */ +if (current_len > max_pass_len) { + max_pass_len = current_len; + max_pass_start = current_start; + } + current_len =0 ; + } + } + +if (current_len > max_pass_len) { + max_pass_len = current_len; + max_pass_start = current_start; + } + +if (max_pass_len <3 ) { +log_err ("Tuning failed: no stable window found\n" ); +return -EIO ; + } + + final_delay = max_pass_start + max_pass_len /2 ; +spacemit_sdhci_set_rx_delay (host, final_delay); + ret =mmc_send_tuning (host->mmc, opcode); +if (ret) { +u8 retry_delays[] = { + max_pass_start + max_pass_len /4 , + max_pass_start + (3 * max_pass_len) /4 , + max_pass_start, + max_pass_start + max_pass_len -1 + }; +int retry_count =ARRAY_SIZE (retry_delays); + +log_warning ("Primary delay %d failed, trying alternatives\n" , + final_delay); + +for (i =0 ; i < retry_count; i++) { +if (retry_delays[i] >=SPACEMIT_RX_TUNE_DELAY_MIN && + retry_delays[i] <=SPACEMIT_RX_TUNE_DELAY_MAX ) { +spacemit_sdhci_set_rx_delay (host, retry_delays[i]); + ret =mmc_send_tuning (host->mmc, opcode); +if (!ret) { + final_delay = retry_delays[i]; +log_info ("Retry successful with delay %d\n" , + final_delay); +break ; + } + } + } + +if (ret) { +log_err ("All retry attempts failed\n" ); +return -EIO ; + } + } + +log_debug ("Tuning successful: window %d-%d, using delay %d\n" , + max_pass_start, max_pass_start + max_pass_len -1 , final_delay); + +return 0 ; +} +#endif /* MMC_SUPPORTS_TUNING */ + +#if CONFIG_IS_ENABLED (MMC_HS400_ES_SUPPORT ) +static int spacemit_sdhci_phy_dll_init (struct sdhci_host *host) +{ +u32 reg; +int i; + +/* Configure DLL predly, fulldly, and vreg */ +spacemit_sdhci_clrsetbits (host,SDHC_DLL_PREDLY_NUM | +SDHC_DLL_FULLDLY_RANGE | +SDHC_DLL_VREG_CTRL , +FIELD_PREP (SDHC_DLL_PREDLY_NUM ,1 ) | +FIELD_PREP (SDHC_DLL_FULLDLY_RANGE ,1 ) | +FIELD_PREP (SDHC_DLL_VREG_CTRL ,1 ), +SPACEMIT_SDHC_PHY_DLLCFG ); + + reg =sdhci_readl (host,SPACEMIT_SDHC_PHY_DLLCFG1 ); + reg |=FIELD_PREP (SDHC_DLL_REG1_CTRL ,0x92 ); +sdhci_writel (host, reg,SPACEMIT_SDHC_PHY_DLLCFG1 ); + +/* Enable DLL */ + reg =sdhci_readl (host,SPACEMIT_SDHC_PHY_DLLCFG ); + reg |=SDHC_DLL_ENABLE ; +sdhci_writel (host, reg,SPACEMIT_SDHC_PHY_DLLCFG ); + +/* Wait for DLL lock */ + i =0 ; +while (i++ <100 ) { +if (sdhci_readl (host,SPACEMIT_SDHC_PHY_DLLSTS ) &SDHC_DLL_LOCK_STATE ) +break ; +udelay (10 ); + } +if (i ==100 ) { +log_err ("%s: phy dll lock timeout\n" , host->name); +return -ETIMEDOUT ; + } + +return 0 ; +} + +static int spacemit_sdhci_hs400_enhanced_strobe (struct sdhci_host *host) +{ +u32 reg; + + reg =sdhci_readl (host,SPACEMIT_SDHC_MMC_CTRL_REG ); + reg |=SDHC_ENHANCE_STROBE_EN ; +sdhci_writel (host, reg,SPACEMIT_SDHC_MMC_CTRL_REG ); + +return spacemit_sdhci_phy_dll_init (host); +} +#endif + +const struct sdhci_ops spacemit_sdhci_ops = { + .set_control_reg = spacemit_sdhci_set_control_reg, +#if CONFIG_IS_ENABLED(MMC_SUPPORTS_TUNING) + .platform_execute_tuning = spacemit_sdhci_execute_tuning, +#endif +#if CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT) + .set_enhanced_strobe = spacemit_sdhci_hs400_enhanced_strobe, +#endif +}; + +static struct dm_mmc_ops spacemit_mmc_ops; + +static int spacemit_sdhci_probe (struct udevice *dev) +{ +struct mmc_uclass_priv *upriv =dev_get_uclass_priv (dev); +struct spacemit_sdhci_priv *priv =dev_get_priv (dev); +struct spacemit_sdhci_plat *plat =dev_get_plat (dev); +struct sdhci_host *host = &priv->host; +struct clk clk; +int ret =0 ; + + host->mmc = &plat->mmc; + host->mmc->priv = host; + host->mmc->dev = dev; + upriv->mmc = host->mmc; + + spacemit_mmc_ops = sdhci_ops; + spacemit_mmc_ops.wait_dat0 = spacemit_sdhci_wait_dat0; + + ret =clk_get_bulk (dev, &plat->clks); +if (ret) { +log_err ("Can't get clk: %d\n" , ret); +return ret; + } + + ret =clk_enable_bulk (&plat->clks);
drivers/mmc/spacemit_sdhci.c line 590
Quoted 10 lines
drivers/mmc/spacemit_sdhci.c new file +10
-0+if (ret) { +log_err ("Failed to enable clk: %d\n" , ret); +return ret; + } + + ret =reset_get_bulk (dev, &plat->resets); +if (ret) { +log_err ("Can't get reset: %d\n" , ret); +return ret; + }
The previously clk_enable_bulk()'d clocks are never released better to add to cleanup paths.
Quoted 91 lines
drivers/mmc/spacemit_sdhci.c new file +90
-0+ + ret =reset_deassert_bulk (&plat->resets); +if (ret) { +log_err ("Failed to reset: %d\n" , ret); +return ret; + } + + ret =clk_get_by_index (dev,1 , &clk); +if (ret) { +log_err ("Can't get io clk: %d\n" , ret); +return ret; + } + + ret =clk_set_rate (&clk, plat->cfg.f_max); +if (ret) { +log_err ("Failed to set io clk: %d\n" , ret); +return ret; + } + +/* Set quirks */ +if (IS_ENABLED (CONFIG_SPL_BUILD )) + host->quirks =SDHCI_QUIRK_WAIT_SEND_CMD ; +else + host->quirks =SDHCI_QUIRK_WAIT_SEND_CMD | +SDHCI_QUIRK_32BIT_DMA_ADDR ; + host->host_caps =MMC_MODE_HS | MMC_MODE_HS_52MHz | +MMC_CAP_CMD23 ; + host->max_clk = plat->cfg.f_max; + + plat->cfg.f_min =SDHC_MIN_CLOCK ; + host->ops = &spacemit_sdhci_ops; + + ret =sdhci_setup_cfg (&plat->cfg, host, plat->cfg.f_max, +SDHC_MIN_CLOCK ); +if (ret) +return ret; + + ret =sdhci_probe (dev); +if (ret) +return ret; + +spacemit_sdhci_phy_init (dev, host); +return ret; +} + +static int spacemit_sdhci_of_to_plat (struct udevice *dev) +{ +struct spacemit_sdhci_plat *plat =dev_get_plat (dev); +struct spacemit_sdhci_priv *priv =dev_get_priv (dev); +struct sdhci_host *host = &priv->host; +int ret =0 ; + + host->name = dev->name; + host->ioaddr = (void *)dev_read_addr (dev); + + ret =mmc_of_parse (dev, &plat->cfg); + +return ret; +} + +static int spacemit_sdhci_bind (struct udevice *dev) +{ +struct spacemit_sdhci_plat *drv_data; +struct spacemit_sdhci_plat *plat =dev_get_plat (dev); + + drv_data = (struct spacemit_sdhci_plat *)dev_get_driver_data (dev); +if (drv_data) +memcpy (plat, drv_data,sizeof (struct spacemit_sdhci_plat )); +return sdhci_bind (dev, &plat->mmc, &plat->cfg); +} + +static const struct udevice_id spacemit_sdhci_ids[] = { + { + .compatible ="spacemit,k1-sdhci" , + .data =0 , + }, { + } +}; + +U_BOOT_DRIVER (spacemit_sdhci_drv) = { + .name ="spacemit_sdhci" , + .id =UCLASS_MMC , + .of_match = spacemit_sdhci_ids, + .of_to_plat = spacemit_sdhci_of_to_plat, + .ops = &spacemit_mmc_ops, + .bind = spacemit_sdhci_bind, + .probe = spacemit_sdhci_probe, + .priv_auto =sizeof (struct spacemit_sdhci_priv ), + .plat_auto =sizeof (struct spacemit_sdhci_plat ), +};
PATCH v3 5/9 dts: k1: add SD card support in u-boot overlay
In reply to Eric ChungAdd the SDH0 controller node and its pinctrl groups to the u-boot overlay. The upstream DTS only contains the eMMC node; the SD card controller (sdhci@d4280000) and its MMC1 pinctrl configuration are missing. Place the new node inside the storage-bus via path-based merge so it inherits the dma-ranges from the parent bus.
---
v3:
- Fix SD pinctrl as uhs.
v2:
- Use vmmc-supply as vqmmc-supply on SD node.
- Add alias of mmc0 and mmc1.
--- arch/riscv/dts/k1-bananapi-f3-u-boot.dtsi | 87 ++++++++++++++++++++++++++++++- arch/riscv/dts/k1-musepi-pro-u-boot.dtsi | 82 ++++++++++++++++++++++++++++- 2 files changed, 165 insertions(+), 4 deletions(-)
arch/riscv/dts/k1-bananapi-f3-u-boot.dtsi +85 -2
@@ -6,6 +6,11 @@ #include "binman.dtsi" / { + aliases { + mmc0 = &emmc; + mmc1 = &sdhci0; + }; + memory@0 { device_type = "memory"; reg = <0x00000000 0x00000000 0x00000000 0x80000000>;
@@ -76,12 +81,14 @@ bootph-pre-ram; }; - buck3 { + buck3_1v8: buck3 { regulator-name = "vdd_1v8"; bootph-pre-ram; }; - aldo1 { + buck4_3v3: buck4 { }; + + aldo1: aldo1 { regulator-name = "vdd_1v8_mmc"; bootph-pre-ram; };
@@ -89,6 +96,82 @@ }; }; +/ { + soc { + storage-bus { + sdhci0: mmc@d4280000 { + bootph-pre-ram; + compatible = "spacemit,k1-sdhci"; + reg = <0x0 0xd4280000 0x0 0x200>; + clocks = <&syscon_apmu CLK_SDH_AXI>, + <&syscon_apmu CLK_SDH0>; + clock-names = "core", "io"; + interrupts = <99>; + resets = <&syscon_apmu RESET_SDH_AXI>, + <&syscon_apmu RESET_SDH0>; + reset-names = "sdh_axi", "sdh0"; + bus-width = <4>; + max-frequency = <204800000>; + cd-gpios = <&gpio K1_GPIO(80) GPIO_ACTIVE_LOW>; + pinctrl-names = "default", "uhs"; + pinctrl-0 = <&sdhci0_0_cfg>; + pinctrl-1 = <&sdhci0_1_cfg>; + status = "okay"; + }; + }; + }; +}; + +/* SD card pinctrl groups -- not present in upstream k1-pinctrl.dtsi */ +&pinctrl { + sdhci0_0_cfg: sdhci0-0-cfg { + grp_cmd_data { + pinmux = <K1_PADCONF(104, 0)>, /* MMC1_DAT3 */ + <K1_PADCONF(105, 0)>, /* MMC1_DAT2 */ + <K1_PADCONF(106, 0)>, /* MMC1_DAT1 */ + <K1_PADCONF(107, 0)>, /* MMC1_DAT0 */ + <K1_PADCONF(108, 0)>; /* MMC1_CMD */ + bias-pull-up = <1>; + drive-strength = <19>; + }; + grp_clk { + pinmux = <K1_PADCONF(109, 0)>; /* MMC1_CLK */ + bias-pull-down = <1>; + drive-strength = <19>; + }; + }; + + sdhci0_1_cfg: sdhci0-1-cfg { /* uhs */ + grp_cmd_data { + pinmux = <K1_PADCONF(104, 0)>, /* MMC1_DAT3 */ + <K1_PADCONF(105, 0)>, /* MMC1_DAT2 */ + <K1_PADCONF(106, 0)>, /* MMC1_DAT1 */ + <K1_PADCONF(107, 0)>, /* MMC1_DAT0 */ + <K1_PADCONF(108, 0)>; /* MMC1_CMD */ + bias-pull-up = <1>; + drive-strength = <42>; + }; + grp_clk { + pinmux = <K1_PADCONF(109, 0)>; /* MMC1_CLK */ + bias-pull-down = <1>; + drive-strength = <42>; + }; + }; +}; + +&emmc { + bootph-pre-ram; + resets = <&syscon_apmu RESET_SDH_AXI>, <&syscon_apmu RESET_SDH2>; + reset-names = "sdh_axi", "sdh2"; + vqmmc-supply = <&buck3_1v8>; + vmmc-supply = <&aldo1>; + max-frequency = <204800000>; +}; + +&sdhci0 { + vmmc-supply = <&buck4_3v3>; +}; + &binman { u-boot-spl-ddr { type = "section";
arch/riscv/dts/k1-musepi-pro-u-boot.dtsi +80 -2
106 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v3 6/9 configs: k1: enable SD and eMMC support
In reply to Eric ChungEnable high-speed MMC modes.
---
v2:
- Enable ADMA support.
- Enable SYSCON support.
--- board/spacemit/k1/MAINTAINERS | 1 + configs/spacemit_k1_defconfig | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)
board/spacemit/k1/MAINTAINERS +1 -0
@@ -9,6 +9,7 @@ F: configs/spacemit_k1_defconfig F: doc/board/spacemit/bananapi-f3.rst F: drivers/gpio/spacemit_gpio.c F: drivers/i2c/k1_i2c.c +F: drivers/mmc/spacemit_sdhci.c F: drivers/pinctrl/spacemit/ F: drivers/power/pmic/pmic_spacemit_p1.c F: drivers/power/regulator/spacemit_p1_regulator.c
configs/spacemit_k1_defconfig +19 -0
@@ -23,6 +23,7 @@ CONFIG_DEBUG_UART_BASE=0xd4017000 CONFIG_DEBUG_UART_CLOCK=14700000 CONFIG_TARGET_SPACEMIT_K1=y CONFIG_ARCH_RV64I=y +CONFIG_RISCV_ISA_ZICBOM=y CONFIG_RISCV_SMODE=y CONFIG_SPL_RISCV_MMODE=y # CONFIG_SPL_SMP is not set
@@ -48,6 +49,7 @@ CONFIG_SPL_CMD_TLV_EEPROM=y CONFIG_OF_UPSTREAM=y CONFIG_ENV_OVERWRITE=y CONFIG_SPL_REGMAP=y +CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_CLK=y CONFIG_CLK_CCF=y
@@ -87,6 +89,21 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_MEM=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x000a0000 CONFIG_CMD_SPI=y +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ADMA=y +CONFIG_MMC_SDHCI_SPACEMIT=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_HS200_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +CONFIG_MMC_HS400_ES_SUPPORT=y +CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x4 +CONFIG_CMD_MMC=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y +CONFIG_EFI_PARTITION=y CONFIG_SPL_SPI=y CONFIG_SPL_DM_SPI=y CONFIG_SPL_DM_SPI_FLASH=y
@@ -94,3 +111,5 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_FLASH_TINY=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_MMC=y +CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
Signature · 1 line
2.51.0
PATCH v3 7/9 doc: spacemit: flash on K1 SoC based boards
In reply to Eric ChungAdd document on how to flash images into eMMC of K1 SoC based boards.
---
v3:
- Add document on how to flash images into SD card.
--- board/spacemit/k1/MAINTAINERS | 2 +- doc/board/spacemit/index.rst | 1 + doc/board/spacemit/k1-mmc.rst | 320 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 322 insertions(+), 1 deletion(-)
board/spacemit/k1/MAINTAINERS +1 -1
@@ -6,7 +6,7 @@ S: Maintained F: arch/riscv/dts/k1-*-u-boot.dtsi F: board/spacemit/k1/ F: configs/spacemit_k1_defconfig -F: doc/board/spacemit/bananapi-f3.rst +F: doc/board/spacemit/ F: drivers/gpio/spacemit_gpio.c F: drivers/i2c/k1_i2c.c F: drivers/mmc/spacemit_sdhci.c
doc/board/spacemit/index.rst +1 -0
@@ -6,5 +6,6 @@ SpacemiT :maxdepth: 1 bananapi-f3 + k1-mmc k1-spl
doc/board/spacemit/k1-mmc.rst new file +320 -0
320 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v3 8/9 config: k1: enable ENV support for eMMC
In reply to Eric ChungEnable environment variable support on the eMMC storage device for both SPL and U-Boot stages.
--- configs/spacemit_k1_defconfig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
configs/spacemit_k1_defconfig +6 -1
@@ -14,7 +14,7 @@ CONFIG_SPL_BSS_MAX_SIZE=0x400 CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0xc00000 CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x100000 +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x400000 CONFIG_SYS_BOOTM_LEN=0xa000000 CONFIG_SYS_LOAD_ADDR=0x200000 CONFIG_SPL_SIZE_LIMIT=0x31000
@@ -48,6 +48,10 @@ CONFIG_CMD_TLV_EEPROM=y CONFIG_SPL_CMD_TLV_EEPROM=y CONFIG_OF_UPSTREAM=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_OFFSET=0x60000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_IS_IN_MMC=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y
@@ -111,5 +115,6 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_FLASH_TINY=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_MMC=y CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
Signature · 1 line
2.51.0
PATCH v3 9/9 spacemit: k1: load product name from environment variable
In reply to Eric ChungRead the product name from the environment instead of EEPROM, as the EEPROM may not be programmed and the environment always contains this information.
--- board/spacemit/k1/spl.c | 51 +++++++++++-------------------------------------- 1 file changed, 11 insertions(+), 40 deletions(-)
board/spacemit/k1/spl.c +11 -40
@@ -12,6 +12,7 @@#include <configs/k1.h> #include <dm/device.h> #include <dm/uclass.h> +#include <env.h> #include <i2c.h> #include <linux/bitfield.h> #include <linux/delay.h>
@@ -96,39 +97,6 @@ static void i2c_early_init(void) } } -int read_product_name (char *name,int size) -{ -u8 eeprom_data[TLV_TOTAL_LEN_MAX ], *p; -struct tlvinfo_header *tlv_hdr; -struct tlvinfo_tlv *tlv_entry; -int ret, i =0 ; -u32 entry_size; - -if (!name || size <=0 ) -return -EINVAL ; - ret =read_tlvinfo_tlv_eeprom (eeprom_data, &tlv_hdr, - &tlv_entry, i); -if (ret) -return ret; - p = (u8 *)tlv_entry; -for (i =0 ; i < tlv_hdr->totallen; ) { -if (tlv_entry->type ==TLV_CODE_PRODUCT_NAME ) { -if (tlv_entry->length < size) - size = tlv_entry->length; -memset (name,0 , size); -memcpy (name, &tlv_entry->value[0 ], size); -return 0 ; - } -if (tlv_entry->type ==TLV_CODE_CRC_32 ) -return -ENOENT ; - entry_size = tlv_entry->length +sizeof (struct tlvinfo_tlv ); - i += entry_size; - p += entry_size; - tlv_entry = (struct tlvinfo_tlv *)p; - } -return -ENOENT ; -} - static const struct { const char *eeprom_name; const char *fit_name;
@@ -140,9 +108,15 @@ static const struct { static void fixup_product_name(void) { - char fdt_name[I2C_BUF_SIZE]; + char fdt_name[I2C_BUF_SIZE], *name; int i; + memset(product_name, 0, I2C_BUF_SIZE); + env_init(); + env_load(); + name = env_get("product_name"); + if (name) + snprintf(product_name, I2C_BUF_SIZE, "%s", name); memset(fdt_name, 0, I2C_BUF_SIZE); for (i = 0; i < ARRAY_SIZE(k1_board_map); i++) { if (!strncmp(product_name, k1_board_map[i].eeprom_name,
@@ -451,13 +425,10 @@ u32 spl_boot_device(void)void spl_board_init (void ) { -int ret; +} - ret =read_product_name (product_name,I2C_BUF_SIZE ); -if (ret) -log_info ("Fail to detect board:%d\n" , ret); -else -log_info ("Get board name:%s\n" , product_name); +void spl_perform_board_fixups (struct spl_image_info *spl_image) +{fixup_product_name (); }
Signature · 1 line
2.51.0