jsauer/torvalds-linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-11 17:10:13 +00:00
Code

MMC host:

Browse Source 
- sdhci-esdhc-imx: Fix build problem dependency
  - sdhci-of-arasan: Increase card-detect stable timeout to 2 seconds
  - sdhci-of-aspeed: Fix DT doc for missing properties
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAmlFMZUXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjClbOQ/+M9kex8JbIMrUX/v+mUwIntrV
 A6BCm3ISaxvhREuabtsl7hhXfgSpRJUv/xGAHwqOYSSiGWilKYUZQDgpq54As3Xr
 4Yc2m8nO65z/SZ9hcweZFHsFut3bc2S59Bz7GB1IxaNbzFAVOiHm1N4fsc778Ts5
 66yWdpJRh+Vff0achXo/sCZnW/OC4N6o/hGSfey9lItTDaUdkGmTcfZwde9ln8kl
 olwbkXZMF9690WLg1x+PfXtOr2x/2OVRIa9BBdrVpiL+9Q5Dcvy5rxe/KMJMFnTt
 uLMq3eMS4+vitWxibqcweTEFK14H6wLWYmtQGUM1ykdLc+Il01XXCb9s54RjzlRG
 wy6J71VWWUoGgQ7iXBgiVBqCUBpJX7tk9WJpKYHdq/z9FxlbTLzOttOuAsEvBZgB
 LRbEJUCf8njI9KBAQsGtZbAltl/7Jae0xLkuHHS7btPko2OqTJYkxr4zNbpho5OU
 jFJHZvo1QIdCLxlZ6zPZq9WrUPNeXLRb2COnHGV2g24Bd+2J5HcswWRqifFB9LT8
 iusP4SrpuXfQnEuYoonFPYhl5pXguNf0GELzzmxRYEJkVAirNFfHUrXZNMK9sgtH
 BoPjY0NFDWJl42ciloMC4um57msyCzm+C54AHZmpAzggj5HVMffdHL2M7A5566c2
 HtFZUJ+IR7x7Vh+rggg=
 =Jxc1
 -----END PGP SIGNATURE-----

Merge tag 'mmc-v6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC host fixes from Ulf Hansson:

 - sdhci-esdhc-imx: Fix build problem dependency

 - sdhci-of-arasan: Increase card-detect stable timeout to 2 seconds

 - sdhci-of-aspeed: Fix DT doc for missing properties

* tag 'mmc-v6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-esdhc-imx: add alternate ARCH_S32 dependency to Kconfig
  mmc: sdhci-of-arasan: Increase CD stable timeout to 2 seconds
  dt-bindings: mmc: sdhci-of-aspeed: Switch ref to sdhci-common.yaml
This commit is contained in:
Linus Torvalds 2025-12-20 12:18:32 -08:00
commit 3ed22a356c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
View File

@ -41,7 +41,7 @@ properties:
patternProperties:
"^sdhci@[0-9a-f]+$":
type: object
$ref: mmc-controller.yaml
$ref: sdhci-common.yaml
unevaluatedProperties: false
properties:

4
drivers/mmc/host/Kconfig
View File

@ -315,14 +315,14 @@ config MMC_SDHCI_ESDHC_MCF
config MMC_SDHCI_ESDHC_IMX
tristate "SDHCI support for the Freescale eSDHC/uSDHC i.MX controller"
depends on ARCH_MXC || COMPILE_TEST
depends on ARCH_MXC || ARCH_S32 || COMPILE_TEST
depends on MMC_SDHCI_PLTFM
depends on OF
select MMC_SDHCI_IO_ACCESSORS
select MMC_CQHCI
help
This selects the Freescale eSDHC/uSDHC controller support
found on i.MX25, i.MX35 i.MX5x and i.MX6x.
found on i.MX25, i.MX35, i.MX5x, i.MX6x, and S32G.
If you have a controller with this interface, say Y or M here.

2
drivers/mmc/host/sdhci-of-arasan.c
View File

@ -99,7 +99,7 @@
#define HIWORD_UPDATE(val, mask, shift) \
((val) << (shift) | (mask) << ((shift) + 16))
#define CD_STABLE_TIMEOUT_US 1000000
#define CD_STABLE_TIMEOUT_US 2000000
#define CD_STABLE_MAX_SLEEP_US 10
/**