lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0367/1017] m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit e6e1e7b19fa132d23d09c465942aab4c110d3da9 ]

    When CONFIG_MCF_EDMA is set (due to COMPILE_TEST, not due to
    CONFIG_M5441x), coldfire/device.c has compile errors due to
    missing MCFEDMA_* symbols. In the .config file that was provided,
    CONFIG_M5206=y, not CONFIG_M5441x, so <asm/m5441xsim.h> is not
    included in coldfire/device.c.

    Only build the MCF_EDMA code in coldfire/device.c if the MCFEDMA_*
    hardware macros are defined.

    Fixes these build errors:

    ../arch/m68k/coldfire/device.c:512:35: error: 'MCFEDMA_BASE' undeclared here (not in a function); did you mean 'MCFDMA_BASE1'?
    512 | .start = MCFEDMA_BASE,
    ../arch/m68k/coldfire/device.c:513:50: error: 'MCFEDMA_SIZE' undeclared here (not in a function)
    513 | .end = MCFEDMA_BASE + MCFEDMA_SIZE - 1,
    ../arch/m68k/coldfire/device.c:517:35: error: 'MCFEDMA_IRQ_INTR0' undeclared here (not in a function)
    517 | .start = MCFEDMA_IRQ_INTR0,
    ../arch/m68k/coldfire/device.c:523:35: error: 'MCFEDMA_IRQ_INTR16' undeclared here (not in a function)
    523 | .start = MCFEDMA_IRQ_INTR16,
    ../arch/m68k/coldfire/device.c:529:35: error: 'MCFEDMA_IRQ_INTR56' undeclared here (not in a function)
    529 | .start = MCFEDMA_IRQ_INTR56,
    ../arch/m68k/coldfire/device.c:535:35: error: 'MCFEDMA_IRQ_ERR' undeclared here (not in a function)
    535 | .start = MCFEDMA_IRQ_ERR,

    Fixes: d7e9d01ac292 ("m68k: add ColdFire mcf5441x eDMA platform support")
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Reported-by: kernel test robot <lkp@intel.com>
    Link: lore.kernel.org/r/202203030252.P752DK46-lkp@intel.com
    Cc: Angelo Dureghello <angelo@sysam.it>
    Cc: Greg Ungerer <gerg@kernel.org>
    Cc: Greg Ungerer <gerg@linux-m68k.org>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: linux-m68k@lists.linux-m68k.org
    Cc: uclinux-dev@uclinux.org
    Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/m68k/coldfire/device.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c
    index 0386252e9d04..4218750414bb 100644
    --- a/arch/m68k/coldfire/device.c
    +++ b/arch/m68k/coldfire/device.c
    @@ -480,7 +480,7 @@ static struct platform_device mcf_i2c5 = {
    #endif /* MCFI2C_BASE5 */
    #endif /* IS_ENABLED(CONFIG_I2C_IMX) */

    -#if IS_ENABLED(CONFIG_MCF_EDMA)
    +#ifdef MCFEDMA_BASE

    static const struct dma_slave_map mcf_edma_map[] = {
    { "dreq0", "rx-tx", MCF_EDMA_FILTER_PARAM(0) },
    @@ -552,7 +552,7 @@ static struct platform_device mcf_edma = {
    .platform_data = &mcf_edma_data,
    }
    };
    -#endif /* IS_ENABLED(CONFIG_MCF_EDMA) */
    +#endif /* MCFEDMA_BASE */

    #ifdef MCFSDHC_BASE
    static struct mcf_esdhc_platform_data mcf_esdhc_data = {
    @@ -651,7 +651,7 @@ static struct platform_device *mcf_devices[] __initdata = {
    &mcf_i2c5,
    #endif
    #endif
    -#if IS_ENABLED(CONFIG_MCF_EDMA)
    +#ifdef MCFEDMA_BASE
    &mcf_edma,
    #endif
    #ifdef MCFSDHC_BASE
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 15:11    [W:2.681 / U:4.596 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site