Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
  pch_uart: reference clock on CM-iTC
  pch_phub: add new device ML7213
  n_gsm: fix UIH control byte : P bit should be 0
  n_gsm: add a documentation
  serial: msm_serial_hs: Add MSM high speed UART driver
  tty_audit: fix tty_audit_add_data live lock on audit disabled
  tty: move cd1865.h to drivers/staging/tty/
  Staging: tty: fix build with epca.c driver
  pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
  Staging: generic_serial: fix double locking bug
  nozomi: don't use flush_scheduled_work()
  tty/serial: Relax the device_type restriction from of_serial
  MAINTAINERS: Update HVC file patterns
  tty: phase out of ioctl file pointer for tty3270 as well
  tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
  pch_uart: Fix DMA channel miss-setting issue.
  pch_uart: fix exclusive access issue
  pch_uart: fix auto flow control miss-setting issue
  pch_uart: fix uart clock setting issue
  pch_uart : Use dev_xxx not pr_xxx
  ...

Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)

1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index 98bffc471b17..380ba806495d 100644
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -27,6 +27,7 @@
 #include <linux/mutex.h>
 #include <linux/if_ether.h>
 #include <linux/ctype.h>
+#include <linux/dmi.h>
 
 #define PHUB_STATUS 0x00                /* Status Register offset */
 #define PHUB_CONTROL 0x04               /* Control Register offset */
@@ -46,6 +47,17 @@
 #define PCH_MINOR_NOS 1
 #define CLKCFG_CAN_50MHZ 0x12000000
 #define CLKCFG_CANCLK_MASK 0xFF000000
+#define CLKCFG_UART_MASK                        0xFFFFFF
+
+/* CM-iTC */
+#define CLKCFG_UART_48MHZ                       (1 << 16)
+#define CLKCFG_BAUDDIV                          (2 << 20)
+#define CLKCFG_PLL2VCO                          (8 << 9)
+#define CLKCFG_UARTCLKSEL                       (1 << 18)
+
+/* Macros for ML7213 */
+#define PCI_VENDOR_ID_ROHM                      0x10db
+#define PCI_DEVICE_ID_ROHM_ML7213_PHUB          0x801A
 
 /* Macros for ML7213 */
 #define PCI_VENDOR_ID_ROHM                      0x10db
@@ -618,6 +630,14 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev,
                                                CLKCFG_CAN_50MHZ,
                                                CLKCFG_CANCLK_MASK);
 
+                /* quirk for CM-iTC board */
+                if (strstr(dmi_get_system_info(DMI_BOARD_NAME), "CM-iTC"))
+                        pch_phub_read_modify_write_reg(chip,
+                                                (unsigned int)CLKCFG_REG_OFFSET,
+                                                CLKCFG_UART_48MHZ | CLKCFG_BAUDDIV |
+                                                CLKCFG_PLL2VCO | CLKCFG_UARTCLKSEL,
+                                                CLKCFG_UART_MASK);
+
                 /* set the prefech value */
                 iowrite32(0x000affaa, chip->pch_phub_base_address + 0x14);
                 /* set the interrupt delay value */