Skip to content

Commit 3e4dda7

Browse files
olofjolofj
committed
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
2 parents 1b38b0e + 8713181 commit 3e4dda7

File tree

150 files changed

+938
-394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+938
-394
lines changed

‎Documentation/device-mapper/snapshot.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@ useless and be disabled, returning errors. So it is important to monitor
4141
the amount of free space and expand the <COW device> before it fills up.
4242

4343
<persistent?> is P (Persistent) or N (Not persistent - will not survive
44-
after reboot).
45-
The difference is that for transient snapshots less metadata must be
46-
saved on disk - they can be kept in memory by the kernel.
44+
after reboot). O (Overflow) can be added as a persistent store option
45+
to allow userspace to advertise its support for seeing "Overflow" in the
46+
snapshot status. So supported store types are "P", "PO" and "N".
47+
48+
The difference between persistent and transient is with transient
49+
snapshots less metadata must be saved on disk - they can be kept in
50+
memory by the kernel.
4751

4852

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

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
* ARM Juno R1 PCIe interface
2+
3+
This PCIe host controller is based on PLDA XpressRICH3-AXI IP
4+
and thus inherits all the common properties defined in plda,xpressrich3-axi.txt
5+
as well as the base properties defined in host-generic-pci.txt.
6+
7+
Required properties:
8+
- compatible: "arm,juno-r1-pcie"
9+
- dma-coherent: The host controller bridges the AXI transactions into PCIe bus
10+
in a manner that makes the DMA operations to appear coherent to the CPUs.

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
* PLDA XpressRICH3-AXI host controller
2+
3+
The PLDA XpressRICH3-AXI host controller can be configured in a manner that
4+
makes it compliant with the SBSA[1] standard published by ARM Ltd. For those
5+
scenarios, the host-generic-pci.txt bindings apply with the following additions
6+
to the compatible property:
7+
8+
Required properties:
9+
- compatible: should contain "plda,xpressrich3-axi" to identify the IP used.
10+
11+
12+
[1] http://infocenter.arm.com/help/topic/com.arm.doc.den0029a/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings:
5151
- renesas,tx-fifo-size : Overrides the default tx fifo size given in words
5252
(default is 64)
5353
- renesas,rx-fifo-size : Overrides the default rx fifo size given in words
54-
(default is 64, or 256 on R-Car Gen2)
54+
(default is 64)
5555

5656
Pinctrl properties might be needed, too. See
5757
Documentation/devicetree/bindings/pinctrl/renesas,*.

‎Documentation/devicetree/bindings/usb/renesas_usbhs.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Required properties:
55
- "renesas,usbhs-r8a7790"
66
- "renesas,usbhs-r8a7791"
77
- "renesas,usbhs-r8a7794"
8+
- "renesas,usbhs-r8a7795"
89
- reg: Base address and length of the register for the USBHS
910
- interrupts: Interrupt specifier for the USBHS
1011
- clocks: A list of phandle + clock specifier pairs

‎Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ pericom Pericom Technology Inc.
169169
phytec PHYTEC Messtechnik GmbH
170170
picochip Picochip Ltd
171171
plathome Plat'Home Co., Ltd.
172+
plda PLDA
172173
pixcir PIXCIR MICROELECTRONICS Co., Ltd
173174
powervr PowerVR (deprecated, use img)
174175
qca Qualcomm Atheros, Inc.

‎MAINTAINERS

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4010,7 +4010,7 @@ S: Maintained
40104010
F: sound/usb/misc/ua101.c
40114011

40124012
EXTENSIBLE FIRMWARE INTERFACE (EFI)
4013-
M: Matt Fleming <matt[email protected]>
4013+
M: Matt Fleming <matt@codeblueprint.co.uk>
40144014
L: [email protected]
40154015
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
40164016
S: Maintained
@@ -4025,7 +4025,7 @@ F: include/linux/efi*.h
40254025
EFI VARIABLE FILESYSTEM
40264026
M: Matthew Garrett <[email protected]>
40274027
M: Jeremy Kerr <[email protected]>
4028-
M: Matt Fleming <matt[email protected]>
4028+
M: Matt Fleming <matt@codeblueprint.co.uk>
40294029
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
40304030
L: [email protected]
40314031
S: Maintained
@@ -9921,7 +9921,6 @@ S: Maintained
99219921
F: drivers/staging/lustre
99229922

99239923
STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
9924-
M: Julian Andres Klode <[email protected]>
99259924
M: Marc Dietrich <[email protected]>
99269925
L: [email protected] (moderated for non-subscribers)
99279926
L: [email protected]
@@ -11385,15 +11384,6 @@ W: http://oops.ghostprotocols.net:81/blog
1138511384
S: Maintained
1138611385
F: drivers/net/wireless/wl3501*
1138711386

11388-
WM97XX TOUCHSCREEN DRIVERS
11389-
M: Mark Brown <[email protected]>
11390-
M: Liam Girdwood <[email protected]>
11391-
L: [email protected]
11392-
W: https://github.com/CirrusLogic/linux-drivers/wiki
11393-
S: Supported
11394-
F: drivers/input/touchscreen/*wm97*
11395-
F: include/linux/wm97xx.h
11396-
1139711387
WOLFSON MICROELECTRONICS DRIVERS
1139811388
L: [email protected]
1139911389
T: git https://github.com/CirrusLogic/linux-drivers.git

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
VERSION = 4
22
PATCHLEVEL = 3
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc4
5-
NAME = Hurr durr I'ma sheep
4+
EXTRAVERSION = -rc5
5+
NAME = Blurry Fish Butt
66

77
# *DOCUMENTATION*
88
# To see a list of typical targets execute "make help"

‎arch/alpha/include/asm/word-at-a-time.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,6 @@ static inline unsigned long find_zero(unsigned long bits)
5252
#endif
5353
}
5454

55+
#define zero_bytemask(mask) ((2ul << (find_zero(mask) * 8)) - 1)
56+
5557
#endif /* _ASM_WORD_AT_A_TIME_H */

‎arch/arm/boot/dts/exynos5250-smdk5250.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
regulator-name = "P1.8V_LDO_OUT10";
198198
regulator-min-microvolt = <1800000>;
199199
regulator-max-microvolt = <1800000>;
200+
regulator-always-on;
200201
};
201202

202203
ldo11_reg: LDO11 {

0 commit comments

Comments
 (0)