redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sh: dma: fix kconfig dependency for G2_DMA 

commit f477a538c1 upstream.

When G2_DMA is enabled and SH_DMA is disabled, it results in the following
Kbuild warning:

WARNING: unmet direct dependencies detected for SH_DMA_API
  Depends on [n]: SH_DMA [=n]
  Selected by [y]:
  - G2_DMA [=y] && SH_DREAMCAST [=y]

The reason is that G2_DMA selects SH_DMA_API without depending on or
selecting SH_DMA while SH_DMA_API depends on SH_DMA.

When G2_DMA was first introduced with commit 40f49e7ed7
("sh: dma: Make G2 DMA configurable."), this wasn't an issue since
SH_DMA_API didn't have such dependency, and this way was the only way to
enable it since SH_DMA_API was non-visible. However, later SH_DMA_API was
made visible and dependent on SH_DMA with commit d8902adcc1
("dmaengine: sh: Add Support SuperH DMA Engine driver").

Let G2_DMA depend on SH_DMA_API instead to avoid Kbuild issues.

Fixes: d8902adcc1 ("dmaengine: sh: Add Support SuperH DMA Engine driver")
Signed-off-by: Necip Fazil Yildiran <fazilyildiran@gmail.com>
Signed-off-by: Rich Felker <dalias@libc.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
5.4-rM2-2.2.x-imx-squashed
Necip Fazil Yildiran 2020-09-17 18:45:48 +03:00 committed by Greg Kroah-Hartman
parent 8a0b8e26f7
commit 4e1d17a1f7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sh/drivers/dma/Kconfig
View File

@ -63,8 +63,7 @@ config PVR2_DMA
config G2_DMA config G2_DMA
tristate "G2 Bus DMA support" tristate "G2 Bus DMA support"
depends on SH_DREAMCAST depends on SH_DREAMCAST && SH_DMA_API
select SH_DMA_API
help help
This enables support for the DMA controller for the Dreamcast's This enables support for the DMA controller for the Dreamcast's
G2 bus. Drivers that want this will generally enable this on G2 bus. Drivers that want this will generally enable this on