Skip to content

Commit 58e868b

Browse files
gregkhgregkh
committed
Merge 3.14-rc4 into char-misc-linus
Merge this to catch up with the other patches sent upstream. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents d91f9ec + cfbf8d4 commit 58e868b

File tree

373 files changed

+3477
-2194
lines changed

Some content is hidden

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

373 files changed

+3477
-2194
lines changed

‎Documentation/ABI/testing/sysfs-tty

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ Date: Nov 2010
33
Contact: Kay Sievers <kay.sievers@vrfy.org>
44
Description:
55
Shows the list of currently configured
6-
tty devices used for the console,
7-
like 'tty1 ttyS0'.
6+
console devices, like 'tty1 ttyS0'.
87
The last entry in the file is the active
98
device connected to /dev/console.
109
The file supports poll() to detect virtual

‎Documentation/PCI/MSI-HOWTO.txt

Lines changed: 109 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,19 @@ Most of the hard work is done for the driver in the PCI layer. It simply
8282
has to request that the PCI layer set up the MSI capability for this
8383
device.
8484

85-
4.2.1 pci_enable_msi_range
85+
4.2.1 pci_enable_msi
86+
87+
int pci_enable_msi(struct pci_dev *dev)
88+
89+
A successful call allocates ONE interrupt to the device, regardless
90+
of how many MSIs the device supports. The device is switched from
91+
pin-based interrupt mode to MSI mode. The dev->irq number is changed
92+
to a new number which represents the message signaled interrupt;
93+
consequently, this function should be called before the driver calls
94+
request_irq(), because an MSI is delivered via a vector that is
95+
different from the vector of a pin-based interrupt.
96+
97+
4.2.2 pci_enable_msi_range
8698

8799
int pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec)
88100

@@ -147,6 +159,11 @@ static int foo_driver_enable_msi(struct pci_dev *pdev, int nvec)
147159
return pci_enable_msi_range(pdev, nvec, nvec);
148160
}
149161

162+
Note, unlike pci_enable_msi_exact() function, which could be also used to
163+
enable a particular number of MSI-X interrupts, pci_enable_msi_range()
164+
returns either a negative errno or 'nvec' (not negative errno or 0 - as
165+
pci_enable_msi_exact() does).
166+
150167
4.2.1.3 Single MSI mode
151168

152169
The most notorious example of the request type described above is
@@ -158,7 +175,27 @@ static int foo_driver_enable_single_msi(struct pci_dev *pdev)
158175
return pci_enable_msi_range(pdev, 1, 1);
159176
}
160177

161-
4.2.2 pci_disable_msi
178+
Note, unlike pci_enable_msi() function, which could be also used to
179+
enable the single MSI mode, pci_enable_msi_range() returns either a
180+
negative errno or 1 (not negative errno or 0 - as pci_enable_msi()
181+
does).
182+
183+
4.2.3 pci_enable_msi_exact
184+
185+
int pci_enable_msi_exact(struct pci_dev *dev, int nvec)
186+
187+
This variation on pci_enable_msi_range() call allows a device driver to
188+
request exactly 'nvec' MSIs.
189+
190+
If this function returns a negative number, it indicates an error and
191+
the driver should not attempt to request any more MSI interrupts for
192+
this device.
193+
194+
By contrast with pci_enable_msi_range() function, pci_enable_msi_exact()
195+
returns zero in case of success, which indicates MSI interrupts have been
196+
successfully allocated.
197+
198+
4.2.4 pci_disable_msi
162199

163200
void pci_disable_msi(struct pci_dev *dev)
164201

@@ -172,7 +209,7 @@ on any interrupt for which it previously called request_irq().
172209
Failure to do so results in a BUG_ON(), leaving the device with
173210
MSI enabled and thus leaking its vector.
174211

175-
4.2.3 pci_msi_vec_count
212+
4.2.4 pci_msi_vec_count
176213

177214
int pci_msi_vec_count(struct pci_dev *dev)
178215

@@ -257,8 +294,8 @@ possible, likely up to the limit returned by pci_msix_vec_count() function:
257294

258295
static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)
259296
{
260-
return pci_enable_msi_range(adapter->pdev, adapter->msix_entries,
261-
1, nvec);
297+
return pci_enable_msix_range(adapter->pdev, adapter->msix_entries,
298+
1, nvec);
262299
}
263300

264301
Note the value of 'minvec' parameter is 1. As 'minvec' is inclusive,
@@ -269,8 +306,8 @@ In this case the function could look like this:
269306

270307
static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)
271308
{
272-
return pci_enable_msi_range(adapter->pdev, adapter->msix_entries,
273-
FOO_DRIVER_MINIMUM_NVEC, nvec);
309+
return pci_enable_msix_range(adapter->pdev, adapter->msix_entries,
310+
FOO_DRIVER_MINIMUM_NVEC, nvec);
274311
}
275312

276313
4.3.1.2 Exact number of MSI-X interrupts
@@ -282,10 +319,15 @@ parameters:
282319

