kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / ipq806x / patches / 0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch

diff --git a/target/linux/ipq806x/patches/0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch b/target/linux/ipq806x/patches/0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch
index 8cbb52a903d08a0f442d3e535e8ed04f56c53d90..9eb71382e463613958c2f816ef62cdf891da2852 100644 (file)
--- a/target/linux/ipq806x/patches/0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch
+++ b/target/linux/ipq806x/patches/0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch
@@ -13,8 +13,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org>
  drivers/tty/serial/msm_serial.h |    5 ----
  2 files changed, 2 insertions(+), 51 deletions(-)
 
-diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
-index 053b98e..778e376 100644
 --- a/drivers/tty/serial/msm_serial.c
 +++ b/drivers/tty/serial/msm_serial.c
 @@ -52,7 +52,6 @@ struct msm_port {
@@ -25,7 +23,7 @@ index 053b98e..778e376 100644
        int                     is_uartdm;
        unsigned int            old_snap_state;
  };
-@@ -599,9 +598,7 @@ static const char *msm_type(struct uart_port *port)
+@@ -599,9 +598,7 @@ static const char *msm_type(struct uart_
  static void msm_release_port(struct uart_port *port)
  {
        struct platform_device *pdev = to_platform_device(port->dev);
@@ -35,7 +33,7 @@ index 053b98e..778e376 100644
        resource_size_t size;
  
        uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-@@ -612,28 +609,12 @@ static void msm_release_port(struct uart_port *port)
+@@ -612,28 +609,12 @@ static void msm_release_port(struct uart
        release_mem_region(port->mapbase, size);
        iounmap(port->membase);
        port->membase = NULL;
@@ -64,7 +62,7 @@ index 053b98e..778e376 100644
        resource_size_t size;
        int ret;
  
-@@ -652,30 +633,8 @@ static int msm_request_port(struct uart_port *port)
+@@ -652,30 +633,8 @@ static int msm_request_port(struct uart_
                goto fail_release_port;
        }
  
@@ -103,7 +101,7 @@ index 053b98e..778e376 100644
        int ret;
        if (flags & UART_CONFIG_TYPE) {
                port->type = PORT_MSM;
-@@ -691,9 +649,6 @@ static void msm_config_port(struct uart_port *port, int flags)
+@@ -691,9 +649,6 @@ static void msm_config_port(struct uart_
                if (ret)
                        return;
        }
@@ -113,7 +111,7 @@ index 053b98e..778e376 100644
  }
  
  static int msm_verify_port(struct uart_port *port, struct serial_struct *ser)
-@@ -1110,6 +1065,7 @@ static struct of_device_id msm_match_table[] = {
+@@ -1110,6 +1065,7 @@ static struct of_device_id msm_match_tab
  
  static struct platform_driver msm_platform_driver = {
        .remove = msm_serial_remove,
@@ -130,8 +128,6 @@ index 053b98e..778e376 100644
        if (unlikely(ret))
                uart_unregister_driver(&msm_uart_driver);
  
-diff --git a/drivers/tty/serial/msm_serial.h b/drivers/tty/serial/msm_serial.h
-index 1e9b68b..d98d45e 100644
 --- a/drivers/tty/serial/msm_serial.h
 +++ b/drivers/tty/serial/msm_serial.h
 @@ -109,11 +109,6 @@
@@ -146,6 +142,3 @@ index 1e9b68b..d98d45e 100644
  #define UARTDM_RXFS           0x50
  #define UARTDM_RXFS_BUF_SHIFT 0x7
  #define UARTDM_RXFS_BUF_MASK  0x7
--- 
-1.7.10.4
-