From 0a00b78a5b9967e80c6579c32e0fa8f2b1dade33 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 26 Jan 2022 08:37:08 +0100 Subject: [PATCH] drop arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch from 4.14, 4.19, 4.9 and 5.4 --- ...ebug_imx21_imx27_uart-to-debug_imx27.patch | 121 ------------------ queue-4.14/series | 1 - ...ebug_imx21_imx27_uart-to-debug_imx27.patch | 121 ------------------ queue-4.19/series | 1 - ...ebug_imx21_imx27_uart-to-debug_imx27.patch | 121 ------------------ queue-4.9/series | 1 - ...ebug_imx21_imx27_uart-to-debug_imx27.patch | 121 ------------------ queue-5.4/series | 1 - 8 files changed, 488 deletions(-) delete mode 100644 queue-4.14/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch delete mode 100644 queue-4.19/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch delete mode 100644 queue-4.9/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch delete mode 100644 queue-5.4/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch diff --git a/queue-4.14/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch b/queue-4.14/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch deleted file mode 100644 index bb41bdb771a..00000000000 --- a/queue-4.14/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch +++ /dev/null @@ -1,121 +0,0 @@ -From d8ac36c7a8a3832f3fd81898db361cc33f1846e8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Oct 2021 16:19:33 +0200 -Subject: ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART - -From: Lukas Bulwahn - -[ 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 -Reviewed-by: Arnd Bergmann -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - 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 d6cf18a0cb0a9..b70ed4c7691e5 100644 ---- a/arch/arm/Kconfig.debug -+++ b/arch/arm/Kconfig.debug -@@ -363,12 +363,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" -@@ -1398,7 +1398,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 || \ -@@ -1451,12 +1451,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 - diff --git a/queue-4.14/series b/queue-4.14/series index aaac6154e9e..79c172ebe96 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -89,7 +89,6 @@ drm-nouveau-pmu-gm200-avoid-touching-pmu-outside-of-.patch usb-gadget-f_fs-use-stream_open-for-endpoint-files.patch hid-apple-do-not-reset-quirks-when-the-fn-key-is-not.patch media-b2c2-add-missing-check-in-flexcop_pci_isr.patch -arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch mlxsw-pci-add-shutdown-method-in-pci-driver.patch drm-bridge-megachips-ensure-both-bridges-are-probed-.patch gpiolib-acpi-do-not-set-the-irq-type-if-the-irq-is-a.patch diff --git a/queue-4.19/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch b/queue-4.19/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch deleted file mode 100644 index c6bda31b488..00000000000 --- a/queue-4.19/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 3273469890e3a88df97ef839a4f3e38b7c920ad8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Oct 2021 16:19:33 +0200 -Subject: ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART - -From: Lukas Bulwahn - -[ 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 -Reviewed-by: Arnd Bergmann -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - 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 - diff --git a/queue-4.19/series b/queue-4.19/series index 37b3be13bbe..be4f63522f7 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -123,7 +123,6 @@ drm-nouveau-pmu-gm200-avoid-touching-pmu-outside-of-.patch usb-gadget-f_fs-use-stream_open-for-endpoint-files.patch hid-apple-do-not-reset-quirks-when-the-fn-key-is-not.patch media-b2c2-add-missing-check-in-flexcop_pci_isr.patch -arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch mlxsw-pci-add-shutdown-method-in-pci-driver.patch drm-bridge-megachips-ensure-both-bridges-are-probed-.patch gpiolib-acpi-do-not-set-the-irq-type-if-the-irq-is-a.patch diff --git a/queue-4.9/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch b/queue-4.9/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch deleted file mode 100644 index 50aebd0cf11..00000000000 --- a/queue-4.9/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 29dcf7cbe6dcf29bcc01ec66d86a83aec91edb93 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Oct 2021 16:19:33 +0200 -Subject: ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART - -From: Lukas Bulwahn - -[ 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 -Reviewed-by: Arnd Bergmann -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - 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 bb8f39fe3a225..8349a171a8f3c 100644 ---- a/arch/arm/Kconfig.debug -+++ b/arch/arm/Kconfig.debug -@@ -341,12 +341,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" -@@ -1350,7 +1350,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 || \ -@@ -1403,12 +1403,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 - diff --git a/queue-4.9/series b/queue-4.9/series index 62039c96886..bff5e458073 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -75,7 +75,6 @@ ar5523-fix-null-ptr-deref-with-unexpected-wdcmsg_tar.patch usb-gadget-f_fs-use-stream_open-for-endpoint-files.patch hid-apple-do-not-reset-quirks-when-the-fn-key-is-not.patch media-b2c2-add-missing-check-in-flexcop_pci_isr.patch -arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch gpiolib-acpi-do-not-set-the-irq-type-if-the-irq-is-a.patch hsi-core-fix-return-freed-object-in-hsi_new_client.patch mwifiex-fix-skb_over_panic-in-mwifiex_usb_recv.patch diff --git a/queue-5.4/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch b/queue-5.4/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch deleted file mode 100644 index 19aada06de8..00000000000 --- a/queue-5.4/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch +++ /dev/null @@ -1,121 +0,0 @@ -From eaa27926ce1c434c07492d09ace4a88e72a9150b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 28 Oct 2021 16:19:33 +0200 -Subject: ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART - -From: Lukas Bulwahn - -[ 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 -Reviewed-by: Arnd Bergmann -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - 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 8bcbd0cd739b5..5e2b44a9df18c 100644 ---- a/arch/arm/Kconfig.debug -+++ b/arch/arm/Kconfig.debug -@@ -400,12 +400,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" -@@ -1472,7 +1472,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 || \ -@@ -1529,12 +1529,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 c8eb83d4b8964..3edbb3c5b42bf 100644 ---- a/arch/arm/include/debug/imx-uart.h -+++ b/arch/arm/include/debug/imx-uart.h -@@ -11,13 +11,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 -@@ -26,6 +19,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 -@@ -112,10 +112,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 - diff --git a/queue-5.4/series b/queue-5.4/series index 06c1f6370ee..ac3a91071b0 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -160,7 +160,6 @@ drm-panel-orientation-quirks-add-quirk-for-the-lenov.patch hid-apple-do-not-reset-quirks-when-the-fn-key-is-not.patch media-b2c2-add-missing-check-in-flexcop_pci_isr.patch edac-synopsys-use-the-quirk-for-version-instead-of-d.patch -arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch mlxsw-pci-add-shutdown-method-in-pci-driver.patch drm-bridge-megachips-ensure-both-bridges-are-probed-.patch gpiolib-acpi-do-not-set-the-irq-type-if-the-irq-is-a.patch -- 2.47.2