Skip to contentSkip to conversation

FAILED: patch "[PATCH] mmc: sdhci_am654: 'select', not 'depends' REGMAP_MMIO" failed to apply to 5.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 31, 2022

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

8d280b1df87e ("mmc: sdhci_am654: 'select', not 'depends' REGMAP_MMIO") f545702b74f9 ("mmc: sdhci_am654: Add Support for Command Queuing Engine to J721E")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 8d280b1df87e0b3d1355aeac7e62b62214b93f1c Mon Sep 17 00:00:00 2001
From: Brian Norris <[email protected]>
Date: Mon, 24 Oct 2022 11:02:59 -0700
Subject: [PATCH] mmc: sdhci_am654: 'select', not 'depends' REGMAP_MMIO

REGMAP_MMIO is not user-configurable, so we can only satisfy this dependency by enabling some other Kconfig symbol that properly 'select's it. Use select like everybody else.

Noticed when trying to enable this driver for compile testing.

Fixes 59592cc1f593 ("mmc: sdhci_am654: Add dependency on MMC_SDHCI_AM654")
drivers/mmc/host/Kconfig +2 -1
index f324daadaf70..fb1062a6394c 100644
@@ -1075,9 +1075,10 @@ config MMC_SDHCI_OMAP
 
 config MMC_SDHCI_AM654
 	tristate "Support for the SDHCI Controller in TI's AM654 SOCs"
-	depends on MMC_SDHCI_PLTFM && OF && REGMAP_MMIO
+	depends on MMC_SDHCI_PLTFM && OF
 	select MMC_SDHCI_IO_ACCESSORS
 	select MMC_CQHCI
+	select REGMAP_MMIO
 	help
 	  This selects the Secure Digital Host Controller Interface (SDHCI)
 	  support present in TI's AM654 SOCs. The controller supports