Skip to content

Commit

Permalink
serial: 8250_uniphier: remove unused "fifo-size" property
Browse files Browse the repository at this point in the history
The FIFO size of the UART devices is 64 on almost all UniPhier SoCs
with the exception Pro4TV SoC (MN2WS0235), which used 128 FIFO size.
However, Pro4TV SoC was never upstreamed, and out of production.

So, this property has never been used in a useful way.
Let's remove old unused code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Masahiro Yamada authored and Greg Kroah-Hartman committed Oct 2, 2018
1 parent 9e3eb4e commit 2fd8e45
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
4 changes: 0 additions & 4 deletions Documentation/devicetree/bindings/serial/uniphier-uart.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ Required properties:
- interrupts: a single interrupt specifier.
- clocks: phandle to the input clock.

Optional properties:
- fifo-size: the RX/TX FIFO size. Defaults to 64 if not specified.

Example:
aliases {
serial0 = &serial0;
Expand All @@ -19,5 +16,4 @@ Example:
reg = <0x54006800 0x40>;
interrupts = <0 33 4>;
clocks = <&uart_clk>;
fifo-size = <64>;
};
10 changes: 1 addition & 9 deletions drivers/tty/serial/8250/8250_uniphier.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@

#include "8250.h"

/* Most (but not all) of UniPhier UART devices have 64-depth FIFO. */
#define UNIPHIER_UART_DEFAULT_FIFO_SIZE 64

/*
* This hardware is similar to 8250, but its register map is a bit different:
* - MMIO32 (regshift = 2)
Expand Down Expand Up @@ -185,12 +182,6 @@ static int uniphier_of_serial_setup(struct device *dev, struct uart_port *port,

port->uartclk = clk_get_rate(priv->clk);

/* Check for fifo size */
if (of_property_read_u32(np, "fifo-size", &prop) == 0)
port->fifosize = prop;
else
port->fifosize = UNIPHIER_UART_DEFAULT_FIFO_SIZE;

return 0;
}

Expand Down Expand Up @@ -241,6 +232,7 @@ static int uniphier_uart_probe(struct platform_device *pdev)

up.port.type = PORT_16550A;
up.port.iotype = UPIO_MEM32;
up.port.fifosize = 64;
up.port.regshift = UNIPHIER_UART_REGSHIFT;
up.port.flags = UPF_FIXED_PORT | UPF_FIXED_TYPE;
up.capabilities = UART_CAP_FIFO;
Expand Down

0 comments on commit 2fd8e45

Please sign in to comment.