aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-06-25 21:53:22 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-21 21:21:23 -0400
commitc1d2dfed42f0d8d7eb7d3fa458f93e1e6fdb7e93 (patch)
tree1f8c50204f6e7cc7a0d8497404a8978377aa98e7 /drivers
parent0529b225e14f6187cd7a997ebc438538059a7889 (diff)
pch_uart: Add uart_clk selection for the MinnowBoard
commit 29692d05647cb7ecea56242241f77291d5624b95 upstream. Use DMI_BOARD_NAME to determine if we are running on a MinnowBoard and set the uart clock to 50MHz if so. This removes the need to pass the user_uartclk to the kernel at boot time. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Jiri Slaby <jslaby@suse.cz> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Peter Waskiewicz <peter.p.waskiewicz.jr@intel.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/pch_uart.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 21a7e179edf3..572d48189de9 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -217,6 +217,7 @@ enum {
217#define FRI2_64_UARTCLK 64000000 /* 64.0000 MHz */ 217#define FRI2_64_UARTCLK 64000000 /* 64.0000 MHz */
218#define FRI2_48_UARTCLK 48000000 /* 48.0000 MHz */ 218#define FRI2_48_UARTCLK 48000000 /* 48.0000 MHz */
219#define NTC1_UARTCLK 64000000 /* 64.0000 MHz */ 219#define NTC1_UARTCLK 64000000 /* 64.0000 MHz */
220#define MINNOW_UARTCLK 50000000 /* 50.0000 MHz */
220 221
221struct pch_uart_buffer { 222struct pch_uart_buffer {
222 unsigned char *buf; 223 unsigned char *buf;
@@ -398,6 +399,10 @@ static int pch_uart_get_uartclk(void)
398 strstr(cmp, "nanoETXexpress-TT"))) 399 strstr(cmp, "nanoETXexpress-TT")))
399 return NTC1_UARTCLK; 400 return NTC1_UARTCLK;
400 401
402 cmp = dmi_get_system_info(DMI_BOARD_NAME);
403 if (cmp && strstr(cmp, "MinnowBoard"))
404 return MINNOW_UARTCLK;
405
401 return DEFAULT_UARTCLK; 406 return DEFAULT_UARTCLK;
402} 407}
403 408