283320
static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)
284321
{
285-
return pci_enable_msi_range(adapter->pdev, adapter->msix_entries,
286-
nvec, nvec);
322+
return pci_enable_msix_range(adapter->pdev, adapter->msix_entries,
323+
nvec, nvec);
287324
}
288325

326+
Note, unlike pci_enable_msix_exact() function, which could be also used to
327+
enable a particular number of MSI-X interrupts, pci_enable_msix_range()
328+
returns either a negative errno or 'nvec' (not negative errno or 0 - as
329+
pci_enable_msix_exact() does).
330+
289331
4.3.1.3 Specific requirements to the number of MSI-X interrupts
290332

291333
As noted above, there could be devices that can not operate with just any
@@ -332,7 +374,64 @@ Note how pci_enable_msix_range() return value is analized for a fallback -
332374
any error code other than -ENOSPC indicates a fatal error and should not
333375
be retried.
334376

335-
4.3.2 pci_disable_msix
377+
4.3.2 pci_enable_msix_exact
378+
379+
int pci_enable_msix_exact(struct pci_dev *dev,
380+
struct msix_entry *entries, int nvec)
381+
382+
This variation on pci_enable_msix_range() call allows a device driver to
383+
request exactly 'nvec' MSI-Xs.
384+
385+
If this function returns a negative number, it indicates an error and
386+
the driver should not attempt to allocate any more MSI-X interrupts for
387+
this device.
388+
389+
By contrast with pci_enable_msix_range() function, pci_enable_msix_exact()
390+
returns zero in case of success, which indicates MSI-X interrupts have been
391+
successfully allocated.
392+
393+
Another version of a routine that enables MSI-X mode for a device with
394+
specific requirements described in chapter 4.3.1.3 might look like this:
395+
396+
/*
397+
* Assume 'minvec' and 'maxvec' are non-zero
398+
*/
399+
static int foo_driver_enable_msix(struct foo_adapter *adapter,
400+
int minvec, int maxvec)
401+
{
402+
int rc;
403+
404+
minvec = roundup_pow_of_two(minvec);
405+
maxvec = rounddown_pow_of_two(maxvec);
406+
407+
if (minvec > maxvec)
408+
return -ERANGE;
409+
410+
retry:
411+
rc = pci_enable_msix_exact(adapter->pdev,
412+
adapter->msix_entries, maxvec);
413+
414+
/*
415+
* -ENOSPC is the only error code allowed to be analyzed
416+
*/
417+
if (rc == -ENOSPC) {
418+
if (maxvec == 1)
419+
return -ENOSPC;
420+
421+
maxvec /= 2;
422+
423+
if (minvec > maxvec)
424+
return -ENOSPC;
425+
426+
goto retry;
427+
} else if (rc < 0) {
428+
return rc;
429+
}
430+
431+
return maxvec;
432+
}
433+
434+
4.3.3 pci_disable_msix
336435

337436
void pci_disable_msix(struct pci_dev *dev)
338437

‎Documentation/devicetree/bindings/arm/omap/omap.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Boards:
9191
compatible = "ti,omap3-beagle", "ti,omap3"
9292

9393
- OMAP3 Tobi with Overo : Commercial expansion board with daughter board
94-
compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"
94+
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"
9595

9696
- OMAP4 SDP : Software Development Board
9797
compatible = "ti,omap4-sdp", "ti,omap4430"

‎Documentation/devicetree/bindings/net/sti-dwmac.txt

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
STMicroelectronics SoC DWMAC glue layer controller
2+
3+
The device node has following properties.
4+
5+
Required properties:
6+
- compatible : Can be "st,stih415-dwmac", "st,stih416-dwmac" or
7+
"st,stid127-dwmac".
8+
- reg : Offset of the glue configuration register map in system
9+
configuration regmap pointed by st,syscon property and size.
10+
11+
- reg-names : Should be "sti-ethconf".
12+
13+
- st,syscon : Should be phandle to system configuration node which
14+
encompases this glue registers.
15+
16+
- st,tx-retime-src: On STi Parts for Giga bit speeds, 125Mhz clocks can be
17+
wired up in from different sources. One via TXCLK pin and other via CLK_125
18+
pin. This wiring is totally board dependent. However the retiming glue
19+
logic should be configured accordingly. Possible values for this property
20+
21+
"txclk" - if 125Mhz clock is wired up via txclk line.
22+
"clk_125" - if 125Mhz clock is wired up via clk_125 line.
23+
24+
This property is only valid for Giga bit setup( GMII, RGMII), and it is
25+
un-used for non-giga bit (MII and RMII) setups. Also note that internal
26+
clockgen can not generate stable 125Mhz clock.
27+
28+
- st,ext-phyclk: This boolean property indicates who is generating the clock
29+
for tx and rx. This property is only valid for RMII case where the clock can
30+
be generated from the MAC or PHY.
31+
32+
- clock-names: should be "sti-ethclk".
33+
- clocks: Should point to ethernet clockgen which can generate phyclk.
34+
35+
36+
Example:
37+
38+
ethernet0: dwmac@fe810000 {
39+
device_type = "network";
40+
compatible = "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710";
41+
reg = <0xfe810000 0x8000>, <0x8bc 0x4>;
42+
reg-names = "stmmaceth", "sti-ethconf";
43+
interrupts = <0 133 0>, <0 134 0>, <0 135 0>;
44+
interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
45+
phy-mode = "mii";
46+
47+
st,syscon = <&syscfg_rear>;
48+
49+
snps,pbl = <32>;
50+
snps,mixed-burst;
51+
52+
resets = <&softreset STIH416_ETH0_SOFTRESET>;
53+
reset-names = "stmmaceth";
54+
pinctrl-0 = <&pinctrl_mii0>;
55+
pinctrl-names = "default";
56+
clocks = <&CLK_S_GMAC0_PHY>;
57+
clock-names = "stmmaceth";
58+
};

