Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / tty / serial / pch_uart.c

diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index b5874d1e26b61f54df2197200168963d4c3807df..d391650b82e7be9bb63ac7df85a9de3e4fe0bed8 100644 (file)
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -31,6 +31,7 @@
 #include <linux/dmi.h>
 #include <linux/nmi.h>
 #include <linux/delay.h>
+#include <linux/of.h>
 
 #include <linux/debugfs.h>
 #include <linux/dmaengine.h>
@@ -1826,6 +1827,10 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        priv->trigger_level = 1;
        priv->fcr = 0;
 
+       if (pdev->dev.of_node)
+               of_property_read_u32(pdev->dev.of_node, "clock-frequency"
+                                        , &user_uartclk);
+
 #ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
        pch_uart_ports[board->line_no] = priv;
 #endif