]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:46:44 +0000 (14:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:46:44 +0000 (14:46 +1100)
1  2 
Documentation/kernel-parameters.txt
drivers/tty/serial/8250/8250_dma.c
drivers/tty/serial/sc16is7xx.c
include/linux/platform_data/atmel.h

index 3262b0d62ef87ac5d1018dad00a1380dd1a07f4d,8d9dd534c6a86e67ad2d79ab4d4c8d1819b5156b..101573c07788945b4423e3d29dbbed9275ab5cda
@@@ -167,8 -167,7 +167,8 @@@ bytes respectively. Such letter suffixe
  
        acpi=           [HW,ACPI,X86,ARM64]
                        Advanced Configuration and Power Interface
 -                      Format: { force | off | strict | noirq | rsdt }
 +                      Format: { force | off | strict | noirq | rsdt |
 +                                copy_dsdt }
                        force -- enable ACPI if default was off
                        off -- disable ACPI if default was on
                        noirq -- do not use ACPI for IRQ routing
                        is passed, kernel could allocate physical memory region
                        above 4G, that cause second kernel crash on system
                        that require some amount of low memory, e.g. swiotlb
 -                      requires at least 64M+32K low memory.  Kernel would
 -                      try to allocate 72M below 4G automatically.
 +                      requires at least 64M+32K low memory, also enough extra
 +                      low memory is needed to make sure DMA buffers for 32-bit
 +                      devices won't run out. Kernel would try to allocate at
 +                      at least 256M below 4G automatically.
                        This one let user to specify own low range under 4G
                        for second kernel instead.
                        0: to disable low allocation.
                        The filter can be disabled or changed to another
                        driver later using sysfs.
  
 -      drm_kms_helper.edid_firmware=[<connector>:]<file>
 -                      Broken monitors, graphic adapters and KVMs may
 -                      send no or incorrect EDID data sets. This parameter
 -                      allows to specify an EDID data set in the
 -                      /lib/firmware directory that is used instead.
 +      drm_kms_helper.edid_firmware=[<connector>:]<file>[,[<connector>:]<file>]
 +                      Broken monitors, graphic adapters, KVMs and EDIDless
 +                      panels may send no or incorrect EDID data sets.
 +                      This parameter allows to specify an EDID data sets
 +                      in the /lib/firmware directory that are used instead.
                        Generic built-in EDID data sets are used, if one of
                        edid/1024x768.bin, edid/1280x1024.bin,
                        edid/1680x1050.bin, or edid/1920x1080.bin is given
                        available in Documentation/EDID/HOWTO.txt. An EDID
                        data set will only be used for a particular connector,
                        if its name and a colon are prepended to the EDID
 -                      name.
 +                      name. Each connector may use a unique EDID data
 +                      set by separating the files with a comma.  An EDID
 +                      data set with no connector name will be used for
 +                      any connectors not explicitly specified.
  
        dscc4.setup=    [NET]
  
  
        earlycon=       [KNL] Output early console device and options.
  
 +                      When used with no options, the early console is
 +                      determined by the stdout-path property in device
 +                      tree's chosen node.
 +
                cdns,<addr>
                        Start an early, polled-mode console on a cadence serial
                        port at the specified address. The cadence serial port
                        serial port must already be setup and configured.
                        Options are not yet supported.
  
+               lpuart,<addr>
+               lpuart32,<addr>
+                       Use early console provided by Freescale LP UART driver
+                       found on Freescale Vybrid and QorIQ LS1021A processors.
+                       A valid base address must be provided, and the serial
+                       port must already be setup and configured.
        earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]
                        earlyprintk=vga
                        earlyprintk=efi
                        you are really sure that your UEFI does sane gc and
                        fulfills the spec otherwise your board may brick.
  
 +      efi_fake_mem=   nn[KMG]@ss[KMG]:aa[,nn[KMG]@ss[KMG]:aa,..] [EFI; X86]
 +                      Add arbitrary attribute to specific memory range by
 +                      updating original EFI memory map.
 +                      Region of memory which aa attribute is added to is
 +                      from ss to ss+nn.
 +                      If efi_fake_mem=2G@4G:0x10000,2G@0x10a0000000:0x10000
 +                      is specified, EFI_MEMORY_MORE_RELIABLE(0x10000)
 +                      attribute is added to range 0x100000000-0x180000000 and
 +                      0x10a0000000-0x1120000000.
 +
 +                      Using this parameter you can do debugging of EFI memmap
 +                      related feature. For example, you can do debugging of
 +                      Address Range Mirroring feature even if your box
 +                      doesn't support it.
 +
        eisa_irq_edge=  [PARISC,HW]
                        See header of drivers/parisc/eisa.c.
  
                hwp_only
                        Only load intel_pstate on systems which support
                        hardware P state control (HWP) if available.
 +              no_acpi
 +                      Don't use ACPI processor performance control objects
 +                      _PSS and _PPC specified limits.
  
        intremap=       [X86-64, Intel-IOMMU]
                        on      enable Interrupt Remapping (default)
                        nosid   disable Source ID checking
                        no_x2apic_optout
                                BIOS x2APIC opt-out request will be ignored
 +                      nopost  disable Interrupt Posting
  
        iomem=          Disable strict checking of access to MMIO memory
                strict  regions from userspace.
        nmi_watchdog=   [KNL,BUGS=X86] Debugging features for SMP kernels
                        Format: [panic,][nopanic,][num]
                        Valid num: 0 or 1
 -                      0 - turn nmi_watchdog off
 -                      1 - turn nmi_watchdog on
 +                      0 - turn hardlockup detector in nmi_watchdog off
 +                      1 - turn hardlockup detector in nmi_watchdog on
                        When panic is specified, panic when an NMI watchdog
                        timeout occurs (or 'nopanic' to override the opposite
 -                      default).
 +                      default). To disable both hard and soft lockup detectors,
 +                      please see 'nowatchdog'.
                        This is useful when you use a panic=... timeout and
                        need the box quickly up again.
  
                        cache-to-cache transfer latencies.
  
        rcutree.rcu_fanout_leaf= [KNL]
 -                      Increase the number of CPUs assigned to each
 -                      leaf rcu_node structure.  Useful for very large
 -                      systems.
 +                      Change the number of CPUs assigned to each
 +                      leaf rcu_node structure.  Useful for very
 +                      large systems, which will choose the value 64,
 +                      and for NUMA systems with large remote-access
 +                      latencies, which will choose a value aligned
 +                      with the appropriate hardware boundaries.
  
        rcutree.jiffies_till_sched_qs= [KNL]
                        Set required age in jiffies for a
