* [PATCH AUTOSEL 4.4 06/29] ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART [not found] <20220118030822.1955469-1-sashal@kernel.org> @ 2022-01-18 3:07 ` Sasha Levin 2022-01-20 10:08 ` Pavel Machek 0 siblings, 1 reply; 4+ messages in thread From: Sasha Levin @ 2022-01-18 3:07 UTC (permalink / raw) To: linux-kernel, stable Cc: Lukas Bulwahn, Arnd Bergmann, Shawn Guo, Sasha Levin, linux, linus.walleij, daniel, avolmat, krzysztof.kozlowski, romain.perier, eugen.hristev, linux-arm-kernel 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 9c3042da44402..a9ffbaedc9676 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -339,12 +339,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" @@ -1263,7 +1263,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 || \ @@ -1314,12 +1314,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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 4.4 06/29] ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART 2022-01-18 3:07 ` [PATCH AUTOSEL 4.4 06/29] ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART Sasha Levin @ 2022-01-20 10:08 ` Pavel Machek 2022-01-22 19:27 ` Sasha Levin 0 siblings, 1 reply; 4+ messages in thread From: Pavel Machek @ 2022-01-20 10:08 UTC (permalink / raw) To: Sasha Levin Cc: linux-kernel, stable, Lukas Bulwahn, Arnd Bergmann, Shawn Guo, linux, linus.walleij, daniel, avolmat, krzysztof.kozlowski, romain.perier, eugen.hristev, linux-arm-kernel [-- Attachment #1.1: Type: text/plain, Size: 570 bytes --] Hi! > 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. This is unsuitable for 4.4 as imx21 is still supported there. Best regards, Pavel -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 181 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 4.4 06/29] ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART 2022-01-20 10:08 ` Pavel Machek @ 2022-01-22 19:27 ` Sasha Levin 2022-01-22 20:45 ` Pavel Machek 0 siblings, 1 reply; 4+ messages in thread From: Sasha Levin @ 2022-01-22 19:27 UTC (permalink / raw) To: Pavel Machek Cc: linux-kernel, stable, Lukas Bulwahn, Arnd Bergmann, Shawn Guo, linux, linus.walleij, daniel, avolmat, krzysztof.kozlowski, romain.perier, eugen.hristev, linux-arm-kernel On Thu, Jan 20, 2022 at 11:08:49AM +0100, Pavel Machek wrote: >Hi! > >> 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. > >This is unsuitable for 4.4 as imx21 is still supported there. I'll drop it, thanks! -- Thanks, Sasha _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 4.4 06/29] ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART 2022-01-22 19:27 ` Sasha Levin @ 2022-01-22 20:45 ` Pavel Machek 0 siblings, 0 replies; 4+ messages in thread From: Pavel Machek @ 2022-01-22 20:45 UTC (permalink / raw) To: Sasha Levin Cc: Pavel Machek, linux-kernel, stable, Lukas Bulwahn, Arnd Bergmann, Shawn Guo, linux, linus.walleij, daniel, avolmat, krzysztof.kozlowski, romain.perier, eugen.hristev, linux-arm-kernel [-- Attachment #1.1: Type: text/plain, Size: 702 bytes --] Hi! > > > 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. > > > > This is unsuitable for 4.4 as imx21 is still supported there. > > I'll drop it, thanks! Thank you. I have not checked which is the newest kernel that supports imx21, other kernels may have same issue, too. Best regards, Pavel -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-22 20:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20220118030822.1955469-1-sashal@kernel.org>
2022-01-18 3:07 ` [PATCH AUTOSEL 4.4 06/29] ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART Sasha Levin
2022-01-20 10:08 ` Pavel Machek
2022-01-22 19:27 ` Sasha Levin
2022-01-22 20:45 ` Pavel Machek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox