Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 136ce40e9f1f24ca1dbf7714c669a7bca56440ea

Authored by Matthew Wilcox
Committed by Matthew Wilcox
1 parent 75a4958154
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PARISC] Clean up asm-parisc/serial.h 

Russell King pointed out that asm/serial.h is anachronistic and we were
misusing BASE_BAUD.  So fix BASE_BAUD for PCI 16550 UARTs, move LASI_BASE_BAUD
into 8250_gsc, and fix the obsolete comment about reserving serial port slots.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

Showing 2 changed files with 4 additions and 16 deletions Side-by-side Diff

drivers/serial/8250_gsc.c
Diff comments   View file @ 136ce40
... ... @@ -22,7 +22,6 @@
22 22 #include <asm/hardware.h>
23 23 #include <asm/parisc-device.h>
24 24 #include <asm/io.h>
25   -#include <asm/serial.h> /* for LASI_BASE_BAUD */
26 25  
27 26 #include "8250.h"
28 27  
... ... @@ -54,7 +53,8 @@
54 53  
55 54 memset(&port, 0, sizeof(port));
56 55 port.iotype = UPIO_MEM;
57   - port.uartclk = LASI_BASE_BAUD * 16;
  56 + /* 7.272727MHz on Lasi. Assumed the same for Dino, Wax and Timi. */
  57 + port.uartclk = 7272727;
58 58 port.mapbase = address;
59 59 port.membase = ioremap_nocache(address, 16);
60 60 port.irq = dev->irq;
include/asm-parisc/serial.h
Diff comments   View file @ 136ce40
... ... @@ -3,21 +3,9 @@
3 3 */
4 4  
5 5 /*
6   - * This assumes you have a 7.272727 MHz clock for your UART.
7   - * The documentation implies a 40Mhz clock, and elsewhere a 7Mhz clock
8   - * Clarified: 7.2727MHz on LASI. Not yet clarified for DINO
  6 + * This is used for 16550-compatible UARTs
9 7 */
  8 +#define BASE_BAUD ( 1843200 / 16 )
10 9  
11   -#define LASI_BASE_BAUD ( 7272727 / 16 )
12   -#define BASE_BAUD LASI_BASE_BAUD
13   -
14   -/*
15   - * We don't use the ISA probing code, so these entries are just to reserve
16   - * space. Some example (maximal) configurations:
17   - * - 712 w/ additional Lasi & RJ16 ports: 4
18   - * - J5k w/ PCI serial cards: 2 + 4 * card ~= 34
19   - * A500 w/ PCI serial cards: 5 + 4 * card ~= 17
20   - */
21   -
22 10 #define SERIAL_PORT_DFNS