diff mbox

[U-Boot,v2,6/6] mmc: move MMC_SDHCI_IO_ACCESSORS to Kconfig

Message ID 1481116230-9495-7-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 3d3a74cc8c774345be7d1661b215555ad41f4515
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada Dec. 7, 2016, 1:10 p.m. UTC
This is a user-unconfigurable option that is selected by the
drivers that need to overwrite SDHCI IO memory accessors.
(BCM2835 SDHCI seems the only driver that needs to do so.)

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 drivers/mmc/Kconfig   | 8 ++++++++
 include/configs/rpi.h | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

Comments

Jaehoon Chung Dec. 8, 2016, 11:30 p.m. UTC | #1
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
> This is a user-unconfigurable option that is selected by the
> drivers that need to overwrite SDHCI IO memory accessors.
> (BCM2835 SDHCI seems the only driver that needs to do so.)
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
Jaehoon Chung


> ---
> 
> Changes in v2: None
> 
>  drivers/mmc/Kconfig   | 8 ++++++++
>  include/configs/rpi.h | 1 -
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index 521c741..12df3cf 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -132,6 +132,13 @@ config MMC_SDHCI
>  
>  	  If unsure, say N.
>  
> +config MMC_SDHCI_IO_ACCESSORS
> +	bool
> +	depends on MMC_SDHCI
> +	help
> +	  This is silent Kconfig symbol that is selected by the drivers that
> +	  need to overwrite SDHCI IO memory accessors.
> +
>  config MMC_SDHCI_SDMA
>  	bool "Support SDHCI SDMA"
>  	depends on MMC_SDHCI
> @@ -143,6 +150,7 @@ config MMC_SDHCI_BCM2835
>  	tristate "SDHCI support for the BCM2835 SD/MMC Controller"
>  	depends on ARCH_BCM283X
>  	depends on MMC_SDHCI
> +	select MMC_SDHCI_IO_ACCESSORS
>  	help
>  	  This selects the BCM2835 SD/MMC controller.
>  
> diff --git a/include/configs/rpi.h b/include/configs/rpi.h
> index 8005ac1..45d8824 100644
> --- a/include/configs/rpi.h
> +++ b/include/configs/rpi.h
> @@ -83,7 +83,6 @@
>  
>  /* SD/MMC configuration */
>  #define CONFIG_GENERIC_MMC
> -#define CONFIG_MMC_SDHCI_IO_ACCESSORS
>  
>  #ifdef CONFIG_CMD_USB
>  #define CONFIG_USB_DWC2
>
Tom Rini Dec. 29, 2016, 10:51 p.m. UTC | #2
On Wed, Dec 07, 2016 at 10:10:30PM +0900, Masahiro Yamada wrote:

> This is a user-unconfigurable option that is selected by the
> drivers that need to overwrite SDHCI IO memory accessors.
> (BCM2835 SDHCI seems the only driver that needs to do so.)
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 521c741..12df3cf 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -132,6 +132,13 @@  config MMC_SDHCI
 
 	  If unsure, say N.
 
+config MMC_SDHCI_IO_ACCESSORS
+	bool
+	depends on MMC_SDHCI
+	help
+	  This is silent Kconfig symbol that is selected by the drivers that
+	  need to overwrite SDHCI IO memory accessors.
+
 config MMC_SDHCI_SDMA
 	bool "Support SDHCI SDMA"
 	depends on MMC_SDHCI
@@ -143,6 +150,7 @@  config MMC_SDHCI_BCM2835
 	tristate "SDHCI support for the BCM2835 SD/MMC Controller"
 	depends on ARCH_BCM283X
 	depends on MMC_SDHCI
+	select MMC_SDHCI_IO_ACCESSORS
 	help
 	  This selects the BCM2835 SD/MMC controller.
 
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 8005ac1..45d8824 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -83,7 +83,6 @@ 
 
 /* SD/MMC configuration */
 #define CONFIG_GENERIC_MMC
-#define CONFIG_MMC_SDHCI_IO_ACCESSORS
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2