Commit 9bb13b2f authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

serial: amba-pl011: move header content to .c 



There is no point keeping the header content separated. In this case, it
is only an enum. So move the enum to the appropriate source file.

Cc: Russell King <linux@armlinux.org.uk>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220519075720.31402-1-jslaby@suse.cz


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

drivers/tty/serial/amba-pl011.c

+30 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
#include <linux/io.h>

#include <linux/acpi.h>



#include "amba-pl011.h"



#define UART_NR			14



#define SERIAL_AMBA_MAJOR	204
@@ -55,6 +53,36 @@ 
#define UART_DR_ERROR		(UART011_DR_OE|UART011_DR_BE|UART011_DR_PE|UART011_DR_FE)

#define UART_DUMMY_DR_RX	(1 << 16)



enum {

	REG_DR,

	REG_ST_DMAWM,

	REG_ST_TIMEOUT,

	REG_FR,

	REG_LCRH_RX,

	REG_LCRH_TX,

	REG_IBRD,

	REG_FBRD,

	REG_CR,

	REG_IFLS,

	REG_IMSC,

	REG_RIS,

	REG_MIS,

	REG_ICR,

	REG_DMACR,

	REG_ST_XFCR,

	REG_ST_XON1,

	REG_ST_XON2,

	REG_ST_XOFF1,

	REG_ST_XOFF2,

	REG_ST_ITCR,

	REG_ST_ITIP,

	REG_ST_ABCR,

	REG_ST_ABIMSC,



	/* The size of the array - must be last */

	REG_ARRAY_SIZE,

};



static u16 pl011_std_offsets[REG_ARRAY_SIZE] = {

	[REG_DR] = UART01x_DR,

	[REG_FR] = UART01x_FR,

drivers/tty/serial/amba-pl011.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef AMBA_PL011_H

#define AMBA_PL011_H



enum {

	REG_DR,

	REG_ST_DMAWM,

	REG_ST_TIMEOUT,

	REG_FR,

	REG_LCRH_RX,

	REG_LCRH_TX,

	REG_IBRD,

	REG_FBRD,

	REG_CR,

	REG_IFLS,

	REG_IMSC,

	REG_RIS,

	REG_MIS,

	REG_ICR,

	REG_DMACR,

	REG_ST_XFCR,

	REG_ST_XON1,

	REG_ST_XON2,

	REG_ST_XOFF1,

	REG_ST_XOFF2,

	REG_ST_ITCR,

	REG_ST_ITIP,

	REG_ST_ABCR,

	REG_ST_ABIMSC,



	/* The size of the array - must be last */

	REG_ARRAY_SIZE,

};



#endif