From 69a5f07d162d0d45ec7904dccf709238c788c2a2 Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Wed, 24 Feb 2021 09:56:01 +0100 Subject: [PATCH] drivers: disk: cleanup after driver relocation Add common SDMMC_LOG_LEVEL and SDMMC_VOLUME_NAME. Initialize drivers at POST_KERNEL level. Update CODEOWNERS after sdmmc drivers relocation. Signed-off-by: Johann Fischer --- CODEOWNERS | 9 +++++---- drivers/disk/sdmmc_sdhc.h | 6 +++--- drivers/disk/sdmmc_spi.c | 8 ++++---- drivers/disk/sdmmc_stm32.c | 8 ++++---- drivers/disk/usdhc.c | 12 +++++------- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 5e94c9f4612..2259fba81cf 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -275,6 +275,11 @@ /drivers/serial/*xmc4xxx* @parthitce /drivers/serial/*nuvoton* @ssekar15 /drivers/serial/*apbuart* @martin-aberg +/drivers/disk/ @jfischer-no +/drivers/disk/sdmmc_sdhc.h @JunYangNXP +/drivers/disk/sdmmc_spi.c @JunYangNXP +/drivers/disk/usdhc.c @JunYangNXP +/drivers/disk/sdmmc_stm32.c @anthonybrandon /drivers/net/ @jukkar @tbursztyka /drivers/ptp_clock/ @jukkar /drivers/spi/ @tbursztyka @@ -556,10 +561,6 @@ /subsys/tracing/ @nashif /subsys/debug/asan_hacks.c @vanwinkeljan @aescolar @daor-oti /subsys/demand_paging/ @dcpleung @nashif -/subsys/disk/disk_access_spi_sdhc.c @JunYangNXP -/subsys/disk/disk_access_sdhc.h @JunYangNXP -/subsys/disk/disk_access_usdhc.c @JunYangNXP -/subsys/disk/disk_access_stm32_sdmmc.c @anthonybrandon /subsys/emul/ @sjg20 /subsys/fb/ @jfischer-no /subsys/fs/ @nashif diff --git a/drivers/disk/sdmmc_sdhc.h b/drivers/disk/sdmmc_sdhc.h index 133e449220c..533984a1604 100644 --- a/drivers/disk/sdmmc_sdhc.h +++ b/drivers/disk/sdmmc_sdhc.h @@ -5,8 +5,8 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#ifndef ZEPHYR_INCLUDE_DISK_ACCESS_SDHC_H_ -#define ZEPHYR_INCLUDE_DISK_ACCESS_SDHC_H_ +#ifndef ZEPHYR_INCLUDE_DISK_DRIVER_SDMMC_H_ +#define ZEPHYR_INCLUDE_DISK_DRIVER_SDMMC_H_ #include @@ -745,4 +745,4 @@ static inline void sdhc_decode_cid(struct sd_cid *cid, cid->date = (uint16_t)((raw_cid[0U] & 0xFFF00U) >> 8U); } -#endif /*ZEPHYR_INCLUDE_DISK_ACCESS_SDHC_H_*/ +#endif /*ZEPHYR_INCLUDE_DISK_DRIVER_SDMMC_H_*/ diff --git a/drivers/disk/sdmmc_spi.c b/drivers/disk/sdmmc_spi.c index 4ba82eaeacf..03dbc1f2281 100644 --- a/drivers/disk/sdmmc_spi.c +++ b/drivers/disk/sdmmc_spi.c @@ -8,14 +8,14 @@ #include -LOG_MODULE_REGISTER(sdhc_spi, CONFIG_DISK_LOG_LEVEL); +LOG_MODULE_REGISTER(sdmmc_spi, CONFIG_SDMMC_LOG_LEVEL); #include #include #include #include #include -#include "disk_access_sdhc.h" +#include "sdmmc_sdhc.h" /* Clock speed used during initialisation */ #define SDHC_SPI_INITIAL_SPEED 400000 @@ -962,7 +962,7 @@ static const struct disk_operations spi_sdhc_disk_ops = { }; static struct disk_info spi_sdhc_disk = { - .name = CONFIG_DISK_SDHC_VOLUME_NAME, + .name = CONFIG_SDMMC_VOLUME_NAME, .ops = &spi_sdhc_disk_ops, }; @@ -981,5 +981,5 @@ static struct sdhc_spi_data sdhc_spi_data_0; DEVICE_DT_INST_DEFINE(0, sdhc_spi_init, device_pm_control_nop, &sdhc_spi_data_0, NULL, - APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL); + POST_KERNEL, CONFIG_SDMMC_INIT_PRIORITY, NULL); #endif diff --git a/drivers/disk/sdmmc_stm32.c b/drivers/disk/sdmmc_stm32.c index 2d404552c1c..18e285a1aea 100644 --- a/drivers/disk/sdmmc_stm32.c +++ b/drivers/disk/sdmmc_stm32.c @@ -16,7 +16,7 @@ #include #include -LOG_MODULE_REGISTER(stm32_sdmmc); +LOG_MODULE_REGISTER(stm32_sdmmc, CONFIG_SDMMC_LOG_LEVEL); struct stm32_sdmmc_priv { SD_HandleTypeDef hsd; @@ -210,7 +210,7 @@ static const struct disk_operations stm32_sdmmc_ops = { }; static struct disk_info stm32_sdmmc_info = { - .name = CONFIG_DISK_STM32_SDMMC_VOLUME_NAME, + .name = CONFIG_SDMMC_VOLUME_NAME, .ops = &stm32_sdmmc_ops, }; @@ -429,7 +429,7 @@ static struct stm32_sdmmc_priv stm32_sdmmc_priv_1 = { }; DEVICE_DT_INST_DEFINE(0, disk_stm32_sdmmc_init, device_pm_control_nop, - &stm32_sdmmc_priv_1, NULL, APPLICATION, - CONFIG_KERNEL_INIT_PRIORITY_DEVICE, + &stm32_sdmmc_priv_1, NULL, POST_KERNEL, + CONFIG_SDMMC_INIT_PRIORITY, NULL); #endif diff --git a/drivers/disk/usdhc.c b/drivers/disk/usdhc.c index 07378a3172e..606c65b77a5 100644 --- a/drivers/disk/usdhc.c +++ b/drivers/disk/usdhc.c @@ -1,5 +1,3 @@ -/* disk_access_usdhc.c - NXP USDHC driver*/ - /* * Copyright (c) 2019 NXP * @@ -15,10 +13,10 @@ #include #include -#include "disk_access_sdhc.h" +#include "sdmmc_sdhc.h" #include -LOG_MODULE_REGISTER(usdhc, LOG_LEVEL_INF); +LOG_MODULE_REGISTER(usdhc, CONFIG_SDMMC_LOG_LEVEL); enum usdhc_cmd_type { USDHC_CMD_TYPE_NORMAL = 0U, @@ -2783,7 +2781,7 @@ static const struct disk_operations usdhc_disk_ops = { }; static struct disk_info usdhc_disk = { - .name = CONFIG_DISK_SDHC_VOLUME_NAME, + .name = CONFIG_SDMMC_VOLUME_NAME, .ops = &usdhc_disk_ops, }; @@ -2844,8 +2842,8 @@ static int disk_usdhc_init(const struct device *dev) device_pm_control_nop, \ &usdhc_priv_##n, \ &usdhc_config_##n, \ - APPLICATION, \ - CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ + POST_KERNEL, \ + CONFIG_SDMMC_INIT_PRIORITY, \ NULL); DT_INST_FOREACH_STATUS_OKAY(DISK_ACCESS_USDHC_INIT)