From 67a60d77dd31b4b3172a7fe855f932df776ae5fa Mon Sep 17 00:00:00 2001 From: Jukka Laitinen Date: Mon, 3 Oct 2022 12:03:19 +0400 Subject: [PATCH] arch/risc-v/src/mpfs: Add a configuration flag for SD-card card detect line Make existence of the card detect line configurable Signed-off-by: Jukka Laitinen --- arch/risc-v/src/mpfs/Kconfig | 6 ++++++ arch/risc-v/src/mpfs/mpfs_emmcsd.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/arch/risc-v/src/mpfs/Kconfig b/arch/risc-v/src/mpfs/Kconfig index 4e2f1dee912..d426bdbee29 100644 --- a/arch/risc-v/src/mpfs/Kconfig +++ b/arch/risc-v/src/mpfs/Kconfig @@ -181,6 +181,12 @@ config MPFS_EMMCSD_MUX_EMMC endchoice +config MPFS_EMMCSD_CD + bool "Board supports card detect" + default y + ---help--- + Set to n if SD-card detect line is not connected + config MPFS_ROMFS_MOUNT bool "Mount the ROMFS file system" depends on FS_ROMFS diff --git a/arch/risc-v/src/mpfs/mpfs_emmcsd.c b/arch/risc-v/src/mpfs/mpfs_emmcsd.c index 1384be71bb7..972a02d1955 100644 --- a/arch/risc-v/src/mpfs/mpfs_emmcsd.c +++ b/arch/risc-v/src/mpfs/mpfs_emmcsd.c @@ -1448,7 +1448,9 @@ static bool mpfs_device_reset(struct sdio_dev_s *dev) irqstate_t flags; uint32_t regval; uint32_t cap; +#ifdef CONFIG_MPFS_EMMCSD_CD uint32_t srs09; +#endif bool retval = true; int status = MPFS_EMMCSD_INITIALIZED; @@ -1600,6 +1602,7 @@ static bool mpfs_device_reset(struct sdio_dev_s *dev) /* Card state stable */ +#ifdef CONFIG_MPFS_EMMCSD_CD srs09 = getreg32(MPFS_EMMCSD_SRS09); DEBUGASSERT(srs09 & MPFS_EMMCSD_SRS09_CSS); @@ -1614,6 +1617,7 @@ static bool mpfs_device_reset(struct sdio_dev_s *dev) retval = false; } } +#endif /* Set 1-bit bus mode */