drivers: disk: remove legacy nxp USDHC driver

all in tree SOCs with the USDHC peripheral have now been converted to
use the new SD host controller USDHC driver, so remove legacy NXP disk
USDHC driver.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2022-04-01 16:17:16 -05:00 committed by David Leach
commit 409cc23022
6 changed files with 1 additions and 3139 deletions

View file

@ -10,7 +10,6 @@ zephyr_library_sources_ifdef(CONFIG_DISK_DRIVER_RAM ramdisk.c)
zephyr_library_sources_ifdef(CONFIG_SDMMC_OVER_SPI sdmmc_spi.c) zephyr_library_sources_ifdef(CONFIG_SDMMC_OVER_SPI sdmmc_spi.c)
zephyr_library_sources_ifdef(CONFIG_SDMMC_STM32 sdmmc_stm32.c) zephyr_library_sources_ifdef(CONFIG_SDMMC_STM32 sdmmc_stm32.c)
zephyr_library_sources_ifdef(CONFIG_SDMMC_USDHC usdhc.c)
zephyr_library_sources_ifdef(CONFIG_SDMMC_SUBSYS sdmmc_subsys.c) zephyr_library_sources_ifdef(CONFIG_SDMMC_SUBSYS sdmmc_subsys.c)
endif() endif()

View file

@ -3,7 +3,6 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
DT_COMPAT_ZEPHYR_MMC_SPI_SLOT := zephyr,mmc-spi-slot DT_COMPAT_ZEPHYR_MMC_SPI_SLOT := zephyr,mmc-spi-slot
DT_COMPAT_NXP_USDHC := nxp,imx-usdhc
DT_COMPAT_ST_STM32_SDMMC := st,stm32-sdmmc DT_COMPAT_ST_STM32_SDMMC := st,stm32-sdmmc
DT_COMPAT_ZEPHYR_MMC := zephyr,sdmmc-disk DT_COMPAT_ZEPHYR_MMC := zephyr,sdmmc-disk
@ -42,18 +41,6 @@ config SDMMC_SUBSYS
help help
Enable SDMMC access via SD subsystem Enable SDMMC access via SD subsystem
config SDMMC_USDHC
bool "NXP i.MXRT USDHC driver"
depends on (HAS_MCUX_USDHC1 || HAS_MCUX_USDHC2)
default $(dt_compat_enabled,$(DT_COMPAT_NXP_USDHC))
help
File system on a SDHC card accessed over
NXP USDHC.
if SDMMC_USDHC
source "drivers/disk/Kconfig.usdhc"
endif
config SDMMC_STM32 config SDMMC_STM32
bool "STM32 SDMMC driver" bool "STM32 SDMMC driver"
depends on HAS_STM32CUBE depends on HAS_STM32CUBE

View file

@ -1,18 +0,0 @@
# Copyright (c) 2021 NXP
# SPDX-License-Identifier: Apache-2.0
# USDHC peripheral require the SD card to power cycle after DAT3 is
# pulled low
config SDMMC_USDHC_DAT3_PWR_TOGGLE
bool
help
USDHC peripheral requires the SD card power to be cycled after DAT3 is
pulled high, before the USDHC peripheral can detect the SD card via DAT3
pull
config SDMMC_USDHC_DAT3_PWR_DELAY
int
default 0
help
Period in milliseconds to delay between powering off the SD card and
applying power again, whenever the SD card power will be cycled.

File diff suppressed because it is too large Load diff

View file

@ -1,48 +0,0 @@
# Copyright (c) 2019, NXP
# SPDX-License-Identifier: Apache-2.0
description: NXP i.MXRT USDHC module
compatible: "nxp,imx-usdhc"
include: [mmc.yaml, pinctrl-device.yaml]
properties:
clocks:
required: true
pwr-gpios:
type: phandle-array
required: false
description: |
Power pin
This pin defaults to active high when consumed by the SD card. The
property value should ensure the flags properly describe the signal
that is presented to the driver.
cd-gpios:
type: phandle-array
required: false
description: |
Detect pin
This pin defaults to active low when produced by the SD card. The
property value should ensure the flags properly describe the signal
that is presented to the driver.
no-1-8-v:
type: boolean
required: false
description: |
When the external SD card circuit does not support 1.8V, add this
property to disable 1.8v card voltage of SD card controller.
detect-dat3:
type: boolean
required: false
description: |
Enable the host to detect an SD card via the DAT3 line of the SD card
connection. Requires the board to define a function to pull DAT3 low or
high using pullup/pulldown resistors.
label:
required: true

View file

@ -3,7 +3,7 @@ tests:
harness: ztest harness: ztest
harness_config: harness_config:
fixture: fixture_sdhc fixture: fixture_sdhc
filter: CONFIG_SDMMC_USDHC filter: CONFIG_SDHC
tags: disk mcux tags: disk mcux
integration_platforms: integration_platforms:
- mimxrt1060_evk - mimxrt1060_evk