Commit 3ed22a35 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a0bdd554 d3ecb12e

Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ properties: 
patternProperties:

  "^sdhci@[0-9a-f]+$":

    type: object

    $ref: mmc-controller.yaml

    $ref: sdhci-common.yaml

    unevaluatedProperties: false



    properties:

drivers/mmc/host/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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.

drivers/mmc/host/sdhci-of-arasan.c

+1 −1
Original line number Diff line number Diff line
@@ -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



/**