Skip to content

Commit 22cbbce

Browse files
committed
Merge tag 'v3.19-rc6' into drm-fixes
Linux 3.19-rc6 pull in rc6 as the amdkfd fixes are based on it, and I'd rather be doing the merges separately
2 parents 104b615 + 26bc420 commit 22cbbce

File tree

143 files changed

+1428
-1583
lines changed

Some content is hidden

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

143 files changed

+1428
-1583
lines changed

Documentation/ABI/testing/sysfs-platform-dell-laptop

Lines changed: 0 additions & 60 deletions
This file was deleted.

Documentation/devicetree/bindings/arm/arm-boards

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Required nodes:
2323
range of 0x200 bytes.
2424

2525
- syscon: the root node of the Integrator platforms must have a
26-
system controller node pointong to the control registers,
26+
system controller node pointing to the control registers,
2727
with the compatible string
2828
"arm,integrator-ap-syscon"
2929
"arm,integrator-cp-syscon"
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
* QEMU Firmware Configuration bindings for ARM
2+
3+
QEMU's arm-softmmu and aarch64-softmmu emulation / virtualization targets
4+
provide the following Firmware Configuration interface on the "virt" machine
5+
type:
6+
7+
- A write-only, 16-bit wide selector (or control) register,
8+
- a read-write, 64-bit wide data register.
9+
10+
QEMU exposes the control and data register to ARM guests as memory mapped
11+
registers; their location is communicated to the guest's UEFI firmware in the
12+
DTB that QEMU places at the bottom of the guest's DRAM.
13+
14+
The guest writes a selector value (a key) to the selector register, and then
15+
can read the corresponding data (produced by QEMU) via the data register. If
16+
the selected entry is writable, the guest can rewrite it through the data
17+
register.
18+
19+
The selector register takes keys in big endian byte order.
20+
21+
The data register allows accesses with 8, 16, 32 and 64-bit width (only at
22+
offset 0 of the register). Accesses larger than a byte are interpreted as
23+
arrays, bundled together only for better performance. The bytes constituting
24+
such a word, in increasing address order, correspond to the bytes that would
25+
have been transferred by byte-wide accesses in chronological order.
26+
27+
The interface allows guest firmware to download various parameters and blobs
28+
that affect how the firmware works and what tables it installs for the guest
29+
OS. For example, boot order of devices, ACPI tables, SMBIOS tables, kernel and
30+
initrd images for direct kernel booting, virtual machine UUID, SMP information,
31+
virtual NUMA topology, and so on.
32+
33+
The authoritative registry of the valid selector values and their meanings is
34+
the QEMU source code; the structure of the data blobs corresponding to the
35+
individual key values is also defined in the QEMU source code.
36+
37+
The presence of the registers can be verified by selecting the "signature" blob
38+
with key 0x0000, and reading four bytes from the data register. The returned
39+
signature is "QEMU".
40+
41+
The outermost protocol (involving the write / read sequences of the control and
42+
data registers) is expected to be versioned, and/or described by feature bits.
43+
The interface revision / feature bitmap can be retrieved with key 0x0001. The
44+
blob to be read from the data register has size 4, and it is to be interpreted
45+
as a uint32_t value in little endian byte order. The current value
46+
(corresponding to the above outer protocol) is zero.
47+
48+
The guest kernel is not expected to use these registers (although it is
49+
certainly allowed to); the device tree bindings are documented here because
50+
this is where device tree bindings reside in general.
51+
52+
Required properties:
53+
54+
- compatible: "qemu,fw-cfg-mmio".
55+
56+
- reg: the MMIO region used by the device.
57+
* Bytes 0x0 to 0x7 cover the data register.
58+
* Bytes 0x8 to 0x9 cover the selector register.
59+
* Further registers may be appended to the region in case of future interface
60+
revisions / feature bits.
61+
62+
Example:
63+
64+
/ {
65+
#size-cells = <0x2>;
66+
#address-cells = <0x2>;
67+
68+
fw-cfg@9020000 {
69+
compatible = "qemu,fw-cfg-mmio";
70+
reg = <0x0 0x9020000 0x0 0xa>;
71+
};
72+
};

