spacemit mmc driver
Subsystems (4)
v2 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 (8 patches)
For each series:
b4 am <cover-msgid>
git am ./*.mbx
---
Changes in v2:
- EDITME: describe what is new in this series revision.
- EDITME: use bulletpoints and terse descriptions.
- Link to v1: https://patch.msgid.link/[email protected]
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 (8):
pinctrl: k1: add IO power domain configuration support
mmc: sdhci: add quirk to 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 | 50 +-- configs/spacemit_k1_defconfig | 26 +- doc/board/spacemit/index.rst | 1 + doc/board/spacemit/k1-flash.rst | 157 +++++++ drivers/mmc/Kconfig | 7 + drivers/mmc/Makefile | 1 + drivers/mmc/mmc.c | 22 +- drivers/mmc/sdhci.c | 3 + drivers/mmc/spacemit_sdhci.c | 681 ++++++++++++++++++++++++++++++ drivers/pinctrl/spacemit/pinctrl-k1.c | 84 +++- include/mmc.h | 5 +- include/sdhci.h | 1 + 15 files changed, 1157 insertions(+), 53 deletions(-)
---
base-commit: e7a6b33b153be98fcca16729e189f90c2d91a98c
change-id: 20260629-m4-98e01659fefb
Best regards,
Signature · 1 line
Eric Chung <[email protected]>
PATCH v2 1/8 pinctrl: k1: add IO power domain configuration support
Dual-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.
--- drivers/pinctrl/spacemit/pinctrl-k1.c | 84 ++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 2 deletions(-)
drivers/pinctrl/spacemit/pinctrl-k1.c +82 -2
@@ -12,6 +12,8 @@#include <linux/bitops.h> #include <linux/errno.h> #include <linux/io.h> +#include <regmap.h> +#include <syscon.h> /* * +---------+----------+-----------+--------+--------+----------+--------+
@@ -34,8 +36,24 @@#define PAD_PULLUP BIT(14)#define PAD_PULL_EN BIT(15) -#define PIN_POWER_STATE_1V8 1800 -#define PIN_POWER_STATE_3V3 3300 +#define IO_PWR_DOMAIN_OFFSET 0x800 + +#define IO_PWR_DOMAIN_GPIO2_Kx 0x0c +#define IO_PWR_DOMAIN_MMC_Kx 0x1c + +#define IO_PWR_DOMAIN_GPIO3_K1 0x10 +#define IO_PWR_DOMAIN_QSPI_K1 0x20 + +#define IO_PWR_DOMAIN_V18EN BIT(2) + +#define APBC_ASFAR 0x50 +#define APBC_ASSAR 0x54 + +#define APBC_ASFAR_AKEY 0xbaba +#define APBC_ASSAR_AKEY 0xeb10 + +#define PIN_POWER_STATE_1V8 1800 +#define PIN_POWER_STATE_3V3 3300enum spacemit_pin_io_type {IO_TYPE_NONE =0 ,
@@ -60,12 +78,14 @@ struct spacemit_pinctrl_data {int (*get_pins)(struct udevice *dev);int (*get_functions)(struct udevice *dev);int (*get_io_type)(struct udevice *dev,unsigned int pin); +unsigned int (*pin_to_io_pd_offset)(unsigned int pin); };struct spacemit_pinctrl_priv {void __iomem *regs;struct spacemit_pin_io *io_pins;int nr_io_pins; +struct regmap *regmap; };struct spacemit_pin_mux_config {
@@ -196,6 +216,28 @@ static int k1_get_io_type(struct udevice *dev, unsigned int selector)return -EINVAL ; } +static unsigned int spacemit_k1_pin_to_io_pd_offset (unsigned int pin) +{ +unsigned int offset =0 ; + +switch (pin) { + case 47 ... 52: + offset =IO_PWR_DOMAIN_GPIO3_K1 ; +break ; + case 75 ... 80: + offset = IO_PWR_DOMAIN_GPIO2_Kx; +break ; + case 98 ... 103: + offset =IO_PWR_DOMAIN_QSPI_K1 ; +break ; + case 104 ... 109: + offset = IO_PWR_DOMAIN_MMC_Kx; +break ; + } + +return offset; +} +/* use IO high level output current as the table */ static struct spacemit_pin_drv_strength spacemit_ds_1v8_tbl[4 ] = { {0 ,11 },
@@ -400,6 +442,35 @@ static const struct pinconf_param spacemit_pinconf_params[] = { { "power-source", PIN_CONFIG_POWER_SOURCE, U32_MAX }, }; +static void spacemit_set_io_power_domain (struct udevice *dev, +unsigned int pin, +unsigned int io_type) +{ +struct spacemit_pinctrl_priv *priv =dev_get_priv (dev); +struct spacemit_pinctrl_data *data; +unsigned int offset; +u32 val =0 ; + +if (!priv->regmap) +return ; + + data = (struct spacemit_pinctrl_data *)dev_get_driver_data (dev); +if (!data || !data->pin_to_io_pd_offset) +return ; + + offset = data->pin_to_io_pd_offset (pin); +if (!offset) +return ; + +if (io_type ==IO_TYPE_1V8 ) + val =IO_PWR_DOMAIN_V18EN ; + +regmap_write (priv->regmap,APBC_ASFAR ,APBC_ASFAR_AKEY ); +regmap_write (priv->regmap,APBC_ASSAR ,APBC_ASSAR_AKEY ); + +writel (val, priv->regs +IO_PWR_DOMAIN_OFFSET + offset); +} +static int spacemit_pinconf_set (struct udevice *dev,unsigned int pin_selector,unsigned int param,unsigned int argument) {
@@ -456,6 +527,9 @@ static int spacemit_pinconf_set(struct udevice *dev, unsigned int pin_selector,dev_err (dev,"Invalid power source (%d)\n" , argument);return -EINVAL ; } +if (found) +spacemit_set_io_power_domain (dev, pin_selector, + priv->io_pins[i].io_type);break ;default :return -EOPNOTSUPP ;
@@ -485,6 +559,11 @@ static int spacemit_pinctrl_probe(struct udevice *dev)dev_err (dev,"Fail to allocate memory\n" );return -ENOMEM ; } + priv->regmap =syscon_regmap_lookup_by_phandle (dev,"spacemit,apbc" ); +if (IS_ERR (priv->regmap)) { +dev_warn (dev,"no syscon found, disable IO power domain switching\n" ); + priv->regmap =NULL ; + } ret =clk_get_bulk (dev, &clks);if (ret) {
@@ -512,6 +591,7 @@ static const struct spacemit_pinctrl_data k1_pinctrl_data = { .get_pins = k1_get_pins, .get_functions = k1_get_functions, .get_io_type = k1_get_io_type, + .pin_to_io_pd_offset = spacemit_k1_pin_to_io_pd_offset, };static const struct udevice_id spacemit_pinctrl_ids[] = {
Signature · 1 line
2.51.0
Re: [PATCH v2 v2 1/8] pinctrl: k1: add IO power domain configuration support
Quoted 17 lines · Eric Chung
Dual-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.
Signed-off-by Eric Chung <[email protected]>--- drivers/pinctrl/spacemit/pinctrl-k1.c | 84 ++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 2 deletions(-)drivers/pinctrl/spacemit/pinctrl-k1.c +0
-0
...
drivers/pinctrl/spacemit/pinctrl-k1.c line 45
Quoted 13 lines
drivers/pinctrl/spacemit/pinctrl-k1.c +7
-2@@ -34,8 +36,24 @@#define PAD_PULLUP BIT(14)#define PAD_PULL_EN BIT(15) -#define PIN_POWER_STATE_1V8 1800 -#define PIN_POWER_STATE_3V3 3300 +#define IO_PWR_DOMAIN_OFFSET 0x800 + +#define IO_PWR_DOMAIN_GPIO2_Kx 0x0c +#define IO_PWR_DOMAIN_MMC_Kx 0x1c + +#define IO_PWR_DOMAIN_GPIO3_K1 0x10 +#define IO_PWR_DOMAIN_QSPI_K1 0x20
Why these four offsets aren't sorted?
Quoted 13 lines
drivers/pinctrl/spacemit/pinctrl-k1.c +10
-0+#define IO_PWR_DOMAIN_V18EN BIT(2) + +#define APBC_ASFAR 0x50 +#define APBC_ASSAR 0x54 + +#define APBC_ASFAR_AKEY 0xbaba +#define APBC_ASSAR_AKEY 0xeb10 + +#define PIN_POWER_STATE_1V8 1800 +#define PIN_POWER_STATE_3V3 3300enum spacemit_pin_io_type {IO_TYPE_NONE =0 ,
...
drivers/pinctrl/spacemit/pinctrl-k1.c static int spacemit_pinctrl_probe(struct udevice *dev) · line 562
Quoted 5 lines
drivers/pinctrl/spacemit/pinctrl-k1.c +1
-0@@ -485,6 +559,11 @@ static int spacemit_pinctrl_probe(struct udevice *dev)dev_err (dev,"Fail to allocate memory\n" );return -ENOMEM ; } + priv->regmap =syscon_regmap_lookup_by_phandle (dev,"spacemit,apbc" );
So with this patch, the driver depends on syscon symbols, and you should reflect this in Kconfig.
Regards,
Yao Zi
PATCH v2 2/8 mmc: sdhci: add quirk to enable CMD23 for multi-block transfers
In reply to Eric ChungIntroduce a controller-specific quirk to select CMD23 (SET_BLOCK_COUNT) for read/write multi-block operations instead of the legacy CMD18/CMD25 with open-ended or pre-defined block counts.
This allows SDHCI host controllers that support CMD23 to improve I/O efficiency by reducing the number of CMD12 (STOP_TRANSMISSION) commands for multi-block transfers.
--- drivers/mmc/mmc.c | 22 ++++++++++++++++++---- drivers/mmc/sdhci.c | 3 +++ include/mmc.h | 5 ++++- include/sdhci.h | 1 + 4 files changed, 26 insertions(+), 5 deletions(-)
drivers/mmc/mmc.c +18 -4
@@ -461,6 +461,15 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start,struct mmc_cmd cmd;struct mmc_data data; +if (IS_ENABLED (CONFIG_MMC_QUIRKS ) && + (mmc->quirks &MMC_QUIRK_BLK_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 +490,9 @@ 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 && +IS_ENABLED (CONFIG_MMC_QUIRKS ) && + !(mmc->quirks &MMC_QUIRK_BLK_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 +1447,9 @@ static int sd_get_capabilities(struct mmc *mmc)if (mmc->scr[0 ] &SD_DATA_4BIT ) mmc->card_caps |=MMC_MODE_4BIT ; +if (IS_ENABLED (CONFIG_MMC_QUIRKS ) && + !(mmc->scr[0 ] &SD_SCR_CMD23_SUPPORT )) + mmc->quirks &= ~MMC_QUIRK_BLK_CMD23 ;/* Version 1.0 doesn't support switching */ if (mmc->version ==SD_VERSION_1_0 )
@@ -2963,9 +2977,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);
drivers/mmc/sdhci.c +3 -0
@@ -741,6 +741,9 @@ static int sdhci_init(struct mmc *mmc) } }#endif +if (IS_ENABLED (CONFIG_MMC_QUIRKS ) && + (host->quirks &SDHCI_QUIRK_BLK_CMD23 )) + host->mmc->quirks |=MMC_QUIRK_BLK_CMD23 ;sdhci_set_power (host,fls (mmc->cfg->voltages) -1 );
include/mmc.h +4 -1
@@ -141,6 +141,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 +345,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 ,
include/sdhci.h +1 -0
@@ -256,6 +256,7 @@#define SDHCI_QUIRK_SUPPORT_SINGLE (1 << 10)/* Capability register bit-63 indicates HS400 support */ #define SDHCI_QUIRK_CAPS_BIT63_FOR_HS400 BIT(11) +#define SDHCI_QUIRK_BLK_CMD23 BIT(12)/* to make gcc happy */ struct sdhci_host ;
Signature · 1 line
2.51.0
Re: [PATCH v2 v2 2/8] mmc: sdhci: add quirk to enable CMD23 for multi-block transfers
Quoted 7 lines · Eric Chung
Introduce a controller-specific quirk to select CMD23 (
SET_BLOCK_COUNT) for read/write multi-block operations instead of the legacy CMD18/CMD25 with open-ended or pre-defined block counts.This allows SDHCI host controllers that support CMD23 to improve I/O efficiency by reducing the number of CMD12 (
STOP_TRANSMISSION) commands for multi-block transfers.
This is a misuse of the quirk mechanism.
CMD23 (SET_BLOCK_COUNT) is part of the SD/eMMC specification - it's the standard defined-length multi-block transfer method.
Quirks exist for hardware that deviates from spec, not for enabling spec-compliant behavior.
Regards
Peng
PATCH v2 3/8 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.
---
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 | 681 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 689 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 +681 -0
681 lines not on this page · raw message
Signature · 1 line
2.51.0
Re: [PATCH v2 v2 3/8] mmc: k1: add sdhci platform driver
Quoted 69 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]>---
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 | 681 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 689 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_STIbool "SDHCI support for STMicroelectronics SoC" depends on MMC_SDHCI && OF_CONTROL && ARCH_STIdrivers/mmc/Makefile +0
-0@@ -71,6 +71,7 @@ obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.oobj-$(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,681 @@ +// 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))
Please use the one in bitfield.h
Quoted 13 lines
drivers/mmc/spacemit_sdhci.c new file +13
-0+ + +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; +}; +
...
drivers/mmc/spacemit_sdhci.c line 523
Quoted 7 lines
drivers/mmc/spacemit_sdhci.c new file +7
-0+ +/* Wait for DLL lock */ + i =0 ; +while (i++ <100 ) { +if (sdhci_readl (host,SPACEMIT_SDHC_PHY_DLLSTS ) &SDHC_DLL_LOCK_STATE ) +break ; +udelay (10 );
Please use poll timeout.
drivers/mmc/spacemit_sdhci.c
Quoted 11 lines
drivers/mmc/spacemit_sdhci.c new file +11
-0+ } +if (i ==100 ) { +log_err ("%s: phy dll lock timeout\n" , host->name); +return -ETIMEDOUT ; + } +} + +static const struct udevice_id spacemit_sdhci_ids[] = { + { + .compatible ="spacemit,k1-sdhci" , + .data =0 ,
No need set .data as 0.
drivers/mmc/spacemit_sdhci.c line 669
Quoted 3 lines
drivers/mmc/spacemit_sdhci.c new file +3
-0+ }, { + } +};
Regards
Peng
PATCH v2 4/8 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.
---
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", "fast"; + 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 { /* fast */ + 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
Re: [PATCH v2 v2 4/8] dts: k1: add SD card support in u-boot overlay
Quoted 62 lines · Eric Chung
Add 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.
Signed-off-by Eric Chung <[email protected]>---
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 +17
-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>,
arch/riscv/dts/k1-bananapi-f3-u-boot.dtsi line 116
Quoted 10 lines
arch/riscv/dts/k1-bananapi-f3-u-boot.dtsi +10
-0+ <&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", "fast";
Still fast, while your driver and changelog says uhs.
Quoted 1 line
arch/riscv/dts/k1-bananapi-f3-u-boot.dtsi +1
-0+ pinctrl-0 = <&sdhci0_0_cfg>;
PATCH v2 5/8 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 v2 6/8 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.
--- board/spacemit/k1/MAINTAINERS | 2 +- doc/board/spacemit/index.rst | 1 + doc/board/spacemit/k1-flash.rst | 157 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 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-flash k1-spl
doc/board/spacemit/k1-flash.rst new file +157 -0
157 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v2 7/8 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 v2 8/8 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 | 50 ++++++++++--------------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-)
board/spacemit/k1/spl.c +10 -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/delay.h> #include <log.h>
@@ -73,39 +74,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;
@@ -117,9 +85,14 @@ 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"); + 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,
@@ -384,13 +357,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
Re: [PATCH v2 v2 8/8] spacemit: k1: load product name from environment variable
Quoted 63 lines · Eric Chung
Read the product name from the environment instead of EEPROM, as the EEPROM may not be programmed and the environment always contains this information.
Signed-off-by Eric Chung <[email protected]>---
board/spacemit/k1/spl.c| 50 ++++++++++---------------------------------------1 file changed, 10 insertions(+), 40 deletions(-)board/spacemit/k1/spl.c +1
-33@@ -12,6 +12,7 @@#include <configs/k1.h> #include <dm/device.h> #include <dm/uclass.h> +#include <env.h> #include <i2c.h> #include <linux/delay.h> #include <log.h> @@ -73,39 +74,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;@@ -117,9 +85,14 @@ static const struct {
board/spacemit/k1/spl.c static const struct { · line 94
Quoted 10 lines
board/spacemit/k1/spl.c +5
-1static 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" );
Need a NULL pointer check.
Quoted 2 lines
board/spacemit/k1/spl.c +1
-0+snprintf (product_name,I2C_BUF_SIZE ,"%s" , name);memset (fdt_name,0 ,I2C_BUF_SIZE );