From dc056616e0fcf48a015ea5cd1cb102d67bd37558 Mon Sep 17 00:00:00 2001 From: Naveen Kaje Date: Thu, 19 Dec 2013 14:57:13 -0700 Subject: msm_serial_hs_lite: fix platform data handling and move header of_match_device passes the hardware version information as a void pointer. Changing the type to unsigned long to scale to different architectures. Address the change in location of header files. Change-Id: I80c6afb8f6c8bfc40b1f3312b9c1797a7ad48340 Signed-off-by: Naveen Kaje --- drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/msm_serial_hs_lite.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'drivers/tty') diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index f1f03919a086..551c387f2bd9 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1056,7 +1056,7 @@ config SERIAL_MSM_RX_WAKEUP config SERIAL_MSM_HSL tristate "MSM UART High Speed : Legacy mode Serial Driver" - depends on ARM && ARCH_MSM + depends on (ARM || ARM64) && ARCH_MSM select SERIAL_CORE default n help diff --git a/drivers/tty/serial/msm_serial_hs_lite.c b/drivers/tty/serial/msm_serial_hs_lite.c index f146c9adcef0..0878abf58720 100644 --- a/drivers/tty/serial/msm_serial_hs_lite.c +++ b/drivers/tty/serial/msm_serial_hs_lite.c @@ -49,9 +49,8 @@ #include #include #include -#include -#include -#include +#include +#include #include "msm_serial_hs_hwreg.h" /* @@ -85,7 +84,7 @@ struct msm_hsl_port { unsigned int *gsbi_mapbase; unsigned int *mapped_gsbi; unsigned int old_snap_state; - unsigned int ver_id; + unsigned long ver_id; int tx_timeout; struct mutex clk_mutex; enum uart_core_type uart_type; @@ -168,13 +167,13 @@ static inline void msm_hsl_write(struct uart_port *port, unsigned int val, unsigned int off) { __iowmb(); - __raw_writel_no_log((__force __u32)cpu_to_le32(val), + __raw_writel((__force __u32)cpu_to_le32(val), port->membase + off); } static inline unsigned int msm_hsl_read(struct uart_port *port, unsigned int off) { - unsigned int v = le32_to_cpu((__force __le32)__raw_readl_no_log( + unsigned int v = le32_to_cpu((__force __le32)__raw_readl( port->membase + off)); __iormb(); return v; @@ -1769,7 +1768,7 @@ static int msm_serial_hsl_probe(struct platform_device *pdev) if (!match) { msm_hsl_port->ver_id = UARTDM_VERSION_11_13; } else { - msm_hsl_port->ver_id = (unsigned int)match->data; + msm_hsl_port->ver_id = (unsigned long)match->data; /* * BLSP based UART configuration is available with * UARTDM v14 Revision. Hence set uart_type as UART_BLSP. -- cgit v1.2.3 From ac7df0d7c4d899402991b14b1a44e86a896d3272 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Fri, 30 Aug 2013 09:39:53 +0200 Subject: Remove GENERIC_HARDIRQ config option After the last architecture switched to generic hard irqs the config options HAVE_GENERIC_HARDIRQS & GENERIC_HARDIRQS and the related code for !CONFIG_GENERIC_HARDIRQS can be removed. Signed-off-by: Martin Schwidefsky Git-commit: 0244ad004a54e39308d495fee0a2e637f8b5c317 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [imaund@codeaurora.org: resolve merge conflicts] Signed-off-by: Ian Maund --- drivers/tty/serial/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/tty') diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 551c387f2bd9..4e8ef7ddb2fc 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -5,7 +5,7 @@ if TTY menu "Serial drivers" - depends on HAS_IOMEM && GENERIC_HARDIRQS + depends on HAS_IOMEM source "drivers/tty/serial/8250/Kconfig" -- cgit v1.2.3