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

Commit 3e4dda70 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/arm64' into next/dt 

Merging in the few patches I had kept separate from main next/dt, since others
got merged here directly.

* next/arm64:
  arm64: defconfig: Enable PCI generic host bridge by default
  arm64: Juno: Add support for the PCIe host bridge on Juno R1
  Documentation: of: Document the bindings used by Juno R1 PCIe host bridge
  arm64: dts: mt8173: Add clocks for SCPSYS unit
  arm64: dts: mt8173: Add subsystem clock controller device nodes
  + Linux 4.3-rc5
parents 1b38b0e3 8713181d

Documentation/device-mapper/snapshot.txt

+7 −3
Original line number Diff line number Diff line
@@ -41,9 +41,13 @@ useless and be disabled, returning errors. So it is important to monitor 
the amount of free space and expand the <COW device> before it fills up.



<persistent?> is P (Persistent) or N (Not persistent - will not survive

after reboot).

The difference is that for transient snapshots less metadata must be

saved on disk - they can be kept in memory by the kernel.

after reboot).  O (Overflow) can be added as a persistent store option

to allow userspace to advertise its support for seeing "Overflow" in the

snapshot status.  So supported store types are "P", "PO" and "N".



The difference between persistent and transient is with transient

snapshots less metadata must be saved on disk - they can be kept in

memory by the kernel.





* snapshot-merge <origin> <COW device> <persistent> <chunksize>

Documentation/devicetree/bindings/pci/arm,juno-r1-pcie.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
* ARM Juno R1 PCIe interface



This PCIe host controller is based on PLDA XpressRICH3-AXI IP

and thus inherits all the common properties defined in plda,xpressrich3-axi.txt

as well as the base properties defined in host-generic-pci.txt.



Required properties:

 - compatible: "arm,juno-r1-pcie"

 - dma-coherent: The host controller bridges the AXI transactions into PCIe bus

   in a manner that makes the DMA operations to appear coherent to the CPUs.

Documentation/devicetree/bindings/pci/plda,xpressrich3-axi.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
* PLDA XpressRICH3-AXI host controller



The PLDA XpressRICH3-AXI host controller can be configured in a manner that

makes it compliant with the SBSA[1] standard published by ARM Ltd. For those

scenarios, the host-generic-pci.txt bindings apply with the following additions

to the compatible property:



Required properties:

 - compatible: should contain "plda,xpressrich3-axi" to identify the IP used.





[1] http://infocenter.arm.com/help/topic/com.arm.doc.den0029a/

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings: 
- renesas,tx-fifo-size : Overrides the default tx fifo size given in words

			 (default is 64)

- renesas,rx-fifo-size : Overrides the default rx fifo size given in words

			 (default is 64, or 256 on R-Car Gen2)

			 (default is 64)



Pinctrl properties might be needed, too.  See

Documentation/devicetree/bindings/pinctrl/renesas,*.

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7795"

  - reg: Base address and length of the register for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - clocks: A list of phandle + clock specifier pairs