diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-11 14:22:01 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-11 14:22:01 +0900 |
| commit | e4c787dac21e50ac9ef53fac91b9182d4fede465 (patch) | |
| tree | a840c0ffe021baa95440abdd4d39dd3ea78838a9 /drivers/tty | |
| parent | Merge 3.18-rc4 into tty-next. (diff) | |
| download | linux-dev-e4c787dac21e50ac9ef53fac91b9182d4fede465.tar.xz linux-dev-e4c787dac21e50ac9ef53fac91b9182d4fede465.zip | |
Revert "serial: of-serial: fetch line number from DT"
This reverts commit 1bd8324535ec1ff44aef55c0e40b9e7d56b310fb.
To quote Olof:
This commit broke a whole lot of tegra boards in last night's
-next here. In particular, I've been looking at
tegra20-seaboard, which now doesn't boot with console any more.
Breaking existing systems is bad.
Reported-by: Olof Johansson <olof@lixom.net>
Cc: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/of_serial.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 22f06a6479e6..fd00e2521584 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -102,10 +102,6 @@ static int of_platform_serial_setup(struct platform_device *ofdev, if (of_property_read_u32(np, "fifo-size", &prop) == 0) port->fifosize = prop; - /* Check for a fixed line number */ - if ((ret = of_alias_get_id(np, "serial")) >= 0) - port->line = ret; - port->irq = irq_of_parse_and_map(np, 0); port->iotype = UPIO_MEM; if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { |