Merge tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty / serial driver update from Greg KH:
 "Here's the big tty / serial driver update for 3.17-rc1.

  Nothing major, just a number of fixes and new features for different
  serial drivers, and some more tty core fixes and documentation of the
  tty locks.

  All of these have been in linux-next for a while"

* tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (82 commits)
  tty/n_gsm.c: fix a memory leak in gsmld_open
  pch_uart: don't hardcode PCI slot to get DMA device
  tty: n_gsm, use setup_timer
  Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console"
  serial: sc16is7xx: Correct initialization of s->clk
  serial: 8250_dw: Add support for deferred probing
  serial: 8250_dw: Add optional reset control support
  serial: st-asc: Fix overflow in baudrate calculation
  serial: st-asc: Don't call BUG in asc_console_setup()
  tty: serial: msm: Make of_device_id array const
  tty/n_gsm.c: get gsm->num after gsm_activate_mux
  serial/core: Fix too big allocation for attribute member
  drivers/tty/serial: use correct type for dma_map/unmap
  serial: altera_jtaguart: Fix putchar function passed to uart_console_write()
  serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers
  Serial: allow port drivers to have a default attribute group
  tty: kgdb_nmi: Automatically manage tty enable
  serial: altera_jtaguart: Adpot uart_console_write()
  serial: samsung: improve code clarity by defining a variable
  serial: samsung: correct the case and default order in switch
  ...

3 files changed, 3 insertions, 103 deletions

diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts
index 5bb2fdaca02f..6b57475967a6 100644
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/angel4.dts
@@ -17,7 +17,7 @@
         interrupt-parent = <&intc>;
 
         chosen {
-                bootargs = "console=ttyARC0,115200n8 earlyprintk=ttyARC0";
+                bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8";
         };
 
         aliases {
diff --git a/arch/arc/plat-arcfpga/Kconfig b/arch/arc/plat-arcfpga/Kconfig
index e27bb5cc3c1e..b9f34cf55acf 100644
--- a/arch/arc/plat-arcfpga/Kconfig
+++ b/arch/arc/plat-arcfpga/Kconfig
@@ -41,11 +41,4 @@ config ISS_SMP_EXTN
           -XTL (To enable CPU start/stop/set-PC for another CPU)
           It doesn't provide coherent Caches and/or Atomic Ops (LLOCK/SCOND)
 
-config ARC_SERIAL_BAUD
-        int "UART Baud rate"
-        default "115200"
-        depends on SERIAL_ARC || SERIAL_ARC_CONSOLE
-        help
-          Baud rate for the ARC UART
-
 endif
diff --git a/arch/arc/plat-arcfpga/platform.c b/arch/arc/plat-arcfpga/platform.c
index 61c7e5997387..b8d0d456627f 100644
--- a/arch/arc/plat-arcfpga/platform.c
+++ b/arch/arc/plat-arcfpga/platform.c
@@ -22,115 +22,22 @@
 #include <plat/smp.h>
 #include <plat/irq.h>
 
-/*----------------------- Platform Devices -----------------------------*/
-
-#if IS_ENABLED(CONFIG_SERIAL_ARC)
-static unsigned long arc_uart_info[] = {
-        0,      /* uart->is_emulated (runtime @running_on_hw) */
-        0,      /* uart->port.uartclk */
-        0,      /* uart->baud */
-        0
-};
-
-#if defined(CONFIG_SERIAL_ARC_CONSOLE)
-/*
- * static platform data - but only for early serial
- * TBD: derive this from a special DT node
- */
-static struct resource arc_uart0_res[] = {
-        {
-                .start = UART0_BASE,
-                .end   = UART0_BASE + 0xFF,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = UART0_IRQ,
-                .end   = UART0_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device arc_uart0_dev = {
-        .name = "arc-uart",
-        .id = 0,
-        .num_resources = ARRAY_SIZE(arc_uart0_res),
-        .resource = arc_uart0_res,
-        .dev = {
-                .platform_data = &arc_uart_info,
-        },
-};
-
-static struct platform_device *fpga_early_devs[] __initdata = {
-        &arc_uart0_dev,
-};
-#endif  /* CONFIG_SERIAL_ARC_CONSOLE */
-
-static void arc_fpga_serial_init(void)
-{
-        /* To let driver workaround ISS bug: baudh Reg can't be set to 0 */
-        arc_uart_info[0] = !running_on_hw;
-
-        arc_uart_info[1] = arc_get_core_freq();
-
-        arc_uart_info[2] = CONFIG_ARC_SERIAL_BAUD;
-
-#if defined(CONFIG_SERIAL_ARC_CONSOLE)
-        early_platform_add_devices(fpga_early_devs,
-                                   ARRAY_SIZE(fpga_early_devs));
-
-        /*
-         * ARC console driver registers (build time) as an early platform driver
-         * of class "earlyprintk". However it needs explicit cmdline toggle
-         * "earlyprintk=ttyARC0" to be successfuly runtime registered.
-         * Otherwise the early probe below fails to find the driver
-         */
-        early_platform_driver_probe("earlyprintk", 1, 0);
-
-        /*
-         * This is to make sure that arc uart would be preferred console
-         * despite one/more of following:
-         *   -command line lacked "console=ttyARC0" or
-         *   -CONFIG_VT_CONSOLE was enabled (for no reason whatsoever)
-         * Note that this needs to be done after above early console is reg,
-         * otherwise the early console never gets a chance to run.
-         */
-        add_preferred_console("ttyARC", 0, "115200");
-#endif  /* CONFIG_SERIAL_ARC_CONSOLE */
-}
-#else   /* !IS_ENABLED(CONFIG_SERIAL_ARC) */
-static void arc_fpga_serial_init(void)
-{
-}
-#endif
-
 static void __init plat_fpga_early_init(void)
 {
         pr_info("[plat-arcfpga]: registering early dev resources\n");
 
-        arc_fpga_serial_init();
-
 #ifdef CONFIG_ISS_SMP_EXTN
         iss_model_init_early_smp();
 #endif
 }
 
-static struct of_dev_auxdata plat_auxdata_lookup[] __initdata = {
-#if IS_ENABLED(CONFIG_SERIAL_ARC)
-        OF_DEV_AUXDATA("snps,arc-uart", UART0_BASE, "arc-uart", arc_uart_info),
-#endif
-        {}
-};
-
 static void __init plat_fpga_populate_dev(void)
 {
-        pr_info("[plat-arcfpga]: registering device resources\n");
-
         /*
          * Traverses flattened DeviceTree - registering platform devices
-         * complete with their resources
+         * (if any) complete with their resources
          */
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             plat_auxdata_lookup, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 /*----------------------- Machine Descriptions ------------------------------