Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c73f91 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14.53 (57c28741) into msm-4.14"

parents eaa1b765 44984fa1

Documentation/ABI/testing/sysfs-class-cxl

+3 −1
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ Date: September 2014 
Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read/write

                Set the mode for prefaulting in segments into the segment table

                when performing the START_WORK ioctl. Possible values:

                when performing the START_WORK ioctl. Only applicable when

                running under hashed page table mmu.

                Possible values:

                        none: No prefaulting (default)

                        work_element_descriptor: Treat the work element

                                 descriptor as an effective address and

Documentation/devicetree/bindings/display/panel/panel-common.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Display Timings 
  require specific display timings. The panel-timing subnode expresses those

  timings as specified in the timing subnode section of the display timing

  bindings defined in

  Documentation/devicetree/bindings/display/display-timing.txt.

  Documentation/devicetree/bindings/display/panel/display-timing.txt.





Connectivity

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Required Properties: 
		- "renesas,dmac-r8a7794" (R-Car E2)

		- "renesas,dmac-r8a7795" (R-Car H3)

		- "renesas,dmac-r8a7796" (R-Car M3-W)

		- "renesas,dmac-r8a77965" (R-Car M3-N)

		- "renesas,dmac-r8a77970" (R-Car V3M)



- reg: base address and length of the registers block for the DMAC

Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt

+3 −3
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ pins it needs, and how they should be configured, with regard to muxer 
configuration, drive strength and pullups. If one of these options is

not set, its actual value will be unspecified.



This driver supports the generic pin multiplexing and configuration

bindings. For details on each properties, you can refer to

Allwinner A1X Pin Controller supports the generic pin multiplexing and

configuration bindings. For details on each properties, you can refer to

 ./pinctrl-bindings.txt.



Required sub-node properties:

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