‎Documentation/networking/3c505.txt

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

‎MAINTAINERS

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1860,6 +1860,7 @@ F: drivers/net/ethernet/broadcom/bnx2x/
18601860

18611861
BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
18621862
M: Christian Daudt <bcm@fixthebug.org>
1863+
M: Matt Porter <mporter@linaro.org>
18631864
L: bcm-kernel-feedback-list@broadcom.com
18641865
T: git git://git.github.com/broadcom/bcm11351
18651866
S: Maintained
@@ -2408,8 +2409,10 @@ F: tools/power/cpupower/
24082409

24092410
CPUSETS
24102411
M: Li Zefan <lizefan@huawei.com>
2412+
L: cgroups@vger.kernel.org
24112413
W: http://www.bullopensource.org/cpuset/
24122414
W: http://oss.sgi.com/projects/cpusets/
2415+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
24132416
S: Maintained
24142417
F: Documentation/cgroups/cpusets.txt
24152418
F: include/linux/cpuset.h
@@ -3324,6 +3327,17 @@ S: Maintained
33243327
F: include/linux/netfilter_bridge/
33253328
F: net/bridge/
33263329

3330+
ETHERNET PHY LIBRARY
3331+
M: Florian Fainelli <f.fainelli@gmail.com>
3332+
L: netdev@vger.kernel.org
3333+
S: Maintained
3334+
F: include/linux/phy.h
3335+
F: include/linux/phy_fixed.h
3336+
F: drivers/net/phy/
3337+
F: Documentation/networking/phy.txt
3338+
F: drivers/of/of_mdio.c
3339+
F: drivers/of/of_net.c
3340+
33273341
EXT2 FILE SYSTEM
33283342
M: Jan Kara <jack@suse.cz>
33293343
L: linux-ext4@vger.kernel.org
@@ -9715,7 +9729,6 @@ F: drivers/xen/*swiotlb*
97159729
XFS FILESYSTEM
97169730
P: Silicon Graphics Inc
97179731
M: Dave Chinner <david@fromorbit.com>
9718-
M: Ben Myers <bpm@sgi.com>
97199732
M: xfs@oss.sgi.com
97209733
L: xfs@oss.sgi.com
97219734
W: http://oss.sgi.com/projects/xfs

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 14
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc4
55
NAME = Shuffling Zombie Juror
66

77
# *DOCUMENTATION*

‎arch/arm/boot/dts/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
209209
omap3-n900.dtb \
210210
omap3-n9.dtb \
211211
omap3-n950.dtb \
212-
omap3-tobi.dtb \
212+
omap3-overo-tobi.dtb \
213+
omap3-overo-storm-tobi.dtb \
213214
omap3-gta04.dtb \
214215
omap3-igep0020.dtb \
215216
omap3-igep0030.dtb \

‎arch/arm/boot/dts/am335x-evmsk.dts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
ti,model = "AM335x-EVMSK";
122122
ti,audio-codec = <&tlv320aic3106>;
123123
ti,mcasp-controller = <&mcasp1>;
124-
ti,codec-clock-rate = <24576000>;
124+
ti,codec-clock-rate = <24000000>;
125125
ti,audio-routing =
126126
"Headphone Jack", "HPLOUT",
127127
"Headphone Jack", "HPROUT";
@@ -256,6 +256,12 @@
256256
>;
257257
};
258258

259+
mmc1_pins: pinmux_mmc1_pins {
260+
pinctrl-single,pins = <
261+
0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
262+
>;
263+
};
264+
259265
mcasp1_pins: mcasp1_pins {
260266
pinctrl-single,pins = <
261267
0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
@@ -456,6 +462,9 @@
456462
status = "okay";
457463
vmmc-supply = <&vmmc_reg>;
458464
bus-width = <4>;
465+
pinctrl-names = "default";
466+
pinctrl-0 = <&mmc1_pins>;
467+
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
459468
};
460469

461470
&sham {

0 commit comments

Comments
 (0)