diff options
author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2013-03-25 07:34:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 17:06:44 -0400 |
commit | 9f1ca068ea9968e2bde4a2418d97fcd89005f4bf (patch) | |
tree | 3decdc75daf909524b07f549d064537fb7413547 | |
parent | 6a3f45dccfa3db4de43aabc2f75a337e878f9b4b (diff) |
serial: of_serial: Handle fifo-size property
This will reduce the need for extra types in 8250.c just
in case the fifo size differs from the standard.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | Documentation/devicetree/bindings/tty/serial/of-serial.txt | 1 | ||||
-rw-r--r-- | drivers/tty/serial/of_serial.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/tty/serial/of-serial.txt b/Documentation/devicetree/bindings/tty/serial/of-serial.txt index 8f01cb190f25..c13f0ce74da6 100644 --- a/Documentation/devicetree/bindings/tty/serial/of-serial.txt +++ b/Documentation/devicetree/bindings/tty/serial/of-serial.txt | |||
@@ -33,6 +33,7 @@ Optional properties: | |||
33 | RTAS and should not be registered. | 33 | RTAS and should not be registered. |
34 | - no-loopback-test: set to indicate that the port does not implements loopback | 34 | - no-loopback-test: set to indicate that the port does not implements loopback |
35 | test mode | 35 | test mode |
36 | - fifo-size: the fifo size of the UART. | ||
36 | 37 | ||
37 | Example: | 38 | Example: |
38 | 39 | ||
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index b025d5438275..267711b5cb4d 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c | |||
@@ -97,6 +97,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev, | |||
97 | if (of_property_read_u32(np, "reg-shift", &prop) == 0) | 97 | if (of_property_read_u32(np, "reg-shift", &prop) == 0) |
98 | port->regshift = prop; | 98 | port->regshift = prop; |
99 | 99 | ||
100 | /* Check for fifo size */ | ||
101 | if (of_property_read_u32(np, "fifo-size", &prop) == 0) | ||
102 | port->fifosize = prop; | ||
103 | |||
100 | port->irq = irq_of_parse_and_map(np, 0); | 104 | port->irq = irq_of_parse_and_map(np, 0); |
101 | port->iotype = UPIO_MEM; | 105 | port->iotype = UPIO_MEM; |
102 | if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { | 106 | if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { |