From ba2e270693005694b92b2df40844a3919cd0ad50 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 13 Jan 2025 15:07:56 +0000 Subject: [PATCH] configs: Switch to the upstream SDHOST driver Now that the upstream driver is overclockable, switch to using it in preference of the downstream driver (which can be deleted by a followup commit). 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/bcm2712_defconfig | 3 ++- arch/arm64/configs/bcmrpi3_defconfig | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig index 984499e0107b8..e8f2da5c9141e 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -1283,10 +1283,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_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 f21442c5328eb..29c19c0a35191 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -1311,11 +1311,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_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 d7a15995b00c2..1c060ec754e5f 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -1275,10 +1275,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_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 ec68f0595d82a..9a8e3d167fd36 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1366,12 +1366,13 @@ 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 7579f2032e0f5..2567adec4d942 100644 --- a/arch/arm64/configs/bcm2712_defconfig +++ b/arch/arm64/configs/bcm2712_defconfig @@ -1368,12 +1368,13 @@ 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/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig index 019d42e79fdcb..6e4e66baae1a5 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1257,11 +1257,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_IPROC=m 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