Documentation/devicetree/bindings/graph.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type of the connections, they just map their existence. Specific properties
1919
may be described by specialized bindings depending on the type of connection.
2020

2121
To see how this binding applies to video pipelines, for example, see
22-
Documentation/device-tree/bindings/media/video-interfaces.txt.
22+
Documentation/devicetree/bindings/media/video-interfaces.txt.
2323
Here the ports describe data interfaces, and the links between them are
2424
the connecting data buses. A single port with multiple connections can
2525
correspond to multiple devices being connected to the same physical bus.

Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ad Avionic Design GmbH
99
adapteva Adapteva, Inc.
1010
adi Analog Devices, Inc.
1111
aeroflexgaisler Aeroflex Gaisler AB
12-
ak Asahi Kasei Corp.
1312
allwinner Allwinner Technology Co., Ltd.
1413
altr Altera Corp.
1514
amcc Applied Micro Circuits Corporation (APM, formally AMCC)
@@ -20,6 +19,7 @@ amstaos AMS-Taos Inc.
2019
apm Applied Micro Circuits Corporation (APM)
2120
arm ARM Ltd.
2221
armadeus ARMadeus Systems SARL
22+
asahi-kasei Asahi Kasei Corp.
2323
atmel Atmel Corporation
2424
auo AU Optronics Corporation
2525
avago Avago Technologies
@@ -127,6 +127,7 @@ pixcir PIXCIR MICROELECTRONICS Co., Ltd
127127
powervr PowerVR (deprecated, use img)
128128
qca Qualcomm Atheros, Inc.
129129
qcom Qualcomm Technologies, Inc
130+
qemu QEMU, a generic and open source machine emulator and virtualizer
130131
qnap QNAP Systems, Inc.
131132
radxa Radxa
132133
raidsonic RaidSonic Technology GmbH
@@ -168,6 +169,7 @@ usi Universal Scientific Industrial Co., Ltd.
168169
v3 V3 Semiconductor
169170
variscite Variscite Ltd.
170171
via VIA Technologies, Inc.
172+
virtio Virtual I/O Device Specification, developed by the OASIS consortium
171173
voipac Voipac Technologies s.r.o.
172174
winbond Winbond Electronics corp.
173175
wlf Wolfson Microelectronics

