diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:31 +0100 |
| commit | c04ee7fcbfba1471af90cf6407370efc779c1243 (patch) | |
| tree | c0c37c40beb8bd197b7f424a67f12487960c4882 /drivers/tty/serial/pch_uart.c | |
| parent | e0749524b57019f480ad6c581431589d053e0cb0 (diff) | |
| parent | 0f4a56e16d5fc9028b62ba529177a3109513e111 (diff) | |
Merge tag 'v3.10.2' into linux-linaro-lsklsk
This is the 3.10.2 stable release
Diffstat (limited to 'drivers/tty/serial/pch_uart.c')
| -rw-r--r-- | drivers/tty/serial/pch_uart.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 21a7e179edf..572d48189de 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c @@ -217,6 +217,7 @@ enum { #define FRI2_64_UARTCLK 64000000 /* 64.0000 MHz */ #define FRI2_48_UARTCLK 48000000 /* 48.0000 MHz */ #define NTC1_UARTCLK 64000000 /* 64.0000 MHz */ +#define MINNOW_UARTCLK 50000000 /* 50.0000 MHz */ struct pch_uart_buffer { unsigned char *buf; @@ -398,6 +399,10 @@ static int pch_uart_get_uartclk(void) strstr(cmp, "nanoETXexpress-TT"))) return NTC1_UARTCLK; + cmp = dmi_get_system_info(DMI_BOARD_NAME); + if (cmp && strstr(cmp, "MinnowBoard")) + return MINNOW_UARTCLK; + return DEFAULT_UARTCLK; } |