* [PATCH 1/2] mmc: renesas_sdhi: consilidate DMAC CONFIG options
2017-11-07 7:57 [PATCH 0/2] mmc: renesas_sdhi: clean-up and fix CONFIG stuff for renesas_sdhi Masahiro Yamada
@ 2017-11-07 7:57 ` Masahiro Yamada
2017-11-20 20:39 ` Wolfram Sang
2017-11-07 7:57 ` [PATCH 2/2] mmc: renesas_shci: remove wrong depends on to enable compile test Masahiro Yamada
2017-11-08 17:58 ` [PATCH 0/2] mmc: renesas_sdhi: clean-up and fix CONFIG stuff for renesas_sdhi Wolfram Sang
2 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2017-11-07 7:57 UTC (permalink / raw)
To: Wolfram Sang, linux-mmc
Cc: Simon Horman, Yoshihiro Shimoda, Masahiro Yamada, linux-kernel,
Ulf Hansson
The description in the Makefile is odd. Fix the CONFIG selection
in a cleaner way.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/mmc/host/Kconfig | 4 ++--
drivers/mmc/host/Makefile | 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index d371e37..5420da5 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -584,8 +584,6 @@ config MMC_SDHI
depends on SUPERH || ARM || ARM64
depends on SUPERH || ARCH_RENESAS || COMPILE_TEST
select MMC_TMIO_CORE
- select MMC_SDHI_SYS_DMAC if (SUPERH || ARM)
- select MMC_SDHI_INTERNAL_DMAC if ARM64
help
This provides support for the SDHI SD/SDIO controller found in
Renesas SuperH, ARM and ARM64 based SoCs
@@ -593,6 +591,7 @@ config MMC_SDHI
config MMC_SDHI_SYS_DMAC
tristate "DMA for SDHI SD/SDIO controllers using SYS-DMAC"
depends on MMC_SDHI
+ default MMC_SDHI if (SUPERH || ARM)
help
This provides DMA support for SDHI SD/SDIO controllers
using SYS-DMAC via DMA Engine. This supports the controllers
@@ -602,6 +601,7 @@ config MMC_SDHI_INTERNAL_DMAC
tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering"
depends on ARM64 || COMPILE_TEST
depends on MMC_SDHI
+ default MMC_SDHI if ARM64
help
This provides DMA support for SDHI SD/SDIO controllers
using on-chip bus mastering. This supports the controllers
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 5a548cb..e165d2e 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -39,12 +39,8 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o
obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o
obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o
obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_core.o
-ifeq ($(subst m,y,$(CONFIG_MMC_SDHI_SYS_DMAC)),y)
-obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_sys_dmac.o
-endif
-ifeq ($(subst m,y,$(CONFIG_MMC_SDHI_INTERNAL_DMAC)),y)
-obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_internal_dmac.o
-endif
+obj-$(CONFIG_MMC_SDHI_SYS_DMAC) += renesas_sdhi_sys_dmac.o
+obj-$(CONFIG_MMC_SDHI_INTERNAL_DMAC) += renesas_sdhi_internal_dmac.o
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] mmc: renesas_sdhi: consilidate DMAC CONFIG options
2017-11-07 7:57 ` [PATCH 1/2] mmc: renesas_sdhi: consilidate DMAC CONFIG options Masahiro Yamada
@ 2017-11-20 20:39 ` Wolfram Sang
0 siblings, 0 replies; 8+ messages in thread
From: Wolfram Sang @ 2017-11-20 20:39 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Wolfram Sang, linux-mmc, Simon Horman, Yoshihiro Shimoda,
linux-kernel, Ulf Hansson
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
On Tue, Nov 07, 2017 at 04:57:21PM +0900, Masahiro Yamada wrote:
> The description in the Makefile is odd. Fix the CONFIG selection
> in a cleaner way.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Simon, you did the last refactoring, can you have a look, too?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] mmc: renesas_shci: remove wrong depends on to enable compile test
2017-11-07 7:57 [PATCH 0/2] mmc: renesas_sdhi: clean-up and fix CONFIG stuff for renesas_sdhi Masahiro Yamada
2017-11-07 7:57 ` [PATCH 1/2] mmc: renesas_sdhi: consilidate DMAC CONFIG options Masahiro Yamada
@ 2017-11-07 7:57 ` Masahiro Yamada
2017-11-08 6:41 ` Masahiro Yamada
2017-11-20 20:40 ` Wolfram Sang
2017-11-08 17:58 ` [PATCH 0/2] mmc: renesas_sdhi: clean-up and fix CONFIG stuff for renesas_sdhi Wolfram Sang
2 siblings, 2 replies; 8+ messages in thread
From: Masahiro Yamada @ 2017-11-07 7:57 UTC (permalink / raw)
To: Wolfram Sang, linux-mmc
Cc: Simon Horman, Yoshihiro Shimoda, Masahiro Yamada, linux-kernel,
Ulf Hansson
ARCH_RENESAS is a stronger condition than (ARM || ARM64).
If ARCH_RENESAS is enabled, (ARM || ARM64) is met as well.
What is worse, the first depends on line prevents COMPILE_TEST from
enabling this driver. It should be removed.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/mmc/host/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 5420da5..5bc6388 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -581,7 +581,6 @@ config MMC_TMIO
config MMC_SDHI
tristate "Renesas SDHI SD/SDIO controller support"
- depends on SUPERH || ARM || ARM64
depends on SUPERH || ARCH_RENESAS || COMPILE_TEST
select MMC_TMIO_CORE
help
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] mmc: renesas_shci: remove wrong depends on to enable compile test
2017-11-07 7:57 ` [PATCH 2/2] mmc: renesas_shci: remove wrong depends on to enable compile test Masahiro Yamada
@ 2017-11-08 6:41 ` Masahiro Yamada
2017-11-20 20:40 ` Wolfram Sang
2017-11-20 20:40 ` Wolfram Sang
1 sibling, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2017-11-08 6:41 UTC (permalink / raw)
To: Wolfram Sang, linux-mmc
Cc: Simon Horman, Yoshihiro Shimoda, Masahiro Yamada,
Linux Kernel Mailing List, Ulf Hansson
2017-11-07 16:57 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> ARCH_RENESAS is a stronger condition than (ARM || ARM64).
> If ARCH_RENESAS is enabled, (ARM || ARM64) is met as well.
>
> What is worse, the first depends on line prevents COMPILE_TEST from
> enabling this driver. It should be removed.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
A typo in the subject.
renesas_shci -> renesas_sdhc
> drivers/mmc/host/Kconfig | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 5420da5..5bc6388 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -581,7 +581,6 @@ config MMC_TMIO
>
> config MMC_SDHI
> tristate "Renesas SDHI SD/SDIO controller support"
> - depends on SUPERH || ARM || ARM64
> depends on SUPERH || ARCH_RENESAS || COMPILE_TEST
> select MMC_TMIO_CORE
> help
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] mmc: renesas_shci: remove wrong depends on to enable compile test
2017-11-07 7:57 ` [PATCH 2/2] mmc: renesas_shci: remove wrong depends on to enable compile test Masahiro Yamada
2017-11-08 6:41 ` Masahiro Yamada
@ 2017-11-20 20:40 ` Wolfram Sang
1 sibling, 0 replies; 8+ messages in thread
From: Wolfram Sang @ 2017-11-20 20:40 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Wolfram Sang, linux-mmc, Simon Horman, Yoshihiro Shimoda,
linux-kernel, Ulf Hansson
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
On Tue, Nov 07, 2017 at 04:57:22PM +0900, Masahiro Yamada wrote:
> ARCH_RENESAS is a stronger condition than (ARM || ARM64).
> If ARCH_RENESAS is enabled, (ARM || ARM64) is met as well.
>
> What is worse, the first depends on line prevents COMPILE_TEST from
> enabling this driver. It should be removed.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Simon, you did the last refactoring, can you have a look, too?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] mmc: renesas_sdhi: clean-up and fix CONFIG stuff for renesas_sdhi
2017-11-07 7:57 [PATCH 0/2] mmc: renesas_sdhi: clean-up and fix CONFIG stuff for renesas_sdhi Masahiro Yamada
2017-11-07 7:57 ` [PATCH 1/2] mmc: renesas_sdhi: consilidate DMAC CONFIG options Masahiro Yamada
2017-11-07 7:57 ` [PATCH 2/2] mmc: renesas_shci: remove wrong depends on to enable compile test Masahiro Yamada
@ 2017-11-08 17:58 ` Wolfram Sang
2 siblings, 0 replies; 8+ messages in thread
From: Wolfram Sang @ 2017-11-08 17:58 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Wolfram Sang, linux-mmc, Simon Horman, Yoshihiro Shimoda,
linux-kernel, Ulf Hansson
[-- Attachment #1: Type: text/plain, Size: 745 bytes --]
On Tue, Nov 07, 2017 at 04:57:20PM +0900, Masahiro Yamada wrote:
Ulf, Yamada-san:
All of Yamada-san's patches look good from a glimpse. However, I am
currently swamped with work and will probably need 1-2 weeks for review.
I am sorry about that! However, since 4.16 is far away enough, I don't
think this will cause a miss for the next merge window. I'll try to
review it earlier but please bear with me.
>
>
>
> Masahiro Yamada (2):
> mmc: renesas_sdhi: consilidate DMAC CONFIG options
> mmc: renesas_shci: remove wrong depends on to enable compile test
>
> drivers/mmc/host/Kconfig | 5 ++---
> drivers/mmc/host/Makefile | 8 ++------
> 2 files changed, 4 insertions(+), 9 deletions(-)
>
> --
> 2.7.4
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread