From c9bf20016bd2e5c28052afc3da60d63e331f779c Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 2 Sep 2025 13:53:35 +0100 Subject: [PATCH] Revert "configs: Switch to the upstream SDHOST driver" This reverts commit cb6b027dcd8c3bc50009e6c653fd84cc76f49369. See: https://github.com/raspberrypi/linux/issues/7025 Signed-off-by: Phil Elwell --- arch/arm/configs/bcm2709_defconfig | 3 +-- arch/arm/configs/bcm2711_defconfig | 3 +-- arch/arm/configs/bcmrpi_defconfig | 3 +-- arch/arm64/configs/bcm2711_defconfig | 3 +-- arch/arm64/configs/bcm2711_rt_defconfig | 3 +-- arch/arm64/configs/bcm2712_defconfig | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig index ea3401686ee730..9a649b98776c01 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1306,11 +1306,10 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_SDHOST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SPI=m -CONFIG_MMC_HSQ=y -CONFIG_MMC_BCM2835=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_MULTICOLOR=m CONFIG_LEDS_PCA9532=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig index 464ce41e7e9945..83fd68f96442d1 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1350,12 +1350,11 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_SDHOST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_IPROC=y CONFIG_MMC_SPI=m -CONFIG_MMC_HSQ=y -CONFIG_MMC_BCM2835=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_MULTICOLOR=m CONFIG_LEDS_PCA9532=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig index d6b5cc40f2423b..983720233033ba 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1298,11 +1298,10 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_SDHOST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SPI=m -CONFIG_MMC_HSQ=y -CONFIG_MMC_BCM2835=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_MULTICOLOR=m CONFIG_LEDS_PCA9532=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 5136c7502e6243..5839aa93fb340a 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1409,13 +1409,12 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_SDHOST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_DWCMSHC=m CONFIG_MMC_SDHCI_IPROC=y CONFIG_MMC_SPI=m -CONFIG_MMC_HSQ=y -CONFIG_MMC_BCM2835=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_MULTICOLOR=m CONFIG_LEDS_PCA9532=m diff --git a/arch/arm64/configs/bcm2711_rt_defconfig b/arch/arm64/configs/bcm2711_rt_defconfig index c4e38416f0936a..3b03b3eac3b28e 100644 --- a/arch/arm64/configs/bcm2711_rt_defconfig +++ b/arch/arm64/configs/bcm2711_rt_defconfig @@ -1409,13 +1409,12 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_SDHOST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_DWCMSHC=m CONFIG_MMC_SDHCI_IPROC=y CONFIG_MMC_SPI=m -CONFIG_MMC_HSQ=y -CONFIG_MMC_BCM2835=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_MULTICOLOR=m CONFIG_LEDS_PCA9532=m diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig index 954cd1cbe6ab5b..5b6a2a6e3e1fe9 100644 --- a/arch/arm64/configs/bcm2712_defconfig +++ b/arch/arm64/configs/bcm2712_defconfig @@ -1411,13 +1411,12 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y +CONFIG_MMC_BCM2835_SDHOST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_DWCMSHC=m CONFIG_MMC_SDHCI_IPROC=y CONFIG_MMC_SPI=m -CONFIG_MMC_HSQ=y -CONFIG_MMC_BCM2835=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_MULTICOLOR=m CONFIG_LEDS_PCA9532=m