From patchwork Mon Jan 30 10:46:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 92814 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1371695qgi; Mon, 30 Jan 2017 02:47:44 -0800 (PST) X-Received: by 10.28.150.202 with SMTP id y193mr14074307wmd.106.1485773264261; Mon, 30 Jan 2017 02:47:44 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id e13si15616835wrc.236.2017.01.30.02.47.43; Mon, 30 Jan 2017 02:47:44 -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 1F5F44AC55; Mon, 30 Jan 2017 11:47:41 +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 8dyeuzwDfFCu; Mon, 30 Jan 2017 11:47:40 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 62F284ACF9; Mon, 30 Jan 2017 11:47:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AC5E74AB34 for ; Mon, 30 Jan 2017 11:47:20 +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 PSWSs2XK3JbV for ; Mon, 30 Jan 2017 11:47:20 +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 0FD964AA22 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 v0UAl9l1032281; Mon, 30 Jan 2017 19:47:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v0UAl9l1032281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1485773232; bh=PZwHzHydh9SATodRETsezOcjozVA1GPJeDogHAikOEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a2AuUSvgtm4UcN+uMfMoZuH587xi7oR9rPkJaXzF8GOdCKmT6lO6fjACnb+9YXrmu LlPDpeMQENFm0rNdNPnBandu8k3Ce3Wve58FP0+s9skNetJE/PW+paeZucuXutXWYj g27oPcm8gUsG5rQrXa1KFYZ0YBKb3uxNAW0nWldp9wlShnK4C5oXqO2rVBOKA4PbjS QmZY2OXpe0zujvmlyrY82/3+ghR0ZxL3VacbXbybz8L/7OwAxq3IcBmhjAw9V/dsVL nin59hQFp4HiqDJYL4RswNFtXmlBkKgW8TOHHJVQ1Oguw3seoXhtzkdTtcduoeKFUc 5LMihor60OfKQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 30 Jan 2017 19:46:54 +0900 Message-Id: <1485773215-8797-6-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 6/7] mmc: pic32: rename CONFIG_PIC32_SDHCI to CONFIG_MMC_SDHCI_PIC32 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/pic32mzdask_defconfig | 2 +- drivers/mmc/Kconfig | 14 +++++++------- drivers/mmc/Makefile | 2 +- 3 files changed, 9 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/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig index 90a0d32..85c0d2a 100644 --- a/configs/pic32mzdask_defconfig +++ b/configs/pic32mzdask_defconfig @@ -29,7 +29,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_CLK=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y -CONFIG_PIC32_SDHCI=y +CONFIG_MMC_SDHCI_PIC32=y CONFIG_MMC_SDHCI=y CONFIG_DM_ETH=y CONFIG_PIC32_ETH=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index c9a4ca9..520e7ea 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -148,13 +148,6 @@ config SH_SDHI help Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform -config PIC32_SDHCI - bool "Microchip PIC32 on-chip SDHCI support" - depends on DM_MMC && MACH_PIC32 - depends on MMC_SDHCI - help - Support for Microchip PIC32 SDHCI controller. - config MMC_UNIPHIER bool "UniPhier SD/MMC Host Controller support" depends on ARCH_UNIPHIER @@ -255,6 +248,13 @@ config MMC_SDHCI_MV If unsure, say N. +config MMC_SDHCI_PIC32 + bool "Microchip PIC32 on-chip SDHCI support" + depends on DM_MMC && MACH_PIC32 + depends on MMC_SDHCI + help + Support for Microchip PIC32 SDHCI controller. + config MMC_SDHCI_ROCKCHIP bool "Arasan SDHCI controller for Rockchip support" depends on ARCH_ROCKCHIP diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 7693644..e63f439 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -50,7 +50,6 @@ obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o else obj-$(CONFIG_GENERIC_MMC) += mmc_write.o endif -obj-$(CONFIG_PIC32_SDHCI) += pic32_sdhci.o # SDHCI obj-$(CONFIG_MMC_SDHCI) += sdhci.o @@ -59,6 +58,7 @@ 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_PIC32) += pic32_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