arm: remove zte zx platform left-over

Commit 89d4f98ae90d ("ARM: remove zte zx platform") missed to remove some
definitions for this platform's debug and serial, e.g., code dependent on
the config DEBUG_ZTE_ZX.

Fortunately, ./scripts/checkkconfigsymbols.py detects this and warns:

DEBUG_ZTE_ZX
Referencing files: arch/arm/include/debug/pl01x.S

Further review by Arnd Bergmann identified even more dead code in the
amba serial driver.

Remove all this left-over from the zte zx platform.

Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20211102063810.932-1-lukas.bulwahn@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/include/debug/pl01x.S b/arch/arm/include/debug/pl01x.S
index 0c7bfa4c10dbf855f7e9574513ee595c79c9e765..c7e02d0628bf39d9a5509d0a2c3dd48908c6567a 100644 (file)
--- a/arch/arm/include/debug/pl01x.S
+++ b/arch/arm/include/debug/pl01x.S
@@ -8,13 +8,6 @@
 */
 #include <linux/amba/serial.h>
 
-#ifdef CONFIG_DEBUG_ZTE_ZX
-#undef UART01x_DR
-#undef UART01x_FR
-#define UART01x_DR     0x04
-#define UART01x_FR     0x14
-#endif
-
 #ifdef CONFIG_DEBUG_UART_PHYS
                .macro  addruart, rp, rv, tmp
                ldr     \rp, =CONFIG_DEBUG_UART_PHYS

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index d361cd84ff8cfecf95b4d0b6b433796bdf700c24..c9534e229166d4f80e3ce07bf8c5f30230923fa6 100644 (file)
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -188,38 +188,6 @@ static struct vendor_data vendor_st = {
        .get_fifosize           = get_fifosize_st,
 };
 
-static const u16 pl011_zte_offsets[REG_ARRAY_SIZE] = {
-       [REG_DR] = ZX_UART011_DR,
-       [REG_FR] = ZX_UART011_FR,
-       [REG_LCRH_RX] = ZX_UART011_LCRH,
-       [REG_LCRH_TX] = ZX_UART011_LCRH,
-       [REG_IBRD] = ZX_UART011_IBRD,
-       [REG_FBRD] = ZX_UART011_FBRD,
-       [REG_CR] = ZX_UART011_CR,
-       [REG_IFLS] = ZX_UART011_IFLS,
-       [REG_IMSC] = ZX_UART011_IMSC,
-       [REG_RIS] = ZX_UART011_RIS,
-       [REG_MIS] = ZX_UART011_MIS,
-       [REG_ICR] = ZX_UART011_ICR,
-       [REG_DMACR] = ZX_UART011_DMACR,
-};
-
-static unsigned int get_fifosize_zte(struct amba_device *dev)
-{
-       return 16;
-}
-
-static struct vendor_data vendor_zte = {
-       .reg_offset             = pl011_zte_offsets,
-       .access_32b             = true,
-       .ifls                   = UART011_IFLS_RX4_8|UART011_IFLS_TX4_8,
-       .fr_busy                = ZX_UART01x_FR_BUSY,
-       .fr_dsr                 = ZX_UART01x_FR_DSR,
-       .fr_cts                 = ZX_UART01x_FR_CTS,
-       .fr_ri                  = ZX_UART011_FR_RI,
-       .get_fifosize           = get_fifosize_zte,
-};
-
 /* Deals with DMA transactions */
 
 struct pl011_sgbuf {
@@ -2974,11 +2942,6 @@ static const struct amba_id pl011_ids[] = {
                .mask   = 0x00ffffff,
                .data   = &vendor_st,
        },
-       {
-               .id     = AMBA_LINUX_ID(0x00, 0x1, 0xffe),
-               .mask   = 0x00ffffff,
-               .data   = &vendor_zte,
-       },
        { 0, 0 },
 };
 

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index edfcf7a14dcd8bedc3fa49578869588937305719..6c7f478469715ad1317c8028e9dc3cb9787372ac 100644 (file)
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -90,14 +90,8 @@ enum amba_vendor {
        AMBA_VENDOR_ST = 0x80,
        AMBA_VENDOR_QCOM = 0x51,
        AMBA_VENDOR_LSI = 0xb6,
-       AMBA_VENDOR_LINUX = 0xfe,       /* This value is not official */
 };
 
-/* This is used to generate pseudo-ID for AMBA device */
-#define AMBA_LINUX_ID(conf, rev, part) \
-       (((conf) & 0xff) << 24 | ((rev) & 0xf) << 20 | \
-       AMBA_VENDOR_LINUX << 12 | ((part) & 0xfff))
-
 extern struct bus_type amba_bustype;
 
 #define to_amba_device(d)      container_of(d, struct amba_device, dev)