MAINTAINERS

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ L: [email protected] (moderated for non-subscribers)
696696
W: http://blackfin.uclinux.org/
697697
S: Supported
698698
F: sound/soc/blackfin/*
699-
699+
700700
ANALOG DEVICES INC IIO DRIVERS
701701
M: Lars-Peter Clausen <[email protected]>
702702
M: Michael Hennerich <[email protected]>
@@ -4750,14 +4750,14 @@ S: Supported
47504750
F: drivers/net/ethernet/ibm/ibmveth.*
47514751

47524752
IBM Power Virtual SCSI Device Drivers
4753-
M: Nathan Fontenot <nfont@linux.vnet.ibm.com>
4753+
M: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
47544754
47554755
S: Supported
47564756
F: drivers/scsi/ibmvscsi/ibmvscsi*
47574757
F: drivers/scsi/ibmvscsi/viosrp.h
47584758

47594759
IBM Power Virtual FC Device Drivers
4760-
M: Brian King <brking@linux.vnet.ibm.com>
4760+
M: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
47614761
47624762
S: Supported
47634763
F: drivers/scsi/ibmvscsi/ibmvfc*
@@ -4946,7 +4946,6 @@ K: \b(ABS|SYN)_MT_
49464946
INTEL C600 SERIES SAS CONTROLLER DRIVER
49474947
M: Intel SCU Linux support <[email protected]>
49484948
M: Artur Paszkiewicz <[email protected]>
4949-
M: Dave Jiang <[email protected]>
49504949
49514950
T: git git://git.code.sf.net/p/intel-sas/isci
49524951
S: Supported
@@ -7024,14 +7023,12 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE
70247023
M: Grant Likely <[email protected]>
70257024
M: Rob Herring <[email protected]>
70267025
7027-
W: http://fdt.secretlab.ca
7028-
T: git git://git.secretlab.ca/git/linux-2.6.git
7026+
W: http://www.devicetree.org/
7027+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
70297028
S: Maintained
70307029
F: drivers/of/
70317030
F: include/linux/of*.h
70327031
F: scripts/dtc/
7033-
K: of_get_property
7034-
K: of_match_table
70357032

70367033
OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
70377034
M: Rob Herring <[email protected]>
@@ -7276,7 +7273,7 @@ S: Maintained
72767273
F: drivers/pci/host/*layerscape*
72777274

72787275
PCI DRIVER FOR IMX6
7279-
M: Richard Zhu <r65037@freescale.com>
7276+
M: Richard Zhu <Richard.Zhu@freescale.com>
72807277
M: Lucas Stach <[email protected]>
72817278
72827279
L: [email protected] (moderated for non-subscribers)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 19
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc5
4+
EXTRAVERSION = -rc6
55
NAME = Diseased Newt
66

77
# *DOCUMENTATION*

arch/alpha/kernel/pci.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,12 @@ pcibios_claim_one_bus(struct pci_bus *b)
285285
if (r->parent || !r->start || !r->flags)
286286
continue;
287287
if (pci_has_flag(PCI_PROBE_ONLY) ||
288-
(r->flags & IORESOURCE_PCI_FIXED))
289-
pci_claim_resource(dev, i);
288+
(r->flags & IORESOURCE_PCI_FIXED)) {
289+
if (pci_claim_resource(dev, i) == 0)
290+
continue;
291+
292+
pci_claim_bridge_resource(dev, i);
293+
}
290294
}
291295
}
292296

arch/arm/boot/dts/dra7.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,6 +1257,8 @@
12571257
tx-fifo-resize;
12581258
maximum-speed = "super-speed";
12591259
dr_mode = "otg";
1260+
snps,dis_u3_susphy_quirk;
1261+
snps,dis_u2_susphy_quirk;
12601262
};
12611263
};
12621264

@@ -1278,6 +1280,8 @@
12781280
tx-fifo-resize;
12791281
maximum-speed = "high-speed";
12801282
dr_mode = "otg";
1283+
snps,dis_u3_susphy_quirk;
1284+
snps,dis_u2_susphy_quirk;
12811285
};
12821286
};
12831287

@@ -1299,6 +1303,8 @@
12991303
tx-fifo-resize;
13001304
maximum-speed = "high-speed";
13011305
dr_mode = "otg";
1306+
snps,dis_u3_susphy_quirk;
1307+
snps,dis_u2_susphy_quirk;
13021308
};
13031309
};
13041310

arch/arm/boot/dts/imx25.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
370370
#pwm-cells = <2>;
371371
reg = <0x53fa0000 0x4000>;
372-
clocks = <&clks 106>, <&clks 36>;
372+
clocks = <&clks 106>, <&clks 52>;
373373
clock-names = "ipg", "per";
374374
interrupts = <36>;
375375
};
@@ -388,7 +388,7 @@
388388
compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
389389
#pwm-cells = <2>;
390390
reg = <0x53fa8000 0x4000>;
391-
clocks = <&clks 107>, <&clks 36>;
391+
clocks = <&clks 107>, <&clks 52>;
392392
clock-names = "ipg", "per";
393393
interrupts = <41>;
394394
};
@@ -429,7 +429,7 @@
429429
pwm4: pwm@53fc8000 {
430430
compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
431431
reg = <0x53fc8000 0x4000>;
432-
clocks = <&clks 108>, <&clks 36>;
432+
clocks = <&clks 108>, <&clks 52>;
433433
clock-names = "ipg", "per";
434434
interrupts = <42>;
435435
};
@@ -476,7 +476,7 @@
476476
compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
477477
#pwm-cells = <2>;
478478
reg = <0x53fe0000 0x4000>;
479-
clocks = <&clks 105>, <&clks 36>;
479+
clocks = <&clks 105>, <&clks 52>;
480480
clock-names = "ipg", "per";
481481
interrupts = <26>;
482482
};

0 commit comments

Comments
 (0)