From patchwork Mon Jan 30 10:46:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 92815 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1371744qgi; Mon, 30 Jan 2017 02:47:53 -0800 (PST) X-Received: by 10.28.139.74 with SMTP id n71mr14261289wmd.139.1485773273540; Mon, 30 Jan 2017 02:47:53 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id i17si16004004wrb.90.2017.01.30.02.47.53; Mon, 30 Jan 2017 02:47:53 -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 9BE654B027; Mon, 30 Jan 2017 11:47:48 +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 iA2qWKKyx79A; Mon, 30 Jan 2017 11:47:48 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F41AE4AFAA; Mon, 30 Jan 2017 11:47:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 302644AA22 for ; Mon, 30 Jan 2017 11:47:21 +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 XCmPVqpKKtCi for ; Mon, 30 Jan 2017 11:47:21 +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 881464A99B for ; Mon, 30 Jan 2017 11:47:18 +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 v0UAl9l0032281; Mon, 30 Jan 2017 19:47:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v0UAl9l0032281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1485773232; bh=P4LhuVErs50MwFd4iSJE2IygRSajrIsrNQPgX1PLxWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izVYSqF9Ei2XUOBIOzZ2JBv4CNQdyLKZvxe2jJ2JiLCGqUWdQFSzwG1JasYxGCzmG FJYj5zxcjQM660Gzo94pHaPXvRlt/9luBt/6IjQrXOvvH5yJHYW+vI/vpNFD0aADpZ OJgYa6J3e0viJusVsd+wQwJ1jxV9e4PHqO2TabxRpyPo2VP2rIU7jqC/aml81YrSlg /ieJNZ82VXCj9RF03xh/om5joeA7AJonC8AnYZwTwNiHs4+V9VnECsoq2Y2UT2CzK9 xdI6bPyAKteUAm46HeVBd/UnN1iOaQfgl5IRRt6TBLXw3z1wd578GSxNjsLct5gjH7 OHzOrqXUYCXcQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 30 Jan 2017 19:46:53 +0900 Message-Id: <1485773215-8797-5-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> Subject: [U-Boot] [PATCH 5/7] mmc: msm: rename CONFIG_MSM_SDHCI to CONFIG_MMC_SDHCI_MSM 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_. Signed-off-by: Masahiro Yamada --- Changes in v2: None configs/dragonboard410c_defconfig | 2 +- drivers/mmc/Kconfig | 20 ++++++++++---------- drivers/mmc/Makefile | 2 +- 3 files changed, 12 insertions(+), 12 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/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index bf1a755..8f206e2 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -21,7 +21,7 @@ CONFIG_PM8916_GPIO=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y -CONFIG_MSM_SDHCI=y +CONFIG_MMC_SDHCI_MSM=y CONFIG_MMC_SDHCI=y CONFIG_DM_PMIC=y CONFIG_PMIC_PM8916=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 6f51354..c9a4ca9 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -51,16 +51,6 @@ config SPL_MMC_TINY operations too, which can remove the need for malloc support in SPL and thus further reduce footprint. -config MSM_SDHCI - bool "Qualcomm SDHCI controller" - depends on DM_MMC && BLK && DM_MMC_OPS - depends on MMC_SDHCI - help - Enables support for SDHCI 2.0 controller present on some Qualcomm - Snapdragon devices. This device is compatible with eMMC v4.5 and - SD 3.0 specifications. Both SD and eMMC devices are supported. - Card-detect gpios are not supported. - config ATMEL_SDHCI bool "Atmel SDHCI controller support" depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91 @@ -243,6 +233,16 @@ config MMC_SDHCI_KONA If you have a controller with this interface, say Y here. +config MMC_SDHCI_MSM + bool "Qualcomm SDHCI controller" + depends on BLK && DM_MMC_OPS + depends on MMC_SDHCI + help + Enables support for SDHCI 2.0 controller present on some Qualcomm + Snapdragon devices. This device is compatible with eMMC v4.5 and + SD 3.0 specifications. Both SD and eMMC devices are supported. + Card-detect gpios are not supported. + config MMC_SDHCI_MV bool "SDHCI support on Marvell platform" depends on ARCH_MVEBU diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 379b08c..7693644 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -51,13 +51,13 @@ else obj-$(CONFIG_GENERIC_MMC) += mmc_write.o endif obj-$(CONFIG_PIC32_SDHCI) += pic32_sdhci.o -obj-$(CONFIG_MSM_SDHCI) += msm_sdhci.o # SDHCI obj-$(CONFIG_MMC_SDHCI) += sdhci.o 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_MSM) += msm_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