RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 23:12:45 +01:00
Code Releases Activity

cpu/sam0_common/periph/sdhc: always use 25 MHz

Browse Source
This commit is contained in:
Benjamin Valentin 2023-06-20 12:46:30 +02:00
parent 0f555f061f
commit 84ceea33d0
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/sam0_common/include/sdhc.h
View File

@ -95,6 +95,7 @@ typedef struct {
/** This SD stack uses the maximum block size authorized (512 bytes) */ /** This SD stack uses the maximum block size authorized (512 bytes) */
#define SD_MMC_BLOCK_SIZE 512 /**< SD card block size */ #define SD_MMC_BLOCK_SIZE 512 /**< SD card block size */
#define SDHC_SLOW_CLOCK_HZ 400000 /**< Clock frequency on init */ #define SDHC_SLOW_CLOCK_HZ 400000 /**< Clock frequency on init */
#define SDHC_FAST_CLOCK_HZ 25000000 /**< Clock frequency after init */
/** /**
* @brief Initialize the SD host controller * @brief Initialize the SD host controller

14
cpu/sam0_common/sam0_sdhc/sdhc.c
View File

@ -103,12 +103,6 @@ static bool _init_transfer(sdhc_state_t *state, uint32_t cmd, uint32_t arg, uint
uint16_t num_blocks); uint16_t num_blocks);
static bool sdio_test_type(sdhc_state_t *state); static bool sdio_test_type(sdhc_state_t *state);
/** SD/MMC transfer rate unit codes (10K) list */
static const uint32_t transfer_units[] = { 10, 100, 1000, 10000, 0, 0, 0, 0 };
/** SD transfer multiplier factor codes (1/10) list */
static const uint8_t transfer_multiplier[16] =
{ 0, 10, 12, 13, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 70, 80 };
static bool _card_detect(sdhc_state_t *state) static bool _card_detect(sdhc_state_t *state)
{ {
return state->dev->PSR.bit.CARDINS; return state->dev->PSR.bit.CARDINS;
@ -369,6 +363,9 @@ int sdhc_init(sdhc_state_t *state)
goto out; goto out;
} }
/* all SD Cards should support this clock at that point */
state->clock = SDHC_FAST_CLOCK_HZ;
/* update the host controller to the detected changes in bus_width and clock */ /* update the host controller to the detected changes in bus_width and clock */
_set_hc(state); _set_hc(state);
@ -567,7 +564,6 @@ static bool _test_capacity(sdhc_state_t *state)
{ {
alignas(uint32_t) alignas(uint32_t)
uint8_t csd[CSD_REG_BSIZE]; uint8_t csd[CSD_REG_BSIZE];
uint32_t transfer_speed;
if (!sdhc_send_cmd(state, SDMMC_MCI_CMD9_SEND_CSD, (uint32_t)state->rca << 16)) { if (!sdhc_send_cmd(state, SDMMC_MCI_CMD9_SEND_CSD, (uint32_t)state->rca << 16)) {
return false; return false;
@ -576,9 +572,7 @@ static bool _test_capacity(sdhc_state_t *state)
uint32_t *csd32 = (void *)csd; uint32_t *csd32 = (void *)csd;
csd32[i] = __builtin_bswap32(SDHC_DEV->RR[3 - i].reg); csd32[i] = __builtin_bswap32(SDHC_DEV->RR[3 - i].reg);
} }
transfer_speed = CSD_TRAN_SPEED(&csd[1]);
state->clock = transfer_units[transfer_speed & 0x7] *
transfer_multiplier[(transfer_speed >> 3) & 0xF] * 1000;
/* /*
* Card Capacity. * Card Capacity.
* ---------------------------------------------------- * ----------------------------------------------------