Commit a7b15ab8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Overlapping changes in selftests Makefile.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b05f03b2 15042698

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ Required properties: 
- compatible:

    atmel,maxtouch



    The following compatibles have been used in various products but are

    deprecated:

	atmel,qt602240_ts

	atmel,atmel_mxt_ts

	atmel,atmel_mxt_tp

	atmel,mXT224



- reg: The I2C address of the device



- interrupts: The sink for the touchpad's IRQ output

Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Required properties: 
- interrupts : identifier to the device interrupt

- clocks : a list of phandle + clock-specifier pairs, one for each

	   entry in clock names.

- clocks-names :

- clock-names :

   * "xtal" for external xtal clock identifier

   * "pclk" for the bus core clock, either the clk81 clock or the gate clock

   * "baud" for the source of the baudrate generator, can be either the xtal

Documentation/devicetree/bindings/serial/mvebu-uart.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Required properties: 
    - Must contain two elements for the extended variant of the IP

      (marvell,armada-3700-uart-ext): "uart-tx" and "uart-rx",

      respectively the UART TX interrupt and the UART RX interrupt. A

      corresponding interrupts-names property must be defined.

      corresponding interrupt-names property must be defined.

    - For backward compatibility reasons, a single element interrupts

      property is also supported for the standard variant of the IP,

      containing only the UART sum interrupt. This form is deprecated

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ Required properties: 
    - "renesas,scifa-r8a7745" for R8A7745 (RZ/G1E) SCIFA compatible UART.

    - "renesas,scifb-r8a7745" for R8A7745 (RZ/G1E) SCIFB compatible UART.

    - "renesas,hscif-r8a7745" for R8A7745 (RZ/G1E) HSCIF compatible UART.

    - "renesas,scif-r8a77470" for R8A77470 (RZ/G1C) SCIF compatible UART.

    - "renesas,hscif-r8a77470" for R8A77470 (RZ/G1C) HSCIF compatible UART.

    - "renesas,scif-r8a7778" for R8A7778 (R-Car M1) SCIF compatible UART.

    - "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART.

    - "renesas,scif-r8a7790" for R8A7790 (R-Car H2) SCIF compatible UART.

Documentation/devicetree/bindings/usb/usb-xhci.txt

+4 −1
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ Required properties: 
  - interrupts: one XHCI interrupt should be described here.



Optional properties:

  - clocks: reference to a clock

  - clocks: reference to the clocks

  - clock-names: mandatory if there is a second clock, in this case

    the name must be "core" for the first clock and "reg" for the

    second one

  - usb2-lpm-disable: indicate if we don't want to enable USB2 HW LPM

  - usb3-lpm-capable: determines if platform is USB3 LPM capable

  - quirk-broken-port-ped: set if the controller has broken port disable mechanism