michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: disk: mmc_subsys: remove CONFIG_MMC_VOLUME_NAME

Browse source 
Remove CONFIG_MMC_VOLUME_NAME, and set the disk name based on the
``disk-name`` property. This aligns with other disk drivers, and allows
for multiple instances of the mmc_subsys disk driver to be registered.

Add disk-name properties for all in tree definitions for the
mmc-subsys disk driver, and change all in tree usage of the disk name

Fixes #75004

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2024-10-31 21:03:44 +00:00 • committed by Mahesh Mahadevan
commit 07a8e3253a
19 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/drivers/build_all/disk/spi.dtsi
View file

@ -17,6 +17,7 @@ sdhc@0 {
mmc {
compatible = "zephyr,mmc-disk";
disk-name = "SD2";
status = "okay";
};
};

2
tests/drivers/disk/disk_access/src/main.c
View file

@ -23,7 +23,7 @@
#if defined(CONFIG_DISK_DRIVER_SDMMC)
#define DISK_NAME_PHYS "SD"
#elif defined(CONFIG_DISK_DRIVER_MMC)
#define DISK_NAME_PHYS CONFIG_MMC_VOLUME_NAME
#define DISK_NAME_PHYS "SD2"
#elif defined(CONFIG_DISK_DRIVER_FLASH)
#define DISK_NAME_PHYS "NAND"
#elif defined(CONFIG_NVME)

2
tests/drivers/disk/disk_performance/src/main.c
View file

@ -15,7 +15,7 @@
#if defined(CONFIG_DISK_DRIVER_SDMMC)
#define DISK_NAME "SD"
#elif defined(CONFIG_DISK_DRIVER_MMC)
#define DISK_NAME CONFIG_MMC_VOLUME_NAME
#define DISK_NAME "SD2"
#elif defined(CONFIG_NVME)
#define DISK_NAME "nvme0n0"
#else

2
tests/lib/gui/lvgl/src/main.c
View file

@ -20,7 +20,7 @@
#ifdef CONFIG_DISK_DRIVER_SDMMC
#define DISK_NAME "SD"
#elif defined(CONFIG_DISK_DRIVER_MMC)
#define DISK_NAME CONFIG_MMC_VOLUME_NAME
#define DISK_NAME "SD2"
#else
#error "No disk device defined, is your board supported?"
#endif /* CONFIG_DISK_DRIVER_SDMMC */

1
tests/subsys/fs/fat_fs_api/prj_mmc.conf
View file

@ -4,5 +4,4 @@ CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_SPI=y
CONFIG_GPIO=y
CONFIG_ZTEST=y
CONFIG_MMC_VOLUME_NAME="NAND"
CONFIG_MAIN_STACK_SIZE=4096

2
tests/subsys/fs/fat_fs_api/src/test_fat.h
View file

@ -18,7 +18,7 @@
#elif defined(CONFIG_DISK_DRIVER_SDMMC)
#define DISK_NAME "SD"
#elif defined(CONFIG_DISK_DRIVER_MMC)
#define DISK_NAME CONFIG_MMC_VOLUME_NAME
#define DISK_NAME "SD2"
#else
#error "Failed to select DISK access type"
#endif