Skip to content

Commit 684b652

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 <[email protected]>
1 parent 42211be commit 684b652

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
@@ -1312,11 +1312,12 @@ CONFIG_MMC=y
13121312
CONFIG_MMC_BLOCK_MINORS=32
13131313
CONFIG_MMC_BCM2835_MMC=y
13141314
CONFIG_MMC_BCM2835_DMA=y
1315-
CONFIG_MMC_BCM2835_SDHOST=y
13161315
CONFIG_MMC_SDHCI=y
13171316
CONFIG_MMC_SDHCI_PLTFM=y
13181317
CONFIG_MMC_SDHCI_IPROC=y
13191318
CONFIG_MMC_SPI=m
1319+
CONFIG_MMC_HSQ=y
1320+
CONFIG_MMC_BCM2835=y
13201321
CONFIG_LEDS_CLASS=y
13211322
CONFIG_LEDS_CLASS_MULTICOLOR=m
13221323
CONFIG_LEDS_PCA9532=m

arch/arm/configs/bcmrpi_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,10 +1275,11 @@ CONFIG_MMC=y
12751275
CONFIG_MMC_BLOCK_MINORS=32
12761276
CONFIG_MMC_BCM2835_MMC=y
12771277
CONFIG_MMC_BCM2835_DMA=y
1278-
CONFIG_MMC_BCM2835_SDHOST=y
12791278
CONFIG_MMC_SDHCI=y
12801279
CONFIG_MMC_SDHCI_PLTFM=y
12811280
CONFIG_MMC_SPI=m
1281+
CONFIG_MMC_HSQ=y
1282+
CONFIG_MMC_BCM2835=y
12821283
CONFIG_LEDS_CLASS=y
12831284
CONFIG_LEDS_CLASS_MULTICOLOR=m
12841285
CONFIG_LEDS_PCA9532=m

arch/arm64/configs/bcm2711_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1359,12 +1359,13 @@ CONFIG_MMC=y
13591359
CONFIG_MMC_BLOCK_MINORS=32
13601360
CONFIG_MMC_BCM2835_MMC=y
13611361
CONFIG_MMC_BCM2835_DMA=y
1362-
CONFIG_MMC_BCM2835_SDHOST=y
13631362
CONFIG_MMC_SDHCI=y
13641363
CONFIG_MMC_SDHCI_PLTFM=y
13651364
CONFIG_MMC_SDHCI_OF_DWCMSHC=m
13661365
CONFIG_MMC_SDHCI_IPROC=y
13671366
CONFIG_MMC_SPI=m
1367+
CONFIG_MMC_HSQ=y
1368+
CONFIG_MMC_BCM2835=y
13681369
CONFIG_LEDS_CLASS=y
13691370
CONFIG_LEDS_CLASS_MULTICOLOR=m
13701371
CONFIG_LEDS_PCA9532=m

arch/arm64/configs/bcm2712_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1361,12 +1361,13 @@ CONFIG_MMC=y
13611361
CONFIG_MMC_BLOCK_MINORS=32
13621362
CONFIG_MMC_BCM2835_MMC=y
13631363
CONFIG_MMC_BCM2835_DMA=y
1364-
CONFIG_MMC_BCM2835_SDHOST=y
13651364
CONFIG_MMC_SDHCI=y
13661365
CONFIG_MMC_SDHCI_PLTFM=y
13671366
CONFIG_MMC_SDHCI_OF_DWCMSHC=m
13681367
CONFIG_MMC_SDHCI_IPROC=y
13691368
CONFIG_MMC_SPI=m
1369+
CONFIG_MMC_HSQ=y
1370+
CONFIG_MMC_BCM2835=y
13701371
CONFIG_LEDS_CLASS=y
13711372
CONFIG_LEDS_CLASS_MULTICOLOR=m
13721373
CONFIG_LEDS_PCA9532=m

arch/arm64/configs/bcmrpi3_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,11 +1250,12 @@ CONFIG_MMC=y
12501250
CONFIG_MMC_BLOCK_MINORS=32
12511251
CONFIG_MMC_BCM2835_MMC=y
12521252
CONFIG_MMC_BCM2835_DMA=y
1253-
CONFIG_MMC_BCM2835_SDHOST=y
12541253
CONFIG_MMC_SDHCI=y
12551254
CONFIG_MMC_SDHCI_PLTFM=y
12561255
CONFIG_MMC_SDHCI_IPROC=m
12571256
CONFIG_MMC_SPI=m
1257+
CONFIG_MMC_HSQ=y
1258+
CONFIG_MMC_BCM2835=y
12581259
CONFIG_LEDS_CLASS=y
12591260
CONFIG_LEDS_CLASS_MULTICOLOR=m
12601261
CONFIG_LEDS_PCA9532=m

0 commit comments

Comments
 (0)