Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 045f32dda9477d3ddf31a4fa862c487d0f747e33

Authored by Baruch Siach
Committed by Greg Kroah-Hartman
1 parent 13a7a6ac0a
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Revert "tty/serial: of_serial: add DT alias ID handling" 

This reverts commit 6d01bb9dc82a60580f749062a48cb47cd5caca07.

The exact same code was added in commit 3239fd31d4 (serial: of-serial: fetch
line number from DT) a few lined above. Doing this once should be enough.

Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 0 additions and 4 deletions Side-by-side Diff

drivers/tty/serial/of_serial.c
Diff comments   View file @ 045f32d
... ... @@ -133,10 +133,6 @@
133 133 if (of_find_property(np, "no-loopback-test", NULL))
134 134 port->flags |= UPF_SKIP_TEST;
135 135  
136   - ret = of_alias_get_id(np, "serial");
137   - if (ret >= 0)
138   - port->line = ret;
139   -
140 136 port->dev = &ofdev->dev;
141 137  
142 138 switch (type) {