index e508939daea3f3128a2ada1e696a5f751d212077,b50307129901c39436b3c7170aae1fe63cc3aac3..78259d3c6a55592281a5c6aaad88c5ae727d9615
@@@ -54,9 -54,6 +54,6 @@@ static void __dma_rx_complete(void *par
        struct dma_tx_state     state;
        int                     count;
  
-       dma_sync_single_for_cpu(dma->rxchan->device->dev, dma->rx_addr,
-                               dma->rx_size, DMA_FROM_DEVICE);
        dma->rx_running = 0;
        dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state);
  
@@@ -80,6 -77,10 +77,6 @@@ int serial8250_tx_dma(struct uart_8250_
                return 0;
  
        dma->tx_size = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE);
 -      if (dma->tx_size < p->port.fifosize) {
 -              ret = -EINVAL;
 -              goto err;
 -      }
  
        desc = dmaengine_prep_slave_single(dma->txchan,
                                           dma->tx_addr + xmit->tail,
@@@ -152,9 -153,6 +149,6 @@@ int serial8250_rx_dma(struct uart_8250_
  
        dma->rx_cookie = dmaengine_submit(desc);
  
-       dma_sync_single_for_device(dma->rxchan->device->dev, dma->rx_addr,
-                                  dma->rx_size, DMA_FROM_DEVICE);
        dma_async_issue_pending(dma->rxchan);
  
        return 0;
index 55b61d79e75770ada22902588106beee0411720b,1ae8aa698fcbd6dc80ebfae05a0a3ae0b1c6e5eb..edb5305b9d4da72e388452f66db9e65e40d15f18
@@@ -1321,6 -1321,9 +1321,9 @@@ static int sc16is7xx_spi_probe(struct s
                const struct of_device_id *of_id =
                        of_match_device(sc16is7xx_dt_ids, &spi->dev);
  
+               if (!of_id)
+                       return -ENODEV;
                devtype = (struct sc16is7xx_devtype *)of_id->data;
        } else {
                const struct spi_device_id *id_entry = spi_get_device_id(spi);
@@@ -1357,6 -1360,7 +1360,6 @@@ MODULE_DEVICE_TABLE(spi, sc16is7xx_spi_
  static struct spi_driver sc16is7xx_spi_uart_driver = {
        .driver = {
                .name           = SC16IS7XX_NAME,
 -              .owner          = THIS_MODULE,
                .of_match_table = of_match_ptr(sc16is7xx_dt_ids),
        },
        .probe          = sc16is7xx_spi_probe,
@@@ -1379,6 -1383,9 +1382,9 @@@ static int sc16is7xx_i2c_probe(struct i
                const struct of_device_id *of_id =
                                of_match_device(sc16is7xx_dt_ids, &i2c->dev);
  
+               if (!of_id)
+                       return -ENODEV;
                devtype = (struct sc16is7xx_devtype *)of_id->data;
        } else {
                devtype = (struct sc16is7xx_devtype *)id->driver_data;
@@@ -1419,7 -1426,6 +1425,6 @@@ static struct i2c_driver sc16is7xx_i2c_
        .id_table       = sc16is7xx_i2c_id_table,
  };
  
- MODULE_ALIAS("i2c:sc16is7xx");
  #endif
  
  static int __init sc16is7xx_init(void)
index c841e7e349729adf3a4bab9f0b47aaca8d7b6643,c4bc90bfebe0b7904c91f3ed27a4c2a8b56bd935..e649d8d370f8954435b79728e95db462795add5f
@@@ -9,14 -9,16 +9,8 @@@
  
  #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
 -#include <linux/device.h>
 -#include <linux/i2c.h>
 -#include <linux/leds.h>
 -#include <linux/spi/spi.h>
 -#include <linux/usb/atmel_usba_udc.h>
 -#include <linux/atmel-mci.h>
 -#include <sound/atmel-ac97c.h>
  #include <linux/serial.h>
 -#include <linux/platform_data/macb.h>
  
- /*
-  * at91: 6 USARTs and one DBGU port (SAM9260)
-  * avr32: 4
-  */
- #define ATMEL_MAX_UART        7
   /* USB Device */
  struct at91_udc_data {
        int     vbus_pin;               /* high == host powering us */
@@@ -66,6 -68,11 +60,6 @@@ struct atmel_uart_data 
        struct serial_rs485     rs485;          /* rs485 settings */
  };
  
 -/* CAN */
 -struct at91_can_data {
 -      void (*transceiver_switch)(int on);
 -};
 -
  /* FIXME: this needs a better location, but gets stuff building again */
  extern int at91_suspend_entering_slow_clock(void);