Commit 635e4172 authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Greg Kroah-Hartman
Browse files

arm: remove zte zx platform left-over 



Commit 89d4f98a ("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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20211102063810.932-1-lukas.bulwahn@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b88fea5f

arch/arm/include/debug/pl01x.S

+0 −7
Original line number Diff line number Diff line
@@ -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

drivers/tty/serial/amba-pl011.c

+0 −37
Original line number Diff line number Diff line
@@ -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 },

};

include/linux/amba/bus.h

+0 −6
Original line number Diff line number Diff line
@@ -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)