tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 3ed22a35 a0bdd554

+4 -4
+1 -1
Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
··· 41 41 patternProperties: 42 42 "^sdhci@[0-9a-f]+$": 43 43 type: object 44 - $ref: mmc-controller.yaml 44 + $ref: sdhci-common.yaml 45 45 unevaluatedProperties: false 46 46 47 47 properties:
+2 -2
drivers/mmc/host/Kconfig
··· 315 315 316 316 config MMC_SDHCI_ESDHC_IMX 317 317 tristate "SDHCI support for the Freescale eSDHC/uSDHC i.MX controller" 318 - depends on ARCH_MXC || COMPILE_TEST 318 + depends on ARCH_MXC || ARCH_S32 || COMPILE_TEST 319 319 depends on MMC_SDHCI_PLTFM 320 320 depends on OF 321 321 select MMC_SDHCI_IO_ACCESSORS 322 322 select MMC_CQHCI 323 323 help 324 324 This selects the Freescale eSDHC/uSDHC controller support 325 - found on i.MX25, i.MX35 i.MX5x and i.MX6x. 325 + found on i.MX25, i.MX35, i.MX5x, i.MX6x, and S32G. 326 326 327 327 If you have a controller with this interface, say Y or M here. 328 328
+1 -1
drivers/mmc/host/sdhci-of-arasan.c
··· 99 99 #define HIWORD_UPDATE(val, mask, shift) \ 100 100 ((val) << (shift) | (mask) << ((shift) + 16)) 101 101 102 - #define CD_STABLE_TIMEOUT_US 1000000 102 + #define CD_STABLE_TIMEOUT_US 2000000 103 103 #define CD_STABLE_MAX_SLEEP_US 10 104 104 105 105 /**