Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit dd3b64eb56dae10016bd314e59a650da511c1a4e

Authored by Masahiro Yamada
Committed by Jaehoon Chung
1 parent 1b85877060
Exists in smarc_8mq_lf_v2020.04 and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

mmc: atmel: rename CONFIG_ATMEL_SDHCI to CONFIG_MMC_SDHCI_ATMEL 

Make the naming scheme consistent; all SDHCI-base drivers prefixed
with CONFIG_MMC_SDHCI_.

While we are here, add "depends on ARCH_AT91".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Showing 4 changed files with 15 additions and 14 deletions Side-by-side Diff

configs/sama5d2_xplained_mmc_defconfig
Diff comments   View file @ dd3b64e
... ... @@ -43,7 +43,7 @@
43 43 CONFIG_DM_I2C=y
44 44 CONFIG_SYS_I2C_AT91=y
45 45 CONFIG_DM_MMC=y
46   -CONFIG_ATMEL_SDHCI=y
  46 +CONFIG_MMC_SDHCI_ATMEL=y
47 47 CONFIG_MMC_SDHCI=y
48 48 CONFIG_DM_SPI_FLASH=y
49 49 CONFIG_SPI_FLASH=y
configs/sama5d2_xplained_spiflash_defconfig
Diff comments   View file @ dd3b64e
... ... @@ -42,7 +42,7 @@
42 42 CONFIG_DM_I2C=y
43 43 CONFIG_SYS_I2C_AT91=y
44 44 CONFIG_DM_MMC=y
45   -CONFIG_ATMEL_SDHCI=y
  45 +CONFIG_MMC_SDHCI_ATMEL=y
46 46 CONFIG_MMC_SDHCI=y
47 47 CONFIG_DM_SPI_FLASH=y
48 48 CONFIG_SPI_FLASH=y
... ... @@ -51,17 +51,6 @@
51 51 operations too, which can remove the need for malloc support in SPL
52 52 and thus further reduce footprint.
53 53  
54   -config ATMEL_SDHCI
55   - bool "Atmel SDHCI controller support"
56   - depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
57   - depends on MMC_SDHCI
58   - help
59   - This enables support for the Atmel SDHCI controller, which supports
60   - the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD
61   - Memory Card Specification V3.0, and the SDIO V3.0 specification.
62   - It is compliant with the SD Host Controller Standard V3.0
63   - specification.
64   -
65 54 config MMC_DAVINCI
66 55 bool "TI DAVINCI Multimedia Card Interface support"
67 56 depends on ARCH_DAVINCI
... ... @@ -190,6 +179,18 @@
190 179 help
191 180 This enables support for the SDMA (Single Operation DMA) defined
192 181 in the SD Host Controller Standard Specification Version 1.00 .
  182 +
  183 +config MMC_SDHCI_ATMEL
  184 + bool "Atmel SDHCI controller support"
  185 + depends on ARCH_AT91
  186 + depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
  187 + depends on MMC_SDHCI
  188 + help
  189 + This enables support for the Atmel SDHCI controller, which supports
  190 + the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD
  191 + Memory Card Specification V3.0, and the SDIO V3.0 specification.
  192 + It is compliant with the SD Host Controller Standard V3.0
  193 + specification.
193 194  
194 195 config MMC_SDHCI_BCM2835
195 196 tristate "SDHCI support for the BCM2835 SD/MMC Controller"
drivers/mmc/Makefile
Diff comments   View file @ dd3b64e
... ... @@ -14,7 +14,6 @@
14 14 endif
15 15  
16 16 obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o
17   -obj-$(CONFIG_ATMEL_SDHCI) += atmel_sdhci.o
18 17 obj-$(CONFIG_BFIN_SDH) += bfin_sdh.o
19 18 obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o
20 19  
... ... @@ -53,6 +52,7 @@
53 52  
54 53 # SDHCI
55 54 obj-$(CONFIG_MMC_SDHCI) += sdhci.o
  55 +obj-$(CONFIG_MMC_SDHCI_ATMEL) += atmel_sdhci.o
56 56 obj-$(CONFIG_MMC_SDHCI_BCM2835) += bcm2835_sdhci.o
57 57 obj-$(CONFIG_MMC_SDHCI_CADENCE) += sdhci-cadence.o
58 58 obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o