Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299126
b: refs/heads/master
c: 11bbd5b
h: refs/heads/master
v: v3
  • Loading branch information
Michael Brunner authored and Greg Kroah-Hartman committed Apr 9, 2012
1 parent bac088c commit 18e0532
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 867c902e07d5677e2a5b54c0435e589513abde48
refs/heads/master: 11bbd5b6dae49fd7072ebf5eb63735827bd72f42
7 changes: 7 additions & 0 deletions trunk/drivers/tty/serial/pch_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ enum {
#define CMITC_UARTCLK 192000000 /* 192.0000 MHz */
#define FRI2_64_UARTCLK 64000000 /* 64.0000 MHz */
#define FRI2_48_UARTCLK 48000000 /* 48.0000 MHz */
#define NTC1_UARTCLK 64000000 /* 64.0000 MHz */

struct pch_uart_buffer {
unsigned char *buf;
Expand Down Expand Up @@ -388,6 +389,12 @@ static int pch_uart_get_uartclk(void)
if (cmp && strstr(cmp, "Fish River Island II"))
return FRI2_48_UARTCLK;

/* Kontron COMe-mTT10 (nanoETXexpress-TT) */
cmp = dmi_get_system_info(DMI_BOARD_NAME);
if (cmp && (strstr(cmp, "COMe-mTT") ||
strstr(cmp, "nanoETXexpress-TT")))
return NTC1_UARTCLK;

return DEFAULT_UARTCLK;
}

Expand Down

0 comments on commit 18e0532

Please sign in to comment.