lkml.org 
[lkml]   [2022]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 08/59] ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART
    Date
    From: Lukas Bulwahn <lukas.bulwahn@gmail.com>

    [ Upstream commit b0100bce4ff82ec1ccd3c1f3d339fd2df6a81784 ]

    Since commit 4b563a066611 ("ARM: imx: Remove imx21 support"), the config
    DEBUG_IMX21_IMX27_UART is really only debug support for IMX27.

    So, rename this option to DEBUG_IMX27_UART and adjust dependencies in
    Kconfig and rename the definitions to IMX27 as further clean-up.

    This issue was discovered with ./scripts/checkkconfigsymbols.py, which
    reported that DEBUG_IMX21_IMX27_UART depends on the non-existing config
    SOC_IMX21.

    Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
    Reviewed-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/Kconfig.debug | 14 +++++++-------
    arch/arm/include/debug/imx-uart.h | 18 +++++++++---------
    2 files changed, 16 insertions(+), 16 deletions(-)

    diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
    index 01c760929c9e4..12a023c542e45 100644
    --- a/arch/arm/Kconfig.debug
    +++ b/arch/arm/Kconfig.debug
    @@ -405,12 +405,12 @@ choice
    Say Y here if you want kernel low-level debugging support
    on i.MX25.

    - config DEBUG_IMX21_IMX27_UART
    - bool "i.MX21 and i.MX27 Debug UART"
    - depends on SOC_IMX21 || SOC_IMX27
    + config DEBUG_IMX27_UART
    + bool "i.MX27 Debug UART"
    + depends on SOC_IMX27
    help
    Say Y here if you want kernel low-level debugging support
    - on i.MX21 or i.MX27.
    + on i.MX27.

    config DEBUG_IMX28_UART
    bool "i.MX28 Debug UART"
    @@ -1454,7 +1454,7 @@ config DEBUG_IMX_UART_PORT
    int "i.MX Debug UART Port Selection"
    depends on DEBUG_IMX1_UART || \
    DEBUG_IMX25_UART || \
    - DEBUG_IMX21_IMX27_UART || \
    + DEBUG_IMX27_UART || \
    DEBUG_IMX31_UART || \
    DEBUG_IMX35_UART || \
    DEBUG_IMX50_UART || \
    @@ -1507,12 +1507,12 @@ config DEBUG_LL_INCLUDE
    default "debug/icedcc.S" if DEBUG_ICEDCC
    default "debug/imx.S" if DEBUG_IMX1_UART || \
    DEBUG_IMX25_UART || \
    - DEBUG_IMX21_IMX27_UART || \
    + DEBUG_IMX27_UART || \
    DEBUG_IMX31_UART || \
    DEBUG_IMX35_UART || \
    DEBUG_IMX50_UART || \
    DEBUG_IMX51_UART || \
    - DEBUG_IMX53_UART ||\
    + DEBUG_IMX53_UART || \
    DEBUG_IMX6Q_UART || \
    DEBUG_IMX6SL_UART || \
    DEBUG_IMX6SX_UART || \
    diff --git a/arch/arm/include/debug/imx-uart.h b/arch/arm/include/debug/imx-uart.h
    index bce58e975ad1f..c750cc9876f6d 100644
    --- a/arch/arm/include/debug/imx-uart.h
    +++ b/arch/arm/include/debug/imx-uart.h
    @@ -14,13 +14,6 @@
    #define IMX1_UART_BASE_ADDR(n) IMX1_UART##n##_BASE_ADDR
    #define IMX1_UART_BASE(n) IMX1_UART_BASE_ADDR(n)

    -#define IMX21_UART1_BASE_ADDR 0x1000a000
    -#define IMX21_UART2_BASE_ADDR 0x1000b000
    -#define IMX21_UART3_BASE_ADDR 0x1000c000
    -#define IMX21_UART4_BASE_ADDR 0x1000d000
    -#define IMX21_UART_BASE_ADDR(n) IMX21_UART##n##_BASE_ADDR
    -#define IMX21_UART_BASE(n) IMX21_UART_BASE_ADDR(n)
    -
    #define IMX25_UART1_BASE_ADDR 0x43f90000
    #define IMX25_UART2_BASE_ADDR 0x43f94000
    #define IMX25_UART3_BASE_ADDR 0x5000c000
    @@ -29,6 +22,13 @@
    #define IMX25_UART_BASE_ADDR(n) IMX25_UART##n##_BASE_ADDR
    #define IMX25_UART_BASE(n) IMX25_UART_BASE_ADDR(n)

    +#define IMX27_UART1_BASE_ADDR 0x1000a000
    +#define IMX27_UART2_BASE_ADDR 0x1000b000
    +#define IMX27_UART3_BASE_ADDR 0x1000c000
    +#define IMX27_UART4_BASE_ADDR 0x1000d000
    +#define IMX27_UART_BASE_ADDR(n) IMX27_UART##n##_BASE_ADDR
    +#define IMX27_UART_BASE(n) IMX27_UART_BASE_ADDR(n)
    +
    #define IMX31_UART1_BASE_ADDR 0x43f90000
    #define IMX31_UART2_BASE_ADDR 0x43f94000
    #define IMX31_UART3_BASE_ADDR 0x5000c000
    @@ -115,10 +115,10 @@

    #ifdef CONFIG_DEBUG_IMX1_UART
    #define UART_PADDR IMX_DEBUG_UART_BASE(IMX1)
    -#elif defined(CONFIG_DEBUG_IMX21_IMX27_UART)
    -#define UART_PADDR IMX_DEBUG_UART_BASE(IMX21)
    #elif defined(CONFIG_DEBUG_IMX25_UART)
    #define UART_PADDR IMX_DEBUG_UART_BASE(IMX25)
    +#elif defined(CONFIG_DEBUG_IMX27_UART)
    +#define UART_PADDR IMX_DEBUG_UART_BASE(IMX27)
    #elif defined(CONFIG_DEBUG_IMX31_UART)
    #define UART_PADDR IMX_DEBUG_UART_BASE(IMX31)
    #elif defined(CONFIG_DEBUG_IMX35_UART)
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-01-18 04:43    [W:4.135 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site