Skip to content

Commit 021a8ee

Browse files
committed
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 <phil@raspberrypi.com>
1 parent 3fd2d18 commit 021a8ee

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

arch/arm/configs/bcm2709_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,10 +1282,11 @@ CONFIG_MMC=y
12821282
CONFIG_MMC_BLOCK_MINORS=32
12831283
CONFIG_MMC_BCM2835_MMC=y
12841284
CONFIG_MMC_BCM2835_DMA=y
1285-
CONFIG_MMC_BCM2835_SDHOST=y
12861285
CONFIG_MMC_SDHCI=y
12871286
CONFIG_MMC_SDHCI_PLTFM=y
12881287
CONFIG_MMC_SPI=m
1288+
CONFIG_MMC_HSQ=y
1289+
CONFIG_MMC_BCM2835=y
12891290
CONFIG_LEDS_CLASS=y
12901291
CONFIG_LEDS_CLASS_MULTICOLOR=m
12911292
CONFIG_LEDS_PCA9532=m

arch/arm/configs/bcm2711_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1310,11 +1310,12 @@ CONFIG_MMC=y
13101310
CONFIG_MMC_BLOCK_MINORS=32
13111311
CONFIG_MMC_BCM2835_MMC=y
13121312
CONFIG_MMC_BCM2835_DMA=y
1313-
CONFIG_MMC_BCM2835_SDHOST=y
13141313
CONFIG_MMC_SDHCI=y
13151314
CONFIG_MMC_SDHCI_PLTFM=y
13161315
CONFIG_MMC_SDHCI_IPROC=y
13171316
CONFIG_MMC_SPI=m
1317+
CONFIG_MMC_HSQ=y
1318+
CONFIG_MMC_BCM2835=y
13181319
CONFIG_LEDS_CLASS=y
13191320
CONFIG_LEDS_CLASS_MULTICOLOR=m
13201321
CONFIG_LEDS_PCA9532=m

arch/arm/configs/bcmrpi_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,10 +1274,11 @@ CONFIG_MMC=y
12741274
CONFIG_MMC_BLOCK_MINORS=32
12751275
CONFIG_MMC_BCM2835_MMC=y
12761276
CONFIG_MMC_BCM2835_DMA=y
1277-
CONFIG_MMC_BCM2835_SDHOST=y
12781277
CONFIG_MMC_SDHCI=y
12791278
CONFIG_MMC_SDHCI_PLTFM=y
12801279
CONFIG_MMC_SPI=m
1280+
CONFIG_MMC_HSQ=y
1281+
CONFIG_MMC_BCM2835=y
12811282
CONFIG_LEDS_CLASS=y
12821283
CONFIG_LEDS_CLASS_MULTICOLOR=m
12831284
CONFIG_LEDS_PCA9532=m

arch/arm64/configs/bcm2711_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1366,12 +1366,13 @@ CONFIG_MMC=y
13661366
CONFIG_MMC_BLOCK_MINORS=32
13671367
CONFIG_MMC_BCM2835_MMC=y
13681368
CONFIG_MMC_BCM2835_DMA=y
1369-
CONFIG_MMC_BCM2835_SDHOST=y
13701369
CONFIG_MMC_SDHCI=y
13711370
CONFIG_MMC_SDHCI_PLTFM=y
13721371
CONFIG_MMC_SDHCI_OF_DWCMSHC=m
13731372
CONFIG_MMC_SDHCI_IPROC=y
13741373
CONFIG_MMC_SPI=m
1374+
CONFIG_MMC_HSQ=y
1375+
CONFIG_MMC_BCM2835=y
13751376
CONFIG_LEDS_CLASS=y
13761377
CONFIG_LEDS_CLASS_MULTICOLOR=m
13771378
CONFIG_LEDS_PCA9532=m

arch/arm64/configs/bcm2712_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1368,12 +1368,13 @@ CONFIG_MMC=y
13681368
CONFIG_MMC_BLOCK_MINORS=32
13691369
CONFIG_MMC_BCM2835_MMC=y
13701370
CONFIG_MMC_BCM2835_DMA=y
1371-
CONFIG_MMC_BCM2835_SDHOST=y
13721371
CONFIG_MMC_SDHCI=y
13731372
CONFIG_MMC_SDHCI_PLTFM=y
13741373
CONFIG_MMC_SDHCI_OF_DWCMSHC=m
13751374
CONFIG_MMC_SDHCI_IPROC=y
13761375
CONFIG_MMC_SPI=m
1376+
CONFIG_MMC_HSQ=y
1377+
CONFIG_MMC_BCM2835=y
13771378
CONFIG_LEDS_CLASS=y
13781379
CONFIG_LEDS_CLASS_MULTICOLOR=m
13791380
CONFIG_LEDS_PCA9532=m

arch/arm64/configs/bcmrpi3_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,11 +1256,12 @@ CONFIG_MMC=y
12561256
CONFIG_MMC_BLOCK_MINORS=32
12571257
CONFIG_MMC_BCM2835_MMC=y
12581258
CONFIG_MMC_BCM2835_DMA=y
1259-
CONFIG_MMC_BCM2835_SDHOST=y
12601259
CONFIG_MMC_SDHCI=y
12611260
CONFIG_MMC_SDHCI_PLTFM=y
12621261
CONFIG_MMC_SDHCI_IPROC=m
12631262
CONFIG_MMC_SPI=m
1263+
CONFIG_MMC_HSQ=y
1264+
CONFIG_MMC_BCM2835=y
12641265
CONFIG_LEDS_CLASS=y
12651266
CONFIG_LEDS_CLASS_MULTICOLOR=m
12661267
CONFIG_LEDS_PCA9532=m

0 commit comments

Comments
 (0)