adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

disk: sdmmc: power off card in DISK_IOCTL_CTRL_DEINIT

Browse source 
Power off the SD card in `DISK_IOCTL_CTRL_DEINIT`, instead of only
waiting for the card to be idle then doing nothing. This is a safer
state for `DISK_IOCTL_CTRL_DEINIT`, which is documented as preparing the
disk to be removed from the system. It also has the advantage of
lowering power consumption while de-initialized.

Signed-off-by: Jordan Yates <jordan@embeint.com>
This commit is contained in:
Jordan Yates 2024-08-18 16:29:33 +10:00 committed by Anas Nashif
parent 6eb1e652de
commit 2c52f9ee6e
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/disk/sdmmc_subsys.c
View file

@ -93,12 +93,9 @@ static int disk_sdmmc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *bu
case DISK_IOCTL_CTRL_INIT:
return disk_sdmmc_access_init(disk);
case DISK_IOCTL_CTRL_DEINIT:
sdmmc_ioctl(&data->card, DISK_IOCTL_CTRL_SYNC, NULL);
/* sd_init() will toggle power to SDMMC, so we can just mark
* disk as uninitialized
*/
/* Card will be uninitialized after DEINIT */
data->status = SD_UNINIT;
return 0;
return sdmmc_ioctl(&data->card, DISK_IOCTL_CTRL_DEINIT, NULL);
default:
return sdmmc_ioctl(&data->card, cmd, buf);
}

10
subsys/sd/sd_ops.c
View file

@ -795,6 +795,16 @@ int card_ioctl(struct sd_card *card, uint8_t cmd, void *buf)
*/
ret = sdmmc_wait_ready(card);
break;
case DISK_IOCTL_CTRL_DEINIT:
/* Ensure card is not busy with data write */
ret = sdmmc_wait_ready(card);
if (ret < 0) {
LOG_WRN("Card busy when powering off");
}
/* Power down the card */
card->bus_io.power_mode = SDHC_POWER_OFF;
ret = sdhc_set_io(card->sdhc, &card->bus_io);
break;
default:
ret = -ENOTSUP;
}