Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 439403bd authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

tty: amba-pl011: add register offset table to vendor data 



Add the register offset table to the vendor data, allowing vendor
differences to be described in this table.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent debb7f64

drivers/tty/serial/amba-pl011.c

+6 −2
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ static u16 pl011_std_offsets[REG_ARRAY_SIZE] = { 


/* There is by now at least one vendor with differing details, so handle it */

struct vendor_data {

	const u16		*reg_offset;

	unsigned int		ifls;

	unsigned int		lcrh_tx;

	unsigned int		lcrh_rx;
@@ -121,6 +122,7 @@ static unsigned int get_fifosize_arm(struct amba_device *dev) 
}



static struct vendor_data vendor_arm = {

	.reg_offset		= pl011_std_offsets,

	.ifls			= UART011_IFLS_RX4_8|UART011_IFLS_TX4_8,

	.lcrh_tx		= REG_LCRH,

	.lcrh_rx		= REG_LCRH,
@@ -133,6 +135,7 @@ static struct vendor_data vendor_arm = { 
};



static struct vendor_data vendor_sbsa = {

	.reg_offset		= pl011_std_offsets,

	.oversampling		= false,

	.dma_threshold		= false,

	.cts_event_workaround	= false,
@@ -146,6 +149,7 @@ static unsigned int get_fifosize_st(struct amba_device *dev) 
}



static struct vendor_data vendor_st = {

	.reg_offset		= pl011_std_offsets,

	.ifls			= UART011_IFLS_RX_HALF|UART011_IFLS_TX_HALF,

	.lcrh_tx		= REG_ST_LCRH_TX,

	.lcrh_rx		= REG_ST_LCRH_RX,
@@ -2426,7 +2430,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) 
	if (IS_ERR(uap->clk))

		return PTR_ERR(uap->clk);



	uap->reg_offset = pl011_std_offsets;

	uap->reg_offset = vendor->reg_offset;

	uap->vendor = vendor;

	uap->lcrh_rx = vendor->lcrh_rx;

	uap->lcrh_tx = vendor->lcrh_tx;
@@ -2508,7 +2512,7 @@ static int sbsa_uart_probe(struct platform_device *pdev) 
	if (!uap)

		return -ENOMEM;



	uap->reg_offset	= pl011_std_offsets;

	uap->reg_offset	= vendor_sbsa.reg_offset;

	uap->vendor	= &vendor_sbsa;

	uap->fifosize	= 32;

	uap->port.irq	= platform_get_irq(pdev, 0);