From patchwork Mon Jan 30 10:46:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 92818 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1371915qgi; Mon, 30 Jan 2017 02:48:27 -0800 (PST) X-Received: by 10.28.91.16 with SMTP id p16mr12773819wmb.111.1485773307399; Mon, 30 Jan 2017 02:48:27 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id g130si12858070wma.147.2017.01.30.02.48.27; Mon, 30 Jan 2017 02:48:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F346D4B5BB; Mon, 30 Jan 2017 11:48:06 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0kfGGxeGTHai; Mon, 30 Jan 2017 11:48:06 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6AF7E4B63D; Mon, 30 Jan 2017 11:47:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AD7DB4AB68 for ; Mon, 30 Jan 2017 11:47:30 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ofem4zX5H4qB for ; Mon, 30 Jan 2017 11:47:30 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by theia.denx.de (Postfix) with ESMTPS id 0FBE14AA22 for ; Mon, 30 Jan 2017 11:47:29 +0100 (CET) Received: from pug.jp.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v0UAl9kx032281; Mon, 30 Jan 2017 19:47:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v0UAl9kx032281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1485773231; bh=BURVjLc8GjcJAGVfFYu4+4irn/qb3Ulv9ojPr0kOXx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1b8cD9JHsHGH2JRiNxdOmgRQPglHFVuaAmi4qulub8vbv1Q/0by70OrSZ70Sd4Qm3 N+Wrl//XxuhMYI0weIFkHg1yFHJg3hngFWFi90jIgYeinBGCxS2VPmOyVSWZ1NUI7f LJBgKxH7KnCqzOqND31/njQrKfgNKVc4eFo1CON0fdnz3ybbAUlG31hXE5i/O2dVmt rgesm/p3zKOk12szn60vMi7Xe65ZS8Nk6NHHZtfU33B1fbXmPO/rxIZgBGN7t0B9hn 3r8Tn3tUDEIs5TziPtDZW6h1WHzdYgl+OnGbRvncePcW0nrEN1zYDs0JGofAj0VjhS 3XuYY7Q1CIdyA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 30 Jan 2017 19:46:52 +0900 Message-Id: <1485773215-8797-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485773215-8797-1-git-send-email-yamada.masahiro@socionext.com> References: <1485773215-8797-1-git-send-email-yamada.masahiro@socionext.com> Cc: Lin huang Subject: [U-Boot] [PATCH 4/7] mmc: rockchip: rename CONFIG_ROCKCHIP_SDHCI to CONFIG_MMC_SDHCI_ROCKCHIP X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 --- Changes in v2: None configs/evb-rk3399_defconfig | 2 +- drivers/mmc/Kconfig | 15 ++++++++------- drivers/mmc/Makefile | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot 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