1 From 025909cbf933cc20c2ff5ea9f87de8e17a739a08 Mon Sep 17 00:00:00 2001
2 From: Andy Gross <agross@codeaurora.org>
3 Date: Thu, 24 Apr 2014 11:31:22 -0500
4 Subject: [PATCH 087/182] tty: serial: msm: Remove direct access to GSBI
6 This patch removes direct access of the GSBI registers. GSBI configuration
7 should be done through the GSBI driver directly.
9 Signed-off-by: Andy Gross <agross@codeaurora.org>
10 Signed-off-by: Kumar Gala <galak@codeaurora.org>
12 drivers/tty/serial/msm_serial.c | 48 ++-------------------------------------
13 drivers/tty/serial/msm_serial.h | 5 ----
14 2 files changed, 2 insertions(+), 51 deletions(-)
16 --- a/drivers/tty/serial/msm_serial.c
17 +++ b/drivers/tty/serial/msm_serial.c
18 @@ -52,7 +52,6 @@ struct msm_port {
22 - void __iomem *gsbi_base;
24 unsigned int old_snap_state;
26 @@ -599,9 +598,7 @@ static const char *msm_type(struct uart_
27 static void msm_release_port(struct uart_port *port)
29 struct platform_device *pdev = to_platform_device(port->dev);
30 - struct msm_port *msm_port = UART_TO_MSM(port);
31 struct resource *uart_resource;
32 - struct resource *gsbi_resource;
35 uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
36 @@ -612,28 +609,12 @@ static void msm_release_port(struct uart
37 release_mem_region(port->mapbase, size);
38 iounmap(port->membase);
41 - if (msm_port->gsbi_base) {
42 - writel_relaxed(GSBI_PROTOCOL_IDLE,
43 - msm_port->gsbi_base + GSBI_CONTROL);
45 - gsbi_resource = platform_get_resource(pdev, IORESOURCE_MEM, 1);
46 - if (unlikely(!gsbi_resource))
49 - size = resource_size(gsbi_resource);
50 - release_mem_region(gsbi_resource->start, size);
51 - iounmap(msm_port->gsbi_base);
52 - msm_port->gsbi_base = NULL;
56 static int msm_request_port(struct uart_port *port)
58 - struct msm_port *msm_port = UART_TO_MSM(port);
59 struct platform_device *pdev = to_platform_device(port->dev);
60 struct resource *uart_resource;
61 - struct resource *gsbi_resource;
65 @@ -652,30 +633,8 @@ static int msm_request_port(struct uart_
66 goto fail_release_port;
69 - gsbi_resource = platform_get_resource(pdev, IORESOURCE_MEM, 1);
70 - /* Is this a GSBI-based port? */
71 - if (gsbi_resource) {
72 - size = resource_size(gsbi_resource);
74 - if (!request_mem_region(gsbi_resource->start, size,
77 - goto fail_release_port_membase;
80 - msm_port->gsbi_base = ioremap(gsbi_resource->start, size);
81 - if (!msm_port->gsbi_base) {
83 - goto fail_release_gsbi;
90 - release_mem_region(gsbi_resource->start, size);
91 -fail_release_port_membase:
92 - iounmap(port->membase);
94 release_mem_region(port->mapbase, size);
96 @@ -683,7 +642,6 @@ fail_release_port:
98 static void msm_config_port(struct uart_port *port, int flags)
100 - struct msm_port *msm_port = UART_TO_MSM(port);
102 if (flags & UART_CONFIG_TYPE) {
103 port->type = PORT_MSM;
104 @@ -691,9 +649,6 @@ static void msm_config_port(struct uart_
108 - if (msm_port->gsbi_base)
109 - writel_relaxed(GSBI_PROTOCOL_UART,
110 - msm_port->gsbi_base + GSBI_CONTROL);
113 static int msm_verify_port(struct uart_port *port, struct serial_struct *ser)
114 @@ -1110,6 +1065,7 @@ static struct of_device_id msm_match_tab
116 static struct platform_driver msm_platform_driver = {
117 .remove = msm_serial_remove,
118 + .probe = msm_serial_probe,
120 .name = "msm_serial",
121 .owner = THIS_MODULE,
122 @@ -1125,7 +1081,7 @@ static int __init msm_serial_init(void)
126 - ret = platform_driver_probe(&msm_platform_driver, msm_serial_probe);
127 + ret = platform_driver_register(&msm_platform_driver);
129 uart_unregister_driver(&msm_uart_driver);
131 --- a/drivers/tty/serial/msm_serial.h
132 +++ b/drivers/tty/serial/msm_serial.h
134 #define UART_ISR 0x0014
135 #define UART_ISR_TX_READY (1 << 7)
137 -#define GSBI_CONTROL 0x0
138 -#define GSBI_PROTOCOL_CODE 0x30
139 -#define GSBI_PROTOCOL_UART 0x40
140 -#define GSBI_PROTOCOL_IDLE 0x0
142 #define UARTDM_RXFS 0x50
143 #define UARTDM_RXFS_BUF_SHIFT 0x7
144 #define UARTDM_RXFS_BUF_MASK 0x7