aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-09-27 22:05:07 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-02 16:38:58 -0400
commit2fd8e454189d580bcfc198fee60e51655945b986 (patch)
treea93347a0bb7a92efbc97c9d6a60099210010830b
parent9e3eb4eabdb6f652ca8a99f58f3eccf29610839d (diff)
serial: 8250_uniphier: remove unused "fifo-size" property
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>
-rw-r--r--Documentation/devicetree/bindings/serial/uniphier-uart.txt4
-rw-r--r--drivers/tty/serial/8250/8250_uniphier.c10
2 files changed, 1 insertions, 13 deletions
diff --git a/Documentation/devicetree/bindings/serial/uniphier-uart.txt b/Documentation/devicetree/bindings/serial/uniphier-uart.txt
index 0b3892a7a528..811c479b373d 100644
--- a/Documentation/devicetree/bindings/serial/uniphier-uart.txt
+++ b/Documentation/devicetree/bindings/serial/uniphier-uart.txt
@@ -6,9 +6,6 @@ Required properties:
6- interrupts: a single interrupt specifier. 6- interrupts: a single interrupt specifier.
7- clocks: phandle to the input clock. 7- clocks: phandle to the input clock.
8 8
9Optional properties:
10- fifo-size: the RX/TX FIFO size. Defaults to 64 if not specified.
11
12Example: 9Example:
13 aliases { 10 aliases {
14 serial0 = &serial0; 11 serial0 = &serial0;
@@ -19,5 +16,4 @@ Example:
19 reg = <0x54006800 0x40>; 16 reg = <0x54006800 0x40>;
20 interrupts = <0 33 4>; 17 interrupts = <0 33 4>;
21 clocks = <&uart_clk>; 18 clocks = <&uart_clk>;
22 fifo-size = <64>;
23 }; 19 };
diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
index 28d88ccf5a0c..d292654422b2 100644
--- a/drivers/tty/serial/8250/8250_uniphier.c
+++ b/drivers/tty/serial/8250/8250_uniphier.c
@@ -12,9 +12,6 @@
12 12
13#include "8250.h" 13#include "8250.h"
14 14
15/* Most (but not all) of UniPhier UART devices have 64-depth FIFO. */
16#define UNIPHIER_UART_DEFAULT_FIFO_SIZE 64
17
18/* 15/*
19 * This hardware is similar to 8250, but its register map is a bit different: 16 * This hardware is similar to 8250, but its register map is a bit different:
20 * - MMIO32 (regshift = 2) 17 * - MMIO32 (regshift = 2)
@@ -185,12 +182,6 @@ static int uniphier_of_serial_setup(struct device *dev, struct uart_port *port,
185 182
186 port->uartclk = clk_get_rate(priv->clk); 183 port->uartclk = clk_get_rate(priv->clk);
187 184
188 /* Check for fifo size */
189 if (of_property_read_u32(np, "fifo-size", &prop) == 0)
190 port->fifosize = prop;
191 else
192 port->fifosize = UNIPHIER_UART_DEFAULT_FIFO_SIZE;
193
194 return 0; 185 return 0;
195} 186}
196 187
@@ -241,6 +232,7 @@ static int uniphier_uart_probe(struct platform_device *pdev)
241 232
242 up.port.type = PORT_16550A; 233 up.port.type = PORT_16550A;
243 up.port.iotype = UPIO_MEM32; 234 up.port.iotype = UPIO_MEM32;
235 up.port.fifosize = 64;
244 up.port.regshift = UNIPHIER_UART_REGSHIFT; 236 up.port.regshift = UNIPHIER_UART_REGSHIFT;
245 up.port.flags = UPF_FIXED_PORT | UPF_FIXED_TYPE; 237 up.port.flags = UPF_FIXED_PORT | UPF_FIXED_TYPE;
246 up.capabilities = UART_CAP_FIFO; 238 up.capabilities = UART_CAP_FIFO;