forked from linaro-swg/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
150 changed files
with
938 additions
and
394 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
Documentation/devicetree/bindings/pci/arm,juno-r1-pcie.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
* 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. |
12 changes: 12 additions & 0 deletions
12
Documentation/devicetree/bindings/pci/plda,xpressrich3-axi.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
* 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/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4010,7 +4010,7 @@ S: Maintained | |
F: sound/usb/misc/ua101.c | ||
|
||
EXTENSIBLE FIRMWARE INTERFACE (EFI) | ||
M: Matt Fleming <matt[email protected]> | ||
M: Matt Fleming <matt@codeblueprint.co.uk> | ||
L: [email protected] | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git | ||
S: Maintained | ||
|
@@ -4025,7 +4025,7 @@ F: include/linux/efi*.h | |
EFI VARIABLE FILESYSTEM | ||
M: Matthew Garrett <[email protected]> | ||
M: Jeremy Kerr <[email protected]> | ||
M: Matt Fleming <matt[email protected]> | ||
M: Matt Fleming <matt@codeblueprint.co.uk> | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git | ||
L: [email protected] | ||
S: Maintained | ||
|
@@ -9921,7 +9921,6 @@ S: Maintained | |
F: drivers/staging/lustre | ||
|
||
STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) | ||
M: Julian Andres Klode <[email protected]> | ||
M: Marc Dietrich <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
L: [email protected] | ||
|
@@ -11385,15 +11384,6 @@ W: http://oops.ghostprotocols.net:81/blog | |
S: Maintained | ||
F: drivers/net/wireless/wl3501* | ||
|
||
WM97XX TOUCHSCREEN DRIVERS | ||
M: Mark Brown <[email protected]> | ||
M: Liam Girdwood <[email protected]> | ||
L: [email protected] | ||
W: https://github.com/CirrusLogic/linux-drivers/wiki | ||
S: Supported | ||
F: drivers/input/touchscreen/*wm97* | ||
F: include/linux/wm97xx.h | ||
|
||
WOLFSON MICROELECTRONICS DRIVERS | ||
L: [email protected] | ||
T: git https://github.com/CirrusLogic/linux-drivers.git | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.