msm_serial_hs_cir: Add HTC CIR serial driver

* HTC kernel version: m7-kk-3.4.10-17db3b4

Change-Id: I738963154d7b29aec19190f667082f2e66578a00
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 521a1c5..c274c71 100755
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -5304,7 +5304,11 @@
 	CLK_LOOKUP("core_clk",		gsbi1_uart_clk.c, "msm_serial_hsl.1"),
 #endif
 	CLK_LOOKUP("core_clk",		gsbi2_uart_clk.c,	""),
+#ifdef CONFIG_SERIAL_CIR
+	CLK_LOOKUP("core_clk",		gsbi3_uart_clk.c,	"msm_serial_cir.2"),
+#else
 	CLK_LOOKUP("core_clk",		gsbi3_uart_clk.c,	""),
+#endif
 #ifdef CONFIG_MACH_LGE
 	CLK_LOOKUP("core_clk",		gsbi4_uart_clk.c,	"msm_serial_hsl.0"),
 #else
@@ -5368,6 +5372,9 @@
 #endif
 	CLK_LOOKUP("iface_clk",		gsbi1_p_clk.c,	"qup_i2c.0"),
 	CLK_LOOKUP("iface_clk",		gsbi2_p_clk.c,		""),
+#ifdef CONFIG_SERIAL_CIR
+	CLK_LOOKUP("iface_clk",		gsbi3_p_clk.c,		"msm_serial_cir.2"),
+#endif
 	CLK_LOOKUP("iface_clk",		gsbi3_p_clk.c,		"qup_i2c.3"),
 #ifdef CONFIG_MACH_LGE
 	CLK_LOOKUP("iface_clk",		gsbi4_p_clk.c,		"msm_serial_hsl.0"),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 0c537fe..603bca5 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -251,8 +251,13 @@
 };
 
 struct platform_device apq8064_device_uart_gsbi3 = {
+#ifdef CONFIG_SERIAL_CIR
+	.name	= "msm_serial_cir",
+	.id	= 2,
+#else
 	.name	= "msm_serial_hsl",
 	.id	= 0,
+#endif
 	.num_resources	= ARRAY_SIZE(resources_uart_gsbi3),
 	.resource	= resources_uart_gsbi3,
 };
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index fe19678..8e28216 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1026,6 +1026,21 @@
 	help
 	  Select this module to enable MSM high speed UART driver.
 
+config SERIAL_CIR
+	tristate "MSM UART High Speed : Legacy mode CIR Driver"
+	depends on ARM && ARCH_MSM
+	select SERIAL_CORE
+	default n
+	help
+	  Select this module to enable MSM high speed CIR driver.
+
+config CIR_ALWAYS_READY
+	bool "CIR is always ready"
+	depends on SERIAL_CIR
+	default n
+	help
+	  Requires SERIAL_CIR. Leave CIR always ready.
+
 config SERIAL_MSM_HSL_CONSOLE
 	bool "MSM High speed serial legacy mode console support"
 	depends on SERIAL_MSM_HSL=y
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index 4ae8fb7..277e213 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -58,6 +58,7 @@
 obj-$(CONFIG_SERIAL_MSM_HS) += msm_serial_hs.o
 obj-$(CONFIG_SERIAL_MSM_HS_BRCM) += msm_serial_hs_brcm.o
 obj-$(CONFIG_SERIAL_MSM_HSL) += msm_serial_hs_lite.o
+obj-$(CONFIG_SERIAL_CIR) += msm_serial_hs_cir_lite.o
 obj-$(CONFIG_MSM_SERIAL_DEBUGGER) += msm_serial_debugger.o
 obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
 obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
