Skip to content

Commit 8534f69

Browse files
pelwellpopcornmix
authored andcommitted
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 fefbea7 commit 8534f69

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
@@ -1283,10 +1283,11 @@ CONFIG_MMC=y
12831283
CONFIG_MMC_BLOCK_MINORS=32
12841284
CONFIG_MMC_BCM2835_MMC=y
12851285
CONFIG_MMC_BCM2835_DMA=y
1286-
CONFIG_MMC_BCM2835_SDHOST=y
12871286
CONFIG_MMC_SDHCI=y
12881287
CONFIG_MMC_SDHCI_PLTFM=y
12891288
CONFIG_MMC_SPI=m
1289+
CONFIG_MMC_HSQ=y
1290+
CONFIG_MMC_BCM2835=y
12901291
CONFIG_LEDS_CLASS=y
12911292
CONFIG_LEDS_CLASS_MULTICOLOR=m
12921293
CONFIG_LEDS_PCA9532=m

arch/arm/configs/bcm2711_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,11 +1311,12 @@ CONFIG_MMC=y
13111311
CONFIG_MMC_BLOCK_MINORS=32
13121312
CONFIG_MMC_BCM2835_MMC=y
13131313
CONFIG_MMC_BCM2835_DMA=y
1314-
CONFIG_MMC_BCM2835_SDHOST=y
13151314
CONFIG_MMC_SDHCI=y
13161315
CONFIG_MMC_SDHCI_PLTFM=y
13171316
CONFIG_MMC_SDHCI_IPROC=y
13181317
CONFIG_MMC_SPI=m
1318+
CONFIG_MMC_HSQ=y
1319+
CONFIG_MMC_BCM2835=y
13191320
CONFIG_LEDS_CLASS=y
13201321
CONFIG_LEDS_CLASS_MULTICOLOR=m
13211322
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
@@ -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
@@ -1257,11 +1257,12 @@ CONFIG_MMC=y
12571257
CONFIG_MMC_BLOCK_MINORS=32
12581258
CONFIG_MMC_BCM2835_MMC=y
12591259
CONFIG_MMC_BCM2835_DMA=y
1260-
CONFIG_MMC_BCM2835_SDHOST=y
12611260
CONFIG_MMC_SDHCI=y
12621261
CONFIG_MMC_SDHCI_PLTFM=y
12631262
CONFIG_MMC_SDHCI_IPROC=m
12641263
CONFIG_MMC_SPI=m
1264+
CONFIG_MMC_HSQ=y
1265+
CONFIG_MMC_BCM2835=y
12651266
CONFIG_LEDS_CLASS=y
12661267
CONFIG_LEDS_CLASS_MULTICOLOR=m
12671268
CONFIG_LEDS_PCA9532=m

0 commit comments

Comments
 (0)