| Message ID | 1485773215-8797-4-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | facc8058097d3149ad6ce10f0cc20c647d72c9ea |
| Delegated to: | Jaehoon Chung |
| Headers | show |
On 01/30/2017 07:46 PM, Masahiro Yamada wrote: > Make the naming scheme consistent; all SDHCI-base drivers prefixed > with CONFIG_MMC_SDHCI_. > > While we are here, add "depends on ARCH_ROCKCHIP". > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied on u-boot-mmc. Thanks! Best Regards, Jaehoon Chung > --- > > Changes in v2: None > > configs/evb-rk3399_defconfig | 2 +- > drivers/mmc/Kconfig | 15 ++++++++------- > drivers/mmc/Makefile | 2 +- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig > index ca292cf..47064f9 100644 > --- a/configs/evb-rk3399_defconfig > +++ b/configs/evb-rk3399_defconfig > @@ -18,7 +18,7 @@ CONFIG_CLK=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > -CONFIG_ROCKCHIP_SDHCI=y > +CONFIG_MMC_SDHCI_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > CONFIG_PINCTRL=y > CONFIG_ROCKCHIP_RK3399_PINCTRL=y > diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig > index 1d15cdd..6f51354 100644 > --- a/drivers/mmc/Kconfig > +++ b/drivers/mmc/Kconfig > @@ -165,13 +165,6 @@ config PIC32_SDHCI > help > Support for Microchip PIC32 SDHCI controller. > > -config ROCKCHIP_SDHCI > - bool "Arasan SDHCI controller for Rockchip support" > - depends on DM_MMC && BLK && DM_MMC_OPS > - depends on MMC_SDHCI > - help > - Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform > - > config MMC_UNIPHIER > bool "UniPhier SD/MMC Host Controller support" > depends on ARCH_UNIPHIER > @@ -262,6 +255,14 @@ config MMC_SDHCI_MV > > If unsure, say N. > > +config MMC_SDHCI_ROCKCHIP > + bool "Arasan SDHCI controller for Rockchip support" > + depends on ARCH_ROCKCHIP > + depends on DM_MMC && BLK && DM_MMC_OPS > + depends on MMC_SDHCI > + help > + Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform > + > config MMC_SDHCI_S5P > bool "SDHCI support on Samsung S5P SoC" > depends on MMC_SDHCI > diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile > index 5a497f5..379b08c 100644 > --- a/drivers/mmc/Makefile > +++ b/drivers/mmc/Makefile > @@ -43,7 +43,6 @@ obj-$(CONFIG_S3C_SDI) += s3c_sdi.o > obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o > obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o > obj-$(CONFIG_SH_SDHI) += sh_sdhi.o > -obj-$(CONFIG_ROCKCHIP_SDHCI) += rockchip_sdhci.o > > ifdef CONFIG_SPL_BUILD > obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o > @@ -60,6 +59,7 @@ obj-$(CONFIG_MMC_SDHCI_BCM2835) += bcm2835_sdhci.o > obj-$(CONFIG_MMC_SDHCI_CADENCE) += sdhci-cadence.o > obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o > obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o > +obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.o > obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o > obj-$(CONFIG_MMC_SDHCI_SPEAR) += spear_sdhci.o > obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.o >
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index ca292cf..47064f9 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -18,7 +18,7 @@ CONFIG_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y -CONFIG_ROCKCHIP_SDHCI=y +CONFIG_MMC_SDHCI_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_PINCTRL=y CONFIG_ROCKCHIP_RK3399_PINCTRL=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 1d15cdd..6f51354 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -165,13 +165,6 @@ config PIC32_SDHCI help Support for Microchip PIC32 SDHCI controller. -config ROCKCHIP_SDHCI - bool "Arasan SDHCI controller for Rockchip support" - depends on DM_MMC && BLK && DM_MMC_OPS - depends on MMC_SDHCI - help - Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform - config MMC_UNIPHIER bool "UniPhier SD/MMC Host Controller support" depends on ARCH_UNIPHIER @@ -262,6 +255,14 @@ config MMC_SDHCI_MV If unsure, say N. +config MMC_SDHCI_ROCKCHIP + bool "Arasan SDHCI controller for Rockchip support" + depends on ARCH_ROCKCHIP + depends on DM_MMC && BLK && DM_MMC_OPS + depends on MMC_SDHCI + help + Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform + config MMC_SDHCI_S5P bool "SDHCI support on Samsung S5P SoC" depends on MMC_SDHCI diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 5a497f5..379b08c 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -43,7 +43,6 @@ obj-$(CONFIG_S3C_SDI) += s3c_sdi.o obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o -obj-$(CONFIG_ROCKCHIP_SDHCI) += rockchip_sdhci.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o @@ -60,6 +59,7 @@ obj-$(CONFIG_MMC_SDHCI_BCM2835) += bcm2835_sdhci.o obj-$(CONFIG_MMC_SDHCI_CADENCE) += sdhci-cadence.o obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o +obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.o obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += spear_sdhci.o obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.o
Make the naming scheme consistent; all SDHCI-base drivers prefixed with CONFIG_MMC_SDHCI_. While we are here, add "depends on ARCH_ROCKCHIP". Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: None configs/evb-rk3399_defconfig | 2 +- drivers/mmc/Kconfig | 15 ++++++++------- drivers/mmc/Makefile | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-)