diff --git a/drivers/tty/serial/msm_serial_hs_cir_lite.c b/drivers/tty/serial/msm_serial_hs_cir_lite.c
new file mode 100644
index 0000000..1317772
--- /dev/null
+++ b/drivers/tty/serial/msm_serial_hs_cir_lite.c
@@ -0,0 +1,1834 @@
+/*
+ * drivers/serial/msm_serial.c - driver for msm7k serial device and console
+ *
+ * Copyright (C) 2007 Google, Inc.
+ * Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* Acknowledgements:
+ * This file is based on msm_serial.c, originally
+ * Written by Robert Love <rlove@google.com>  */
+
+#if defined(CONFIG_SERIAL_MSM_HSL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/atomic.h>
+#include <linux/hrtimer.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/irq.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/console.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+#include <linux/nmi.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/gpio.h>
+#include <linux/debugfs.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <mach/board.h>
+#include <mach/msm_serial_hs_lite.h>
+#include <asm/mach-types.h>
+#include "msm_serial_hs_hwreg.h"
+#include <mach/board_htc.h>
+#include <linux/htc_cir.h>
+
+#define D(x...) pr_info("[CIR] " x)
+#define E(x...) pr_err("[CIR][err] " x)
+
+#define HTC_IRDA_FUNC 1
+struct msm_hsl_port {
+	struct uart_port	uart;
+	char			name[16];
+	struct clk		*clk;
+	struct clk		*pclk;
+	struct dentry		*loopback_dir;
+#ifdef HTC_IRDA_FUNC
+	struct dentry		*irda_config; 
+#endif
+	unsigned int		imr;
+	unsigned int		*uart_csr_code;
+	unsigned int            *gsbi_mapbase;
+	unsigned int            *mapped_gsbi;
+	int			is_uartdm;
+	unsigned int            old_snap_state;
+	unsigned int		ver_id;
+	int (*cir_set_path)(int);
+	int (*cir_reset)(void);
+	int (*cir_power)(int); 
+	struct class *irda_class;
+	struct device *irda_dev;
+	struct class *cir_class;
+	struct device *cir_dev;
+};
+static struct msm_hsl_port *htc_cir_port;
+static int msm_serial_hsl_enable;
+static int cir_enable_flg;
+#define UARTDM_VERSION_11_13	0
+#define UARTDM_VERSION_14	1
+
+#define UART_TO_MSM(uart_port)	((struct msm_hsl_port *) uart_port)
+#define is_console(port)	((port)->cons && \
+				(port)->cons->index == (port)->line)
+
+static const unsigned int regmap[][UARTDM_LAST] = {
+	[UARTDM_VERSION_11_13] = {
+		[UARTDM_MR1] = UARTDM_MR1_ADDR,
+		[UARTDM_MR2] = UARTDM_MR2_ADDR,
+		[UARTDM_IMR] = UARTDM_IMR_ADDR,
+		[UARTDM_SR] = UARTDM_SR_ADDR,
+		[UARTDM_CR] = UARTDM_CR_ADDR,
+		[UARTDM_CSR] = UARTDM_CSR_ADDR,
+		[UARTDM_IPR] = UARTDM_IPR_ADDR,
+		[UARTDM_ISR] = UARTDM_ISR_ADDR,
+		[UARTDM_RX_TOTAL_SNAP] = UARTDM_RX_TOTAL_SNAP_ADDR,
+		[UARTDM_TFWR] = UARTDM_TFWR_ADDR,
+		[UARTDM_RFWR] = UARTDM_RFWR_ADDR,
+		[UARTDM_RF] = UARTDM_RF_ADDR,
+		[UARTDM_TF] = UARTDM_TF_ADDR,
+		[UARTDM_MISR] = UARTDM_MISR_ADDR,
+		[UARTDM_DMRX] = UARTDM_DMRX_ADDR,
+		[UARTDM_NCF_TX] = UARTDM_NCF_TX_ADDR,
+		[UARTDM_DMEN] = UARTDM_DMEN_ADDR,
+	},
+	[UARTDM_VERSION_14] = {
+		[UARTDM_MR1] = 0x0,
+		[UARTDM_MR2] = 0x4,
+		[UARTDM_IMR] = 0xb0,
+		[UARTDM_SR] = 0xa4,
+		[UARTDM_CR] = 0xa8,
+		[UARTDM_CSR] = 0xa0,
+		[UARTDM_IPR] = 0x18,
+		[UARTDM_ISR] = 0xb4,
+		[UARTDM_RX_TOTAL_SNAP] = 0xbc,
+		[UARTDM_TFWR] = 0x1c,
+		[UARTDM_RFWR] = 0x20,
+		[UARTDM_RF] = 0x140,
+		[UARTDM_TF] = 0x100,
+		[UARTDM_MISR] = 0xac,
+		[UARTDM_DMRX] = 0x34,
+		[UARTDM_NCF_TX] = 0x40,
+		[UARTDM_DMEN] = 0x3c,
+	},
+};
+
+static struct of_device_id msm_hsl_match_table[] = {
+	{	.compatible = "qcom,msm-lsuart-v14",
+		.data = (void *)UARTDM_VERSION_14
+	},
+	{}
+};
+static struct dentry *debug_base;
+static inline void wait_for_xmitr(struct uart_port *port, int bits);
+static inline void msm_hsl_write(struct uart_port *port,
+				 unsigned int val, unsigned int off)
+{
+	iowrite32(val, port->membase + off);
+}
+static inline unsigned int msm_hsl_read(struct uart_port *port,
+		     unsigned int off)
+{
+	return ioread32(port->membase + off);
+}
+
+static unsigned int msm_serial_hsl_has_gsbi(struct uart_port *port)
+{
+	D("%s: cir uart port[%d] is_uartdm=%d\n", __func__, (port)->line, UART_TO_MSM(port)->is_uartdm);
+	return UART_TO_MSM(port)->is_uartdm;
+}
+
+static int clk_en(struct uart_port *port, int enable)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+	int ret = 0;
+
+	if (enable) {
+
+		ret = clk_prepare_enable(msm_hsl_port->clk);
+		if (ret)
+			goto err;
+		if (msm_hsl_port->pclk) {
+			ret = clk_prepare_enable(msm_hsl_port->pclk);
+			if (ret) {
+				clk_disable_unprepare(msm_hsl_port->clk);
+				goto err;
+			}
+		}
+	} else {
+
+		clk_disable_unprepare(msm_hsl_port->clk);
+		if (msm_hsl_port->pclk)
+			clk_disable_unprepare(msm_hsl_port->pclk);
+	}
+err:
+	return ret;
+}
+static int msm_hsl_loopback_enable_set(void *data, u64 val)
+{
+	struct msm_hsl_port *msm_hsl_port = data;
+	struct uart_port *port = &(msm_hsl_port->uart);
+	unsigned int vid;
+	unsigned long flags;
+	int ret = 0;
+
+	ret = clk_set_rate(msm_hsl_port->clk, 7372800);
+	if (!ret)
+		clk_en(port, 1);
+	else {
+		E("%s(): Error: Setting the clock rate\n", __func__);
+		return -EINVAL;
+	}
+
+	vid = msm_hsl_port->ver_id;
+	if (val) {
+		spin_lock_irqsave(&port->lock, flags);
+		ret = msm_hsl_read(port, regmap[vid][UARTDM_MR2]);
+		ret |= UARTDM_MR2_LOOP_MODE_BMSK;
+		msm_hsl_write(port, ret, regmap[vid][UARTDM_MR2]);
+		spin_unlock_irqrestore(&port->lock, flags);
+		E("%s(): irda loopback enabled for line(%d)\n", __func__, port->line);
+	} else {
+		spin_lock_irqsave(&port->lock, flags);
+		ret = msm_hsl_read(port, regmap[vid][UARTDM_MR2]);
+		ret &= ~UARTDM_MR2_LOOP_MODE_BMSK;
+		msm_hsl_write(port, ret, regmap[vid][UARTDM_MR2]);
+		spin_unlock_irqrestore(&port->lock, flags);
+	}
+
+	clk_en(port, 0);
+	return 0;
+}
+static int msm_hsl_loopback_enable_get(void *data, u64 *val)
+{
+	struct msm_hsl_port *msm_hsl_port = data;
+	struct uart_port *port = &(msm_hsl_port->uart);
+	unsigned long flags;
+	int ret = 0;
+
+	ret = clk_set_rate(msm_hsl_port->clk, 7372800);
+	if (!ret)
+		clk_en(port, 1);
+	else {
+		E("%s(): Error setting clk rate\n", __func__);
+		return -EINVAL;
+	}
+
+	spin_lock_irqsave(&port->lock, flags);
+	ret = msm_hsl_read(port, regmap[msm_hsl_port->ver_id][UARTDM_MR2]);
+	spin_unlock_irqrestore(&port->lock, flags);
+	clk_en(port, 0);
+
+	*val = (ret & UARTDM_MR2_LOOP_MODE_BMSK) ? 1 : 0;
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(loopback_enable_fops, msm_hsl_loopback_enable_get,
+			msm_hsl_loopback_enable_set, "%llu\n");
+unsigned int force_baud_1;
+#ifdef HTC_IRDA_FUNC
+static int msm_hsl_irda_enable_set(void *data, u64 val)
+{
+	struct msm_hsl_port *msm_hsl_port = data;
+	struct uart_port *port = &(msm_hsl_port->uart);
+	unsigned long flags;
+	int ret = 0;
+
+	if (val == 96) {
+		force_baud_1 = 96;
+		E("%s(): change baud = 9600\n", __func__);
+		return 0;
+	} else if (val == 1152) {
+		E("%s(): change baud = 115200\n", __func__);
+		force_baud_1 = 1152;
+		return 0;
+	} else if (val == 1153) {
+		E("%s():no  change baud \n", __func__);
+		force_baud_1 = 0;
+		return 0;
+	}
+
+	ret = clk_set_rate(msm_hsl_port->clk, 7372800);
+	if (!ret) {
+		clk_en(port, 1);
+		E("%s(): irda Clock enabled for line(%d)\n", __func__, port->line);
+	} else {
+		E("%s(): Error: Setting the clock rate\n", __func__);
+		return -EINVAL;
+	}
+
+	if (val) {
+		E("%s(): irda turn on IRDA\n", __func__);
+		spin_lock_irqsave(&port->lock, flags);
+		ret = 1;
+		ret |= (int)val;
+		msm_hsl_write(port, ret, UARTDM_IRDA_ADDR);
+		spin_unlock_irqrestore(&port->lock, flags);
+
+		if (msm_hsl_port->cir_set_path)
+			msm_hsl_port->cir_set_path(PATH_IRDA);
+		else
+			E("no irda enable callback function");
+
+	} else {
+		E("%s(): irda turn off IRDA \n", __func__);
+		spin_lock_irqsave(&port->lock, flags);
+		ret = 0;
+		msm_hsl_write(port, ret, UARTDM_IRDA_ADDR);
+		spin_unlock_irqrestore(&port->lock, flags);
+
+		if (msm_hsl_port->cir_set_path)
+			msm_hsl_port->cir_set_path(PATH_NONE);
+		else
+			E("no irda enable callback function");
+	}
+
+
+	clk_en(port, 0);
+	E("%s(): irda Clock enabled for line(%d)\n", __func__, port->line);
+	return 0;
+}
+static int msm_hsl_irda_enable_get(void *data, u64 *val)
+{
+	E("%s: warning! disallow read register UARTDM_IRDA\n", __func__);
+
+	return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(msm_serial_irda_fops, msm_hsl_irda_enable_get,
+			msm_hsl_irda_enable_set, "%llu\n");
+#endif
+
+static void msm_hsl_debugfs_init(struct msm_hsl_port *msm_uport,
+								int id)
+{
+	char node_name[15];
+
+	snprintf(node_name, sizeof(node_name), "loopback.%d", id);
+	msm_uport->loopback_dir = debugfs_create_file(node_name,
+					S_IRUGO | S_IWUSR,
+					debug_base,
+					msm_uport,
+					&loopback_enable_fops);
+
+	if (IS_ERR_OR_NULL(msm_uport->loopback_dir))
+		E("%s(): Cannot create loopback.%d debug entry",
+							__func__, id);
+#ifdef HTC_IRDA_FUNC
+	snprintf(node_name, sizeof(node_name), "irda.%d", id);
+	msm_uport->irda_config = debugfs_create_file(node_name,
+					S_IRUGO | S_IWUSR,
+					debug_base,
+					msm_uport,
+					&msm_serial_irda_fops);
+
+	if (IS_ERR_OR_NULL(msm_uport->irda_config))
+		E("%s(): Cannot create irda.%d debug entry",
+							__func__, id);
+#endif
+}
+static void msm_hsl_stop_tx_cir(struct uart_port *port)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	msm_hsl_port->imr &= ~UARTDM_ISR_TXLEV_BMSK;
+	msm_hsl_write(port, msm_hsl_port->imr,
+		regmap[msm_hsl_port->ver_id][UARTDM_IMR]);
+}
+
+static void msm_hsl_start_tx_cir(struct uart_port *port)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	msm_hsl_port->imr |= UARTDM_ISR_TXLEV_BMSK;
+	msm_hsl_write(port, msm_hsl_port->imr,
+		regmap[msm_hsl_port->ver_id][UARTDM_IMR]);
+}
+
+static void msm_hsl_stop_rx_cir(struct uart_port *port)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	msm_hsl_port->imr &= ~(UARTDM_ISR_RXLEV_BMSK |
+			       UARTDM_ISR_RXSTALE_BMSK);
+	msm_hsl_write(port, msm_hsl_port->imr,
+		regmap[msm_hsl_port->ver_id][UARTDM_IMR]);
+}
+
+static void msm_hsl_enable_ms_cir(struct uart_port *port)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	msm_hsl_port->imr |= UARTDM_ISR_DELTA_CTS_BMSK;
+	msm_hsl_write(port, msm_hsl_port->imr,
+		regmap[msm_hsl_port->ver_id][UARTDM_IMR]);
+}
+
+static void handle_rx(struct uart_port *port, unsigned int misr)
+{
+	struct tty_struct *tty = port->state->port.tty;
+	unsigned int vid;
+	unsigned int sr;
+	int count = 0;
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	vid = msm_hsl_port->ver_id;
+	if ((msm_hsl_read(port, regmap[vid][UARTDM_SR]) &
+				UARTDM_SR_OVERRUN_BMSK)) {
+		port->icount.overrun++;
+		tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+		msm_hsl_write(port, RESET_ERROR_STATUS,
+			regmap[vid][UARTDM_CR]);
+	}
+
+	if (misr & UARTDM_ISR_RXSTALE_BMSK) {
+		count = msm_hsl_read(port,
+			regmap[vid][UARTDM_RX_TOTAL_SNAP]) -
+			msm_hsl_port->old_snap_state;
+		msm_hsl_port->old_snap_state = 0;
+	} else {
+		count = 4 * (msm_hsl_read(port, regmap[vid][UARTDM_RFWR]));
+		msm_hsl_port->old_snap_state += count;
+	}
+
+	
+	while (count > 0) {
+		unsigned int c;
+		char flag = TTY_NORMAL;
+
+		sr = msm_hsl_read(port, regmap[vid][UARTDM_SR]);
+		if ((sr & UARTDM_SR_RXRDY_BMSK) == 0) {
+			msm_hsl_port->old_snap_state -= count;
+			break;
+		}
+		c = msm_hsl_read(port, regmap[vid][UARTDM_RF]);
+		if (sr & UARTDM_SR_RX_BREAK_BMSK) {
+			port->icount.brk++;
+			if (uart_handle_break(port))
+				continue;
+		} else if (sr & UARTDM_SR_PAR_FRAME_BMSK) {
+			port->icount.frame++;
+		} else {
+			port->icount.rx++;
+		}
+
+		
+		sr &= port->read_status_mask;
+		if (sr & UARTDM_SR_RX_BREAK_BMSK)
+			flag = TTY_BREAK;
+		else if (sr & UARTDM_SR_PAR_FRAME_BMSK)
+			flag = TTY_FRAME;
+
+		
+		
+		tty_insert_flip_string(tty, (char *) &c,
+				       (count > 4) ? 4 : count);
+		count -= 4;
+	}
+
+	tty_flip_buffer_push(tty);
+}
+
+static void handle_tx(struct uart_port *port)
+{
+	struct circ_buf *xmit = &port->state->xmit;
+	int sent_tx;
+	int tx_count;
+	int x;
+	unsigned int tf_pointer = 0;
+	unsigned int vid;
+
+	vid = UART_TO_MSM(port)->ver_id;
+	tx_count = uart_circ_chars_pending(xmit);
+
+	if (tx_count > (UART_XMIT_SIZE - xmit->tail))
+		tx_count = UART_XMIT_SIZE - xmit->tail;
+	if (tx_count >= port->fifosize)
+		tx_count = port->fifosize;
+
+	
+	if (port->x_char) {
+		wait_for_xmitr(port, UARTDM_ISR_TX_READY_BMSK);
+		msm_hsl_write(port, tx_count + 1,
+			regmap[vid][UARTDM_NCF_TX]);
+		msm_hsl_write(port, port->x_char, regmap[vid][UARTDM_TF]);
+		port->icount.tx++;
+		port->x_char = 0;
+	} else if (tx_count) {
+		wait_for_xmitr(port, UARTDM_ISR_TX_READY_BMSK);
+		msm_hsl_write(port, tx_count, regmap[vid][UARTDM_NCF_TX]);
+	}
+	if (!tx_count) {
+		msm_hsl_stop_tx_cir(port);
+		return;
+	}
+
+	while (tf_pointer < tx_count)  {
+		if (unlikely(!(msm_hsl_read(port, regmap[vid][UARTDM_SR]) &
+			       UARTDM_SR_TXRDY_BMSK)))
+			continue;
+		switch (tx_count - tf_pointer) {
+		case 1: {
+			x = xmit->buf[xmit->tail];
+			port->icount.tx++;
+			break;
+		}
+		case 2: {
+			x = xmit->buf[xmit->tail]
+				| xmit->buf[xmit->tail+1] << 8;
+			port->icount.tx += 2;
+			break;
+		}
+		case 3: {
+			x = xmit->buf[xmit->tail]
+				| xmit->buf[xmit->tail+1] << 8
+				| xmit->buf[xmit->tail + 2] << 16;
+			port->icount.tx += 3;
+			break;
+		}
+		default: {
+			x = *((int *)&(xmit->buf[xmit->tail]));
+			port->icount.tx += 4;
+			break;
+		}
+		}
+		msm_hsl_write(port, x, regmap[vid][UARTDM_TF]);
+		xmit->tail = ((tx_count - tf_pointer < 4) ?
+			      (tx_count - tf_pointer + xmit->tail) :
+			      (xmit->tail + 4)) & (UART_XMIT_SIZE - 1);
+		tf_pointer += 4;
+		sent_tx = 1;
+	}
+
+	if (uart_circ_empty(xmit))
+		msm_hsl_stop_tx_cir(port);
+
+	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+		uart_write_wakeup(port);
+
+}
+
+static void handle_delta_cts(struct uart_port *port)
+{
+	unsigned int vid = UART_TO_MSM(port)->ver_id;
+
+	msm_hsl_write(port, RESET_CTS, regmap[vid][UARTDM_CR]);
+	port->icount.cts++;
+	wake_up_interruptible(&port->state->port.delta_msr_wait);
+}
+
+static irqreturn_t msm_hsl_irq(int irq, void *dev_id)
+{
+	struct uart_port *port = dev_id;
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+	unsigned int vid;
+	unsigned int misr;
+	unsigned long flags;
+
+	spin_lock_irqsave(&port->lock, flags);
+	vid = msm_hsl_port->ver_id;
+	misr = msm_hsl_read(port, regmap[vid][UARTDM_MISR]);
+	
+	msm_hsl_write(port, 0, regmap[vid][UARTDM_IMR]);
+
+	if (misr & (UARTDM_ISR_RXSTALE_BMSK | UARTDM_ISR_RXLEV_BMSK)) {
+		handle_rx(port, misr);
+		if (misr & (UARTDM_ISR_RXSTALE_BMSK))
+			msm_hsl_write(port, RESET_STALE_INT,
+					regmap[vid][UARTDM_CR]);
+		msm_hsl_write(port, 6500, regmap[vid][UARTDM_DMRX]);
+		msm_hsl_write(port, STALE_EVENT_ENABLE, regmap[vid][UARTDM_CR]);
+	}
+	if (misr & UARTDM_ISR_TXLEV_BMSK)
+		handle_tx(port);
+
+	if (misr & UARTDM_ISR_DELTA_CTS_BMSK)
+		handle_delta_cts(port);
+
+	
+	msm_hsl_write(port, msm_hsl_port->imr, regmap[vid][UARTDM_IMR]);
+	spin_unlock_irqrestore(&port->lock, flags);
+
+	return IRQ_HANDLED;
+}
+
+static unsigned int msm_hsl_tx_empty_cir(struct uart_port *port)
+{
+	unsigned int ret;
+	unsigned int vid = UART_TO_MSM(port)->ver_id;
+
+	ret = (msm_hsl_read(port, regmap[vid][UARTDM_SR]) &
+	       UARTDM_SR_TXEMT_BMSK) ? TIOCSER_TEMT : 0;
+	return ret;
+}
+
+static void msm_hsl_reset(struct uart_port *port)
+{
+	unsigned int vid = UART_TO_MSM(port)->ver_id;
+
+	
+	msm_hsl_write(port, RESET_RX, regmap[vid][UARTDM_CR]);
+	msm_hsl_write(port, RESET_TX, regmap[vid][UARTDM_CR]);
+	msm_hsl_write(port, RESET_ERROR_STATUS, regmap[vid][UARTDM_CR]);
+	msm_hsl_write(port, RESET_BREAK_INT, regmap[vid][UARTDM_CR]);
+	msm_hsl_write(port, RESET_CTS, regmap[vid][UARTDM_CR]);
+	msm_hsl_write(port, RFR_LOW, regmap[vid][UARTDM_CR]);
+}
+
+static unsigned int msm_hsl_get_mctrl_cir(struct uart_port *port)
+{
+	return TIOCM_CAR | TIOCM_CTS | TIOCM_DSR | TIOCM_RTS;
+}
+
+static void msm_hsl_set_mctrl_cir(struct uart_port *port, unsigned int mctrl)
+{
+	unsigned int vid = UART_TO_MSM(port)->ver_id;
+	unsigned int mr;
+	unsigned int loop_mode;
+
+	mr = msm_hsl_read(port, regmap[vid][UARTDM_MR1]);
+
+	if (!(mctrl & TIOCM_RTS)) {
+		mr &= ~UARTDM_MR1_RX_RDY_CTL_BMSK;
+		msm_hsl_write(port, mr, regmap[vid][UARTDM_MR1]);
+		msm_hsl_write(port, RFR_HIGH, regmap[vid][UARTDM_CR]);
+	} else {
+		mr |= UARTDM_MR1_RX_RDY_CTL_BMSK;
+		msm_hsl_write(port, mr, regmap[vid][UARTDM_MR1]);
+	}
+
+	loop_mode = TIOCM_LOOP & mctrl;
+	if (loop_mode) {
+		mr = msm_hsl_read(port, regmap[vid][UARTDM_MR2]);
+		mr |= UARTDM_MR2_LOOP_MODE_BMSK;
+		msm_hsl_write(port, mr, regmap[vid][UARTDM_MR2]);
+
+		
+		msm_hsl_reset(port);
+
+		
+		msm_hsl_write(port, UARTDM_CR_RX_EN_BMSK
+		      | UARTDM_CR_TX_EN_BMSK, regmap[vid][UARTDM_CR]);
+	}
+}
+
+static void msm_hsl_break_ctl_cir(struct uart_port *port, int break_ctl)
+{
+	unsigned int vid = UART_TO_MSM(port)->ver_id;
+
+	if (break_ctl)
+		msm_hsl_write(port, START_BREAK, regmap[vid][UARTDM_CR]);
+	else
+		msm_hsl_write(port, STOP_BREAK, regmap[vid][UARTDM_CR]);
+}
+
+static void msm_hsl_set_baud_rate(struct uart_port *port, unsigned int baud)
+{
+	unsigned int baud_code, rxstale, watermark;
+	unsigned int data;
+	unsigned int vid;
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	if (port->line == 2) {
+		
+		if (force_baud_1 == 96)
+			baud = 9600;
+		else if (force_baud_1 == 1152)
+			baud = 115200;
+		
+	}
+	D("%s ()baud %d:port->line %d, ir\n", __func__, baud, port->line);
+	switch (baud) {
+	case 300:
+		baud_code = UARTDM_CSR_75;
+		rxstale = 1;
+		break;
+	case 600:
+		baud_code = UARTDM_CSR_150;
+		rxstale = 1;
+		break;
+	case 1200:
+		baud_code = UARTDM_CSR_300;
+		rxstale = 1;
+		break;
+	case 2400:
+		baud_code = UARTDM_CSR_600;
+		rxstale = 1;
+		break;
+	case 4800:
+		baud_code = UARTDM_CSR_1200;
+		rxstale = 1;
+		break;
+	case 9600:
+		baud_code = UARTDM_CSR_2400;
+		rxstale = 2;
+		break;
+	case 14400:
+		baud_code = UARTDM_CSR_3600;
+		rxstale = 3;
+		break;
+	case 19200:
+		baud_code = UARTDM_CSR_4800;
+		rxstale = 4;
+		break;
+	case 28800:
+		baud_code = UARTDM_CSR_7200;
+		rxstale = 6;
+		break;
+	case 38400:
+		baud_code = UARTDM_CSR_9600;
+		rxstale = 8;
+		break;
+	case 57600:
+		baud_code = UARTDM_CSR_14400;
+		rxstale = 16;
+		break;
+	case 115200:
+		baud_code = UARTDM_CSR_28800;
+		rxstale = 31;
+		break;
+	case 230400:
+		baud_code = UARTDM_CSR_57600;
+		rxstale = 31;
+		break;
+	case 460800:
+		baud_code = UARTDM_CSR_115200;
+		rxstale = 31;
+		break;
+	default: 
+		baud_code = UARTDM_CSR_28800;
+		rxstale = 31;
+		break;
+	}
+
+	vid = msm_hsl_port->ver_id;
+	msm_hsl_write(port, baud_code, regmap[vid][UARTDM_CSR]);
+
+	
+		
+
+	
+	watermark = UARTDM_IPR_STALE_LSB_BMSK & rxstale;
+	watermark |= UARTDM_IPR_STALE_TIMEOUT_MSB_BMSK & (rxstale << 2);
+	msm_hsl_write(port, watermark, regmap[vid][UARTDM_IPR]);
+
+	watermark = (port->fifosize * 3) / (4*4);
+	msm_hsl_write(port, watermark, regmap[vid][UARTDM_RFWR]);
+
+	
+	msm_hsl_write(port, 0, regmap[vid][UARTDM_TFWR]);
+
+	msm_hsl_write(port, CR_PROTECTION_EN, regmap[vid][UARTDM_CR]);
+	msm_hsl_reset(port);
+
+	data = UARTDM_CR_TX_EN_BMSK;
+	data |= UARTDM_CR_RX_EN_BMSK;
+	
+	msm_hsl_write(port, data, regmap[vid][UARTDM_CR]);
+
+	msm_hsl_write(port, RESET_STALE_INT, regmap[vid][UARTDM_CR]);
+	
+	msm_hsl_port->imr = UARTDM_ISR_RXSTALE_BMSK
+		| UARTDM_ISR_DELTA_CTS_BMSK | UARTDM_ISR_RXLEV_BMSK;
+	msm_hsl_write(port, msm_hsl_port->imr, regmap[vid][UARTDM_IMR]);
+	msm_hsl_write(port, 6500, regmap[vid][UARTDM_DMRX]);
+	msm_hsl_write(port, STALE_EVENT_ENABLE, regmap[vid][UARTDM_CR]);
+}
+
+static void msm_hsl_init_clock(struct uart_port *port)
+{
+	D("%s ()ok:port->line %d, ir\n", __func__, port->line);
+	clk_en(port, 1);
+}
+
+static void msm_hsl_deinit_clock(struct uart_port *port)
+{
+	D("%s ()ok:port->line %d, ir\n", __func__, port->line);
+	clk_en(port, 0);
+}
+
+static int msm_hsl_startup_cir(struct uart_port *port)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	unsigned int data, rfr_level;
+	unsigned int vid;
+	int ret;
+	unsigned long flags;
+
+	snprintf(msm_hsl_port->name, sizeof(msm_hsl_port->name),
+		 "msm_serial_hsl%d", port->line);
+	D("%s () :port->line %d, ir\n", __func__, port->line);
+	if (!(is_console(port)) || (!port->cons) ||
+		(port->cons && (!(port->cons->flags & CON_ENABLED)))) {
+
+		if (msm_serial_hsl_has_gsbi(port)) {
+			D("%s () serial_hsl_has_gsbi:port->line %d, ir\n", __func__, port->line);
+			if ((ioread32(msm_hsl_port->mapped_gsbi +
+				GSBI_CONTROL_ADDR) & GSBI_PROTOCOL_I2C_UART)
+					!= GSBI_PROTOCOL_I2C_UART){
+				D("%s () iowrite32i:port->line %d, ir\n", __func__, port->line);
+				iowrite32(GSBI_PROTOCOL_I2C_UART,
+					msm_hsl_port->mapped_gsbi +
+						GSBI_CONTROL_ADDR);
+			}
+		}
+	}
+#ifndef CONFIG_PM_RUNTIME
+	msm_hsl_init_clock(port);
+#endif
+	pm_runtime_get_sync(port->dev);
+
+	
+	if (likely(port->fifosize > 48))
+		rfr_level = port->fifosize - 16;
+	else
+		rfr_level = port->fifosize;
+
+	rfr_level = (rfr_level / 4);
+
+	spin_lock_irqsave(&port->lock, flags);
+
+	vid = msm_hsl_port->ver_id;
+	
+	data = msm_hsl_read(port, regmap[vid][UARTDM_MR1]);
+	data &= ~UARTDM_MR1_AUTO_RFR_LEVEL1_BMSK;
+	data &= ~UARTDM_MR1_AUTO_RFR_LEVEL0_BMSK;
+	data |= UARTDM_MR1_AUTO_RFR_LEVEL1_BMSK & (rfr_level << 2);
+	data |= UARTDM_MR1_AUTO_RFR_LEVEL0_BMSK & rfr_level;
+	msm_hsl_write(port, data, regmap[vid][UARTDM_MR1]);
+	spin_unlock_irqrestore(&port->lock, flags);
+
+	ret = request_irq(port->irq, msm_hsl_irq, IRQF_TRIGGER_HIGH,
+			  msm_hsl_port->name, port);
+	if (unlikely(ret)) {
+		printk(KERN_ERR "%s: failed to request_irq\n", __func__);
+		return ret;
+	}
+	return 0;
+}
+
+static void msm_hsl_shutdown_cir(struct uart_port *port)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	msm_hsl_port->imr = 0;
+	
+	msm_hsl_write(port, 0, regmap[msm_hsl_port->ver_id][UARTDM_IMR]);
+
+	free_irq(port->irq, port);
+
+#ifndef CONFIG_PM_RUNTIME
+	msm_hsl_deinit_clock(port);
+#endif
+	pm_runtime_put_sync(port->dev);
+	if (!(is_console(port)) || (!port->cons) ||
+		(port->cons && (!(port->cons->flags & CON_ENABLED)))) {
+	}
+}
+
+static void msm_hsl_set_termios_cir(struct uart_port *port,
+				struct ktermios *termios,
+				struct ktermios *old)
+{
+	unsigned long flags;
+	unsigned int baud, mr;
+	unsigned int vid;
+
+	spin_lock_irqsave(&port->lock, flags);
+
+	
+	baud = uart_get_baud_rate(port, termios, old, 300, 460800);
+
+	msm_hsl_set_baud_rate(port, baud);
+
+	vid = UART_TO_MSM(port)->ver_id;
+	
+	mr = msm_hsl_read(port, regmap[vid][UARTDM_MR2]);
+	mr &= ~UARTDM_MR2_PARITY_MODE_BMSK;
+	if (termios->c_cflag & PARENB) {
+		if (termios->c_cflag & PARODD)
+			mr |= ODD_PARITY;
+		else if (termios->c_cflag & CMSPAR)
+			mr |= SPACE_PARITY;
+		else
+			mr |= EVEN_PARITY;
+	}
+
+	
+	mr &= ~UARTDM_MR2_BITS_PER_CHAR_BMSK;
+	switch (termios->c_cflag & CSIZE) {
+	case CS5:
+		mr |= FIVE_BPC;
+		break;
+	case CS6:
+		mr |= SIX_BPC;
+		break;
+	case CS7:
+		mr |= SEVEN_BPC;
+		break;
+	case CS8:
+	default:
+		mr |= EIGHT_BPC;
+		break;
+	}
+
+	
+	mr &= ~(STOP_BIT_ONE | STOP_BIT_TWO);
+	if (termios->c_cflag & CSTOPB)
+		mr |= STOP_BIT_TWO;
+	else
+		mr |= STOP_BIT_ONE;
+
+	
+	msm_hsl_write(port, mr, regmap[vid][UARTDM_MR2]);
+
+	
+	mr = msm_hsl_read(port, regmap[vid][UARTDM_MR1]);
+	mr &= ~(UARTDM_MR1_CTS_CTL_BMSK | UARTDM_MR1_RX_RDY_CTL_BMSK);
+	if (termios->c_cflag & CRTSCTS) {
+		mr |= UARTDM_MR1_CTS_CTL_BMSK;
+		mr |= UARTDM_MR1_RX_RDY_CTL_BMSK;
+	}
+	msm_hsl_write(port, mr, regmap[vid][UARTDM_MR1]);
+
+	
+	port->read_status_mask = 0;
+	if (termios->c_iflag & INPCK)
+		port->read_status_mask |= UARTDM_SR_PAR_FRAME_BMSK;
+	if (termios->c_iflag & (BRKINT | PARMRK))
+		port->read_status_mask |= UARTDM_SR_RX_BREAK_BMSK;
+
+	uart_update_timeout(port, termios->c_cflag, baud);
+
+	spin_unlock_irqrestore(&port->lock, flags);
+
+	D("%s: cir MR is 0x%x\n", __func__, mr);
+	D("%s: cir baud is %d\n", __func__, baud);
+}
+
+static const char *msm_hsl_type_cir(struct uart_port *port)
+{
+	return "MSM";
+}
+
+static void msm_hsl_release_port_cir(struct uart_port *port)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+	struct platform_device *pdev = to_platform_device(port->dev);
+	struct resource *uart_resource;
+	resource_size_t size;
+
+	D("%s () :port->line %d, ir\n", __func__, port->line);
+	uart_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+						     "uartdm_resource");
+	if (!uart_resource) {
+		D("%s ()  uart_resource:port->line %d, ir\n", __func__, port->line);
+		uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	}
+	if (unlikely(!uart_resource))
+		return;
+	size = uart_resource->end - uart_resource->start + 1;
+
+	release_mem_region(port->mapbase, size);
+	iounmap(port->membase);
+	port->membase = NULL;
+
+	if (msm_serial_hsl_has_gsbi(port)) {
+		D("%s () msm_serial_hsl_has_gsbi :port->line %d, ir\n", __func__, port->line);
+		iowrite32(GSBI_PROTOCOL_IDLE, msm_hsl_port->mapped_gsbi +
+			  GSBI_CONTROL_ADDR);
+		iounmap(msm_hsl_port->mapped_gsbi);
+		msm_hsl_port->mapped_gsbi = NULL;
+	}
+	D("%s () ok :port->line %d, ir\n", __func__, port->line);
+}
+
+static int msm_hsl_request_port_cir(struct uart_port *port)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+	struct platform_device *pdev = to_platform_device(port->dev);
+	struct resource *uart_resource;
+	struct resource *gsbi_resource;
+	resource_size_t size;
+
+	uart_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+						     "uartdm_resource");
+	if (!uart_resource) {
+		D("%s ():uart_resource :port->line %d, ir\n", __func__, port->line);
+		uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	}
+	if (unlikely(!uart_resource)) {
+		E("%s: can't get uartdm resource\n", __func__);
+		return -ENXIO;
+	}
+	size = uart_resource->end - uart_resource->start + 1;
+
+	if (unlikely(!request_mem_region(port->mapbase, size,
+					 "msm_serial_cir"))) {
+		E("%s: can't get mem region for uartdm\n", __func__);
+		return -EBUSY;
+	}
+
+	port->membase = ioremap(port->mapbase, size);
+	if (!port->membase) {
+		release_mem_region(port->mapbase, size);
+		return -EBUSY;
+	}
+
+	D("%s: memory map for base 0x%x\n", __func__, port->mapbase);
+	D("%s ():uart_resource :port->line %d, memory map for base 0x%x ir\n", __func__, port->line, port->mapbase);
+
+	if (msm_serial_hsl_has_gsbi(port)) {
+		gsbi_resource = platform_get_resource_byname(pdev,
+							     IORESOURCE_MEM,
+							     "gsbi_resource");
+		if (!gsbi_resource) {
+			gsbi_resource = platform_get_resource(pdev,
+						IORESOURCE_MEM, 1);
+			D("%s ():gsbi_resource :port->line %d, ir\n", __func__, port->line);
+		}
+		if (unlikely(!gsbi_resource)) {
+			E("%s: can't get gsbi resource\n", __func__);
+			return -ENXIO;
+		}
+		D("%s: get gsbi_resource for port[%d]\n", __func__, port->line);
+
+		size = gsbi_resource->end - gsbi_resource->start + 1;
+		msm_hsl_port->mapped_gsbi = ioremap(gsbi_resource->start,
+						    size);
+		if (!msm_hsl_port->mapped_gsbi)
+			return -EBUSY;
+	}
+
+	D("%s () ok:port->line %d, ir\n", __func__, port->line);
+
+	return 0;
+}
+
+static void msm_hsl_config_port_cir(struct uart_port *port, int flags)
+{
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+
+	D("%s () :port->line %d, ir\n", __func__, port->line);
+	if (flags & UART_CONFIG_TYPE) {
+		port->type = PORT_MSM;
+		if (msm_hsl_request_port_cir(port)) {
+			D("%s () request_port_cir return:port->line %d, ir\n", __func__, port->line);
+			return;
+		}
+	}
+	if (msm_serial_hsl_has_gsbi(port)) {
+		if (msm_hsl_port->pclk)
+			clk_prepare_enable(msm_hsl_port->pclk);
+		if ((ioread32(msm_hsl_port->mapped_gsbi + GSBI_CONTROL_ADDR) &
+			GSBI_PROTOCOL_I2C_UART) != GSBI_PROTOCOL_I2C_UART)
+			iowrite32(GSBI_PROTOCOL_I2C_UART,
+				msm_hsl_port->mapped_gsbi + GSBI_CONTROL_ADDR);
+		D("%s: cir line[%d] GSBI_CONTROL_ADDR-%x\n", __func__,
+			port->line, ioread32(msm_hsl_port->mapped_gsbi + GSBI_CONTROL_ADDR));
+		D("%s () GSBI_CONTROL_ADDR:port->line %d, ir\n", __func__, port->line);
+		if (msm_hsl_port->pclk)
+			clk_disable_unprepare(msm_hsl_port->pclk);
+	}
+}
+
+static int msm_hsl_verify_port_cir(struct uart_port *port,
+			       struct serial_struct *ser)
+{
+	if (unlikely(ser->type != PORT_UNKNOWN && ser->type != PORT_MSM))
+		return -EINVAL;
+	if (unlikely(port->irq != ser->irq))
+		return -EINVAL;
+	return 0;
+}
+
+static void msm_hsl_power_cir(struct uart_port *port, unsigned int state,
+			  unsigned int oldstate)
+{
+	int ret;
+	struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port);
+	unsigned long flags;
+
+	D("%s (): ir, state %d\n", __func__, state);
+	switch (state) {
+	case 0:
+		ret = clk_set_rate(msm_hsl_port->clk, 7372800);
+		if (ret)
+			E("%s(): Error setting UART clock rate\n",
+								__func__);
+		clk_en(port, 1);
+		break;
+	case 3:
+		if (cir_enable_flg != PATH_CIR) {
+			D("%s path is not CIR. flg = %d\n",
+						__func__, cir_enable_flg);
+			D("%s(): Clear IRDA mode \n", __func__);
+			spin_lock_irqsave(&port->lock, flags);
+			ret = 0;
+			msm_hsl_write(port, ret, UARTDM_IRDA_ADDR);
+			spin_unlock_irqrestore(&port->lock, flags);
+
+			cir_enable_flg = PATH_CIR;
+			if (msm_hsl_port->cir_set_path)
+				msm_hsl_port->cir_set_path(PATH_CIR);
+		}
+		clk_en(port, 0);
+		break;
+	default:
+		E("%s(): msm_serial_hsl: Unknown PM state %d\n",
+							__func__, state);
+	}
+}
+
+static struct uart_ops msm_hsl_uart_pops = {
+	.tx_empty = msm_hsl_tx_empty_cir,
+	.set_mctrl = msm_hsl_set_mctrl_cir,
+	.get_mctrl = msm_hsl_get_mctrl_cir,
+	.stop_tx = msm_hsl_stop_tx_cir,
+	.start_tx = msm_hsl_start_tx_cir,
+	.stop_rx = msm_hsl_stop_rx_cir,
+	.enable_ms = msm_hsl_enable_ms_cir,
+	.break_ctl = msm_hsl_break_ctl_cir,
+	.startup = msm_hsl_startup_cir,
+	.shutdown = msm_hsl_shutdown_cir,
+	.set_termios = msm_hsl_set_termios_cir,
+	.type = msm_hsl_type_cir,
+	.release_port = msm_hsl_release_port_cir,
+	.request_port = msm_hsl_request_port_cir,
+	.config_port = msm_hsl_config_port_cir,
+	.verify_port = msm_hsl_verify_port_cir,
+	.pm = msm_hsl_power_cir,
+};
+
+static struct msm_hsl_port msm_hsl_uart_ports[] = {
+	{
+		.uart = {
+			.iotype = UPIO_MEM,
+			.ops = &msm_hsl_uart_pops,
+			.flags = UPF_BOOT_AUTOCONF,
+			.fifosize = 64,
+			.line = 0,
+		},
+	},
+	{
+		.uart = {
+			.iotype = UPIO_MEM,
+			.ops = &msm_hsl_uart_pops,
+			.flags = UPF_BOOT_AUTOCONF,
+			.fifosize = 64,
+			.line = 1,
+		},
+	},
+	{
+		.uart = {
+			.iotype = UPIO_MEM,
+			.ops = &msm_hsl_uart_pops,
+			.flags = UPF_BOOT_AUTOCONF,
+			.fifosize = 64,
+			.line = 2,
+		},
+	},
+#if 0
+	{
+		.uart = {
+			.iotype = UPIO_MEM,
+			.ops = &msm_hsl_uart_pops,
+			.flags = UPF_BOOT_AUTOCONF,
+			.fifosize = 64,
+			.line = 3,
+		},
+	},
+	{
+		.uart = {
+			.iotype = UPIO_MEM,
+			.ops = &msm_hsl_uart_pops,
+			.flags = UPF_BOOT_AUTOCONF,
+			.fifosize = 64,
+			.line = 4,
+		},
+	},
+	{
+		.uart = {
+			.iotype = UPIO_MEM,
+			.ops = &msm_hsl_uart_pops,
+			.flags = UPF_BOOT_AUTOCONF,
+			.fifosize = 64,
+			.line = 5,
+		},
+	},
+#endif
+};
+
+#define UART_NR	ARRAY_SIZE(msm_hsl_uart_ports)
+
+static inline struct uart_port *get_port_from_line(unsigned int line)
+{
+	return &msm_hsl_uart_ports[line].uart;
+}
+
+void wait_for_xmitr(struct uart_port *port, int bits)
+{
+	unsigned int vid = UART_TO_MSM(port)->ver_id;
+
+	if (!(msm_hsl_read(port, regmap[vid][UARTDM_SR]) &
+			UARTDM_SR_TXEMT_BMSK)) {
+		while ((msm_hsl_read(port, regmap[vid][UARTDM_ISR]) &
+					bits) != bits) {
+			udelay(1);
+			touch_nmi_watchdog();
+			cpu_relax();
+		}
+		msm_hsl_write(port, CLEAR_TX_READY, regmap[vid][UARTDM_CR]);
+	}
+	D("%s ():port->line %d, ir\n", __func__, port->line);
+}
+
+#ifdef CONFIG_SERIAL_MSM_HSL_CONSOLE
+static void msm_hsl_console_putchar(struct uart_port *port, int ch)
+{
+	unsigned int vid = UART_TO_MSM(port)->ver_id;
+
+	wait_for_xmitr(port, UARTDM_ISR_TX_READY_BMSK);
+	msm_hsl_write(port, 1, regmap[vid][UARTDM_NCF_TX]);
+
+	while (!(msm_hsl_read(port, regmap[vid][UARTDM_SR]) &
+				UARTDM_SR_TXRDY_BMSK)) {
+		udelay(1);
+		touch_nmi_watchdog();
+	}
+
+	msm_hsl_write(port, ch, regmap[vid][UARTDM_TF]);
+	D("%s ():port->line %d, ir\n", __func__, port->line);
+}
+
+static void msm_hsl_console_write(struct console *co, const char *s,
+				  unsigned int count)
+{
+	struct uart_port *port;
+	struct msm_hsl_port *msm_hsl_port;
+	unsigned int vid;
+	int locked;
+
+	BUG_ON(co->index < 0 || co->index >= UART_NR);
+
+	port = get_port_from_line(co->index);
+	msm_hsl_port = UART_TO_MSM(port);
+	vid = msm_hsl_port->ver_id;
+
+	
+	if (port->sysrq || oops_in_progress)
+		locked = spin_trylock(&port->lock);
+	else {
+		locked = 1;
+		spin_lock(&port->lock);
+	}
+	msm_hsl_write(port, 0, regmap[vid][UARTDM_IMR]);
+	uart_console_write(port, s, count, msm_hsl_console_putchar);
+	msm_hsl_write(port, msm_hsl_port->imr, regmap[vid][UARTDM_IMR]);
+	if (locked == 1)
+		spin_unlock(&port->lock);
+
+	D("%s ():port->line %d, ir\n", __func__, port->line);
+}
+
+static int msm_hsl_console_setup(struct console *co, char *options)
+{
+	struct uart_port *port;
+	unsigned int vid;
+	int baud = 0, flow, bits, parity;
+	int ret;
+
+	D("%s: ir\n", __func__);
+
+	if (unlikely(co->index >= UART_NR || co->index < 0))
+		return -ENXIO;
+
+	port = get_port_from_line(co->index);
+	vid = UART_TO_MSM(port)->ver_id;
+	D("%s ():port->line %d, ir\n", __func__, port->line);
+	if (unlikely(!port->membase))
+		return -ENXIO;
+
+	port->cons = co;
+
+	pm_runtime_get_noresume(port->dev);
+
+#ifndef CONFIG_PM_RUNTIME
+	msm_hsl_init_clock(port);
+#endif
+	pm_runtime_resume(port->dev);
+
+	if (options)
+		uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+	bits = 8;
+	parity = 'n';
+	flow = 'n';
+	msm_hsl_write(port, UARTDM_MR2_BITS_PER_CHAR_8 | STOP_BIT_ONE,
+		      regmap[vid][UARTDM_MR2]);	
+
+	if (baud < 300 || baud > 115200)
+		baud = 115200;
+	msm_hsl_set_baud_rate(port, baud);
+	D("%s: cir port[%d] baud=%d\n", __func__, port->line, baud);
+
+	ret = uart_set_options(port, co, baud, parity, bits, flow);
+	msm_hsl_reset(port);
+	
+	msm_hsl_write(port, CR_PROTECTION_EN, regmap[vid][UARTDM_CR]);
+	msm_hsl_write(port, UARTDM_CR_TX_EN_BMSK, regmap[vid][UARTDM_CR]);
+
+	printk(KERN_INFO "msm_serial_hsl: console setup on port #%d\n",
+	       port->line);
+	D("%s ():port->line %d, ok, ir\n", __func__, port->line);
+	return ret;
+}
+
+static struct uart_driver msm_hsl_uart_driver;
+
+static struct console msm_hsl_console = {
+	.name = "ttyHSL",
+	.write = msm_hsl_console_write,
+	.device = uart_console_device,
+	.setup = msm_hsl_console_setup,
+	.flags = CON_PRINTBUFFER,
+	.index = -1,
+	.data = &msm_hsl_uart_driver,
+};
+
+#define MSM_HSL_CONSOLE	(&msm_hsl_console)
+static int get_console_state(struct uart_port *port)
+{
+	if (is_console(port) && (port->cons->flags & CON_ENABLED)) {
+		D("%s ()return 1 :port->line %d, ir\n", __func__, port->line);
+		return 1;
+	} else {
+		D("%s ()return 0 :port->line %d, ir\n", __func__, port->line);
+		return 0;
+	}
+}
+
+static ssize_t show_msm_console(struct device *dev,
+				struct device_attribute *attr, char *buf)
+{
+	int enable;
+	struct uart_port *port;
+
+	struct platform_device *pdev = to_platform_device(dev);
+	port = get_port_from_line(pdev->id);
+
+	enable = get_console_state(port);
+	D("%s () :port->line %d, ir\n", __func__, port->line);
+	return snprintf(buf, sizeof(enable), "%d\n", enable);
+}
+
+static ssize_t set_msm_console(struct device *dev,
+				struct device_attribute *attr,
+				const char *buf, size_t count)
+{
+	int enable, cur_state;
+	struct uart_port *port;
+
+	struct platform_device *pdev = to_platform_device(dev);
+	port = get_port_from_line(pdev->id);
+
+	cur_state = get_console_state(port);
+	enable = buf[0] - '0';
+	D("%s ():port->line %d,enable %d, cur_state %d ir\n", __func__, port->line, enable, cur_state);
+	if (enable == cur_state)
+		return count;
+
+	switch (enable) {
+	case 0:
+		D("%s(): Calling stop_console\n", __func__);
+		console_stop(port->cons);
+		D("%s(): Calling unregister_console\n", __func__);
+		unregister_console(port->cons);
+		pm_runtime_put_sync(&pdev->dev);
+		pm_runtime_disable(&pdev->dev);
+		msm_hsl_power_cir(port, 3, 1);
+		break;
+	case 1:
+		D("%s(): Calling register_console\n", __func__);
+		msm_hsl_power_cir(port, 0, 1);
+		pm_runtime_enable(&pdev->dev);
+		register_console(port->cons);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return count;
+}
+
+static DEVICE_ATTR(console, S_IWUSR | S_IRUGO, show_msm_console,
+						set_msm_console);
+#else
+#define MSM_HSL_CONSOLE	NULL
+#endif
+
+static struct uart_driver msm_hsl_uart_driver = {
+	.owner = THIS_MODULE,
+	.driver_name = "msm_serial_cir",
+	.dev_name = "ttyHSL",
+	.nr = UART_NR,
+	.cons = MSM_HSL_CONSOLE,
+};
+
+static ssize_t enable_irda_show(struct device *dev,
+			struct device_attribute *attr, char *buf)
+{
+	int ret = 0;
+	return ret;
+}
+static ssize_t enable_irda_store(struct device *dev,
+				struct device_attribute *attr,
+				const char *buf, size_t count)
+{
+	int irda_en;
+
+	sscanf(buf, "%d", &irda_en);
+	if (irda_en == 96) {
+		force_baud_1 = 96;
+		E("%s(): change baud = 9600\n", __func__);
+		return count;
+	} else if (irda_en == 1152) {
+		E("%s(): change baud = 115200\n", __func__);
+		force_baud_1 = 1152;
+		return count;
+	} else if (irda_en == 1153) {
+		E("%s():no  change baud \n", __func__);
+		force_baud_1 = 0;
+		return count;
+	}
+
+	return count;
+}
+
+static DEVICE_ATTR(enable_irda, 0664, enable_irda_show, enable_irda_store);
+
+static ssize_t enable_cir_show(struct device *dev,
+			struct device_attribute *attr, char *buf)
+{
+	int ret = 0;
+	return ret;
+}
+static ssize_t enable_cir_store(struct device *dev,
+				struct device_attribute *attr,
+				const char *buf, size_t count)
+{
+	struct msm_hsl_port *msm_cir_port = htc_cir_port;
+	struct uart_port *port = &(msm_cir_port->uart);
+	unsigned long flags;
+	int cir_en, ret = 0;
+
+	sscanf(buf, "%d", &cir_en);
+	if (cir_en != 1 && cir_en != 3 && cir_en != 0)
+		D("%s: parameter invalid. cir_en = %d", __func__, cir_en);
+
+	D("%s: (cir_enable_flg, cir_en) = (%d, %d)\n",
+				__func__, cir_enable_flg, cir_en);
+
+	ret = clk_set_rate(msm_cir_port->clk, 7372800);
+	if (!ret) {
+		clk_en(port, 1);
+		D("%s(): irda Clock enabled for line(%d)\n", __func__, port->line);
+	} else {
+		D("%s(): Error: Setting the clock rate\n", __func__);
+		return -EINVAL;
+	}
+
+	if (cir_en > 1) {
+		D("%s(): Set IRDA mode\n", __func__);
+		spin_lock_irqsave(&port->lock, flags);
+		ret = 1;
+		ret |= (int)cir_en;
+		msm_hsl_write(port, ret, UARTDM_IRDA_ADDR);
+		spin_unlock_irqrestore(&port->lock, flags);
+
+		cir_enable_flg = PATH_IRDA;
+		if (msm_cir_port->cir_set_path)
+			msm_cir_port->cir_set_path(PATH_IRDA);
+	}
+
+	clk_en(port, 0);
+	return count;
+}
+static DEVICE_ATTR(enable_cir, 0664, enable_cir_show, enable_cir_store);
+
+static ssize_t reset_cir_show(struct device *dev,
+			struct device_attribute *attr, char *buf)
+{
+	int ret = 0;
+	return ret;
+}
+static ssize_t reset_cir_store(struct device *dev,
+				struct device_attribute *attr,
+				const char *buf, size_t count)
+{
+	struct msm_hsl_port *msm_cir_port = htc_cir_port;
+	int reset;
+
+	sscanf(buf, "%d", &reset);
+	D("%s trigger cir reset, input = %d.\n",
+					__func__, reset);
+
+	if((reset==1) && (msm_cir_port->cir_reset) ) {
+		msm_cir_port->cir_reset();
+	}
+
+	D("%s count = %d.\n", __func__, count);
+	return count;
+}
+static DEVICE_ATTR(reset_cir, 0600, reset_cir_show, reset_cir_store);
+
+static atomic_t msm_serial_hsl_next_id = ATOMIC_INIT(0);
+
+static int __devinit msm_serial_hsl_probe_cir(struct platform_device *pdev)
+{
+	struct msm_hsl_port *msm_hsl_port;
+	struct resource *uart_resource;
+	struct resource *gsbi_resource;
+	struct uart_port *port;
+	const struct of_device_id *match;
+	struct cir_platform_data *pdata;
+	int ret;
+
+	if (pdev->id == -1)
+		pdev->id = atomic_inc_return(&msm_serial_hsl_next_id) - 1;
+
+	if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
+		return -ENXIO;
+
+	printk(KERN_INFO "msm_serial_cir: detected port #%d\n", pdev->id);
+
+	port = get_port_from_line(pdev->id);
+	port->dev = &pdev->dev;
+	pdata = pdev->dev.platform_data;
+	if (!pdata) {
+		E("%s: Assign platform_data error!!\n",
+			__func__);
+		return -ENXIO;
+	}
+	msm_hsl_port = UART_TO_MSM(port);
+	msm_hsl_port->cir_set_path= pdata->cir_set_path;
+	msm_hsl_port->cir_reset = pdata->cir_reset;
+	msm_hsl_port->cir_power = pdata->cir_power;
+	if (msm_hsl_port->cir_set_path)
+		msm_hsl_port->cir_set_path(PATH_CIR);
+	if (msm_hsl_port->cir_power)
+		msm_hsl_port->cir_power(1);
+	htc_cir_port = msm_hsl_port;
+	cir_enable_flg = PATH_CIR;
+
+	match = of_match_device(msm_hsl_match_table, &pdev->dev);
+	if (!match)
+		msm_hsl_port->ver_id = UARTDM_VERSION_11_13;
+	else {
+		D("%s () match:port->line %d, ir\n", __func__, port->line);
+		msm_hsl_port->ver_id = (unsigned int)match->data;
+	}
+
+	gsbi_resource =	platform_get_resource_byname(pdev,
+						     IORESOURCE_MEM,
+						     "gsbi_resource");
+	if (!gsbi_resource) {
+		gsbi_resource = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+		D("%s () gsbi_resourc:port->line %d, ir\n", __func__, port->line);
+	}
+	msm_hsl_port->clk = clk_get(&pdev->dev, "core_clk");
+	if (gsbi_resource) {
+printk(KERN_INFO "msm_serial_cir: get gsbi_uart_clk and gsbi_pclk\n");
+		msm_hsl_port->is_uartdm = 1;
+		msm_hsl_port->pclk = clk_get(&pdev->dev, "iface_clk");
+	} else {
+printk(KERN_INFO "msm_serial_cir: get uartdm_clk\n");
+		msm_hsl_port->is_uartdm = 0;
+		msm_hsl_port->pclk = NULL;
+	}
+
+	if (unlikely(IS_ERR(msm_hsl_port->clk))) {
+		printk(KERN_ERR "%s: Error getting clk\n", __func__);
+		return PTR_ERR(msm_hsl_port->clk);
+	}
+	if (unlikely(IS_ERR(msm_hsl_port->pclk))) {
+		printk(KERN_ERR "%s: Error getting pclk\n", __func__);
+		return PTR_ERR(msm_hsl_port->pclk);
+	}
+
+	uart_resource = platform_get_resource_byname(pdev,
+						     IORESOURCE_MEM,
+						     "uartdm_resource");
+	if (!uart_resource)
+		uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (unlikely(!uart_resource)) {
+		printk(KERN_ERR "getting uartdm_resource failed\n");
+		return -ENXIO;
+	}
+	port->mapbase = uart_resource->start;
+printk(KERN_INFO "msm_serial_hsl: port[%d] mapbase:%x\n", port->line, port->mapbase);
+
+	port->irq = platform_get_irq(pdev, 0);
+	if (unlikely((int)port->irq < 0)) {
+		printk(KERN_ERR "%s: getting irq failed\n", __func__);
+		return -ENXIO;
+	}
+
+	device_set_wakeup_capable(&pdev->dev, 1);
+	platform_set_drvdata(pdev, port);
+	pm_runtime_enable(port->dev);
+#ifdef CONFIG_SERIAL_MSM_HSL_CONSOLE
+	ret = device_create_file(&pdev->dev, &dev_attr_console);
+	D("%s () device_create_file, port->line %d, ir\n", __func__, port->line);
+	if (unlikely(ret))
+		E("%s():Can't create console attribute\n", __func__);
+#endif
+	msm_hsl_debugfs_init(msm_hsl_port, pdev->id);
+
+	if (msm_hsl_port->pclk) {
+		clk_prepare_enable(msm_hsl_port->pclk);
+		D("%s () clk_enable, port->line %d, ir\n", __func__, port->line);
+	}
+	ret = uart_add_one_port(&msm_hsl_uart_driver, port);
+	if (msm_hsl_port->pclk) {
+		D("%s () clk_disabl, port->line %d, ir\n", __func__, port->line);
+		clk_disable_unprepare(msm_hsl_port->pclk);
+	}
+
+	D("%s ():port->line %d, ir\n", __func__, port->line);
+		msm_hsl_port->irda_class = class_create(THIS_MODULE, "htc_irda");
+	if (IS_ERR(msm_hsl_port->irda_class)) {
+		ret = PTR_ERR(msm_hsl_port->irda_class);
+		msm_hsl_port->irda_class = NULL;
+		return -ENXIO;
+	}
+	msm_hsl_port->irda_dev = device_create(msm_hsl_port->irda_class,
+				NULL, 0, "%s", "irda");
+	if (unlikely(IS_ERR(msm_hsl_port->irda_dev))) {
+		ret = PTR_ERR(msm_hsl_port->irda_dev);
+		msm_hsl_port->irda_dev = NULL;
+		goto err_create_ls_device;
+	}
+		
+	ret = device_create_file(msm_hsl_port->irda_dev, &dev_attr_enable_irda);
+	if (ret)
+		goto err_create_ls_device_file;
+
+	msm_hsl_port->cir_class = class_create(THIS_MODULE, "htc_cir");
+	if (IS_ERR(msm_hsl_port->cir_class)) {
+		ret = PTR_ERR(msm_hsl_port->cir_class);
+		msm_hsl_port->cir_class = NULL;
+		return -ENXIO;
+	}
+	msm_hsl_port->cir_dev = device_create(msm_hsl_port->cir_class,
+				NULL, 0, "%s", "cir");
+	if (unlikely(IS_ERR(msm_hsl_port->cir_dev))) {
+		ret = PTR_ERR(msm_hsl_port->cir_dev);
+		msm_hsl_port->cir_dev = NULL;
+		goto err_create_ls_device;
+	}
+		
+	ret = device_create_file(msm_hsl_port->cir_dev, &dev_attr_enable_cir);
+	if (ret)
+		goto err_create_ls_device_file;
+
+	ret = device_create_file(msm_hsl_port->cir_dev, &dev_attr_reset_cir);
+	if (ret)
+		goto err_create_ls_device_file;
+
+	return ret;
+
+err_create_ls_device_file:
+	device_unregister(msm_hsl_port->cir_dev);
+err_create_ls_device:
+	class_destroy(msm_hsl_port->cir_class);
+	return ret;
+	return ret;
+}
+
+static int __devexit msm_serial_hsl_remove(struct platform_device *pdev)
+{
+	struct msm_hsl_port *msm_hsl_port = platform_get_drvdata(pdev);
+	struct uart_port *port;
+
+	D("%s (): ir\n", __func__);
+	port = get_port_from_line(pdev->id);
+#ifdef CONFIG_SERIAL_MSM_HSL_CONSOLE
+	device_remove_file(&pdev->dev, &dev_attr_console);
+#endif
+	pm_runtime_put_sync(&pdev->dev);
+	pm_runtime_disable(&pdev->dev);
+
+	device_set_wakeup_capable(&pdev->dev, 0);
+	platform_set_drvdata(pdev, NULL);
+	uart_remove_one_port(&msm_hsl_uart_driver, port);
+
+	clk_put(msm_hsl_port->pclk);
+	clk_put(msm_hsl_port->clk);
+	debugfs_remove(msm_hsl_port->loopback_dir);
+
+	return 0;
+}
+
+#ifdef CONFIG_PM
+static int msm_serial_hsl_suspend(struct device *dev)
+{
+	struct platform_device *pdev = to_platform_device(dev);
+	struct msm_hsl_port *msm_cir_port = htc_cir_port;
+	struct uart_port *port;
+	port = get_port_from_line(pdev->id);
+	D("%s ():port->line %d, cir_enable_flg = %d\n",
+				__func__, port->line, cir_enable_flg);
+	if (port) {
+		D("%s ():is_console:port->line %d, ir\n", __func__, port->line);
+		if (is_console(port))
+			msm_hsl_deinit_clock(port);
+
+		uart_suspend_port(&msm_hsl_uart_driver, port);
+		if (device_may_wakeup(dev))
+			enable_irq_wake(port->irq);
+
+		if (msm_cir_port->cir_set_path)
+			msm_cir_port->cir_set_path(PATH_NONE);
+	}
+
+	if (msm_cir_port->cir_power)
+		msm_cir_port->cir_power(0);
+
+	return 0;
+}
+
+static int msm_serial_hsl_resume(struct device *dev)
+{
+	struct platform_device *pdev = to_platform_device(dev);
+	struct msm_hsl_port *msm_cir_port = htc_cir_port;
+	struct uart_port *port;
+	port = get_port_from_line(pdev->id);
+
+	D("%s ():port->line %d, cir_enable_flg = %d\n",
+				__func__, port->line, cir_enable_flg);
+
+	if (msm_cir_port->cir_power)
+		msm_cir_port->cir_power(1);
+
+	if (port) {
+		if (msm_cir_port->cir_set_path)
+			msm_cir_port->cir_set_path(cir_enable_flg);
+
+		uart_resume_port(&msm_hsl_uart_driver, port);
+		if (device_may_wakeup(dev))
+			disable_irq_wake(port->irq);
+
+		if (is_console(port))
+			msm_hsl_init_clock(port);
+	}
+
+	return 0;
+}
+#else
+#define msm_serial_hsl_suspend NULL
+#define msm_serial_hsl_resume NULL
+#endif
+
+static int msm_hsl_runtime_suspend(struct device *dev)
+{
+	struct platform_device *pdev = to_platform_device(dev);
+	struct uart_port *port;
+	port = get_port_from_line(pdev->id);
+
+	dev_dbg(dev, "pm_runtime: suspending\n");
+	msm_hsl_deinit_clock(port);
+	D("%s ():port->line %d, ir\n", __func__, port->line);
+	return 0;
+}
+
+static int msm_hsl_runtime_resume(struct device *dev)
+{
+	struct platform_device *pdev = to_platform_device(dev);
+	struct uart_port *port;
+	port = get_port_from_line(pdev->id);
+
+	dev_dbg(dev, "pm_runtime: resuming\n");
+	msm_hsl_init_clock(port);
+	D("%s ():port->line %d, ir\n", __func__, port->line);
+	return 0;
+}
+
+static struct dev_pm_ops msm_hsl_dev_pm_ops = {
+	.suspend = msm_serial_hsl_suspend,
+	.resume = msm_serial_hsl_resume,
+	.runtime_suspend = msm_hsl_runtime_suspend,
+	.runtime_resume = msm_hsl_runtime_resume,
+};
+
+static struct platform_driver msm_hsl_platform_driver = {
+	.probe = msm_serial_hsl_probe_cir,
+	.remove = __devexit_p(msm_serial_hsl_remove),
+	.driver = {
+		.name = "msm_serial_cir",
+		.owner = THIS_MODULE,
+		.pm = &msm_hsl_dev_pm_ops,
+		.of_match_table = msm_hsl_match_table,
+	},
+};
+
+static int __init msm_serial_hsl_init_cir(void)
+{
+	int ret;
+
+	
+	if (get_kernel_flag() & KERNEL_FLAG_SERIAL_HSL_ENABLE)
+		msm_serial_hsl_enable = 1;
+
+	if (!msm_serial_hsl_enable)
+		msm_hsl_uart_driver.cons = NULL;
+
+	ret = uart_register_driver(&msm_hsl_uart_driver);
+	if (unlikely(ret))
+		return ret;
+
+	debug_base = debugfs_create_dir("msm_serial_cir", NULL);
+
+	if (IS_ERR_OR_NULL(debug_base))
+		E("%s():Cannot create debugfs dir\n", __func__);
+
+	ret = platform_driver_register(&msm_hsl_platform_driver);
+	if (unlikely(ret))
+		uart_unregister_driver(&msm_hsl_uart_driver);
+
+	D("%s(): driver initialized, msm_serial_hsl_enable %d\n", __func__, msm_serial_hsl_enable);
+	return ret;
+}
+
+static void __exit msm_serial_hsl_exit_cir(void)
+{
+	debugfs_remove_recursive(debug_base);
+#ifdef CONFIG_SERIAL_MSM_HSL_CONSOLE
+	if (msm_serial_hsl_enable)
+		unregister_console(&msm_hsl_console);
+#endif
+	platform_driver_unregister(&msm_hsl_platform_driver);
+	uart_unregister_driver(&msm_hsl_uart_driver);
+	D("%s(): \n", __func__);
+}
+
+module_init(msm_serial_hsl_init_cir);
+module_exit(msm_serial_hsl_exit_cir);
+
+MODULE_DESCRIPTION("Driver for msm HSUART serial device");
+MODULE_LICENSE("GPL v2");
diff --git a/include/linux/htc_cir.h b/include/linux/htc_cir.h
new file mode 100644
index 0000000..3bb31e7
--- /dev/null
+++ b/include/linux/htc_cir.h
@@ -0,0 +1,31 @@
+/* include/linux/htc_cir.h
+ *
+ * Copyright (C) 2011 HTC, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __LINUX_HTC_CIR_H
+#define __LINUX_HTC_CIR_H
+
+struct cir_platform_data {
+	int (*cir_set_path)(int);
+	int (*cir_reset)(void);
+	int (*cir_power)(int);
+};
+
+enum irda_path {
+	PATH_NONE = 0,
+	PATH_IRDA,
+	PATH_CIR,
+};
+
+#endif