Skip to content

Commit 356f402

Browse files
tiwaitiwai
committed
Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13 The fixes here are all driver specific ones, none of which particularly stand out but all of which are useful to users of those drivers.
2 parents 3a6c5d8 + 96b7fe0 commit 356f402

File tree

541 files changed

+5150
-2724
lines changed

Some content is hidden

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

541 files changed

+5150
-2724
lines changed

‎CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,11 @@ S: Stanford University
655655
S: Stanford, California 94305
656656
S: USA
657657

658+
N: Carlos Chinea
659+
E: carlos.chinea@nokia.com
660+
E: cch.devel@gmail.com
661+
D: Author of HSI Subsystem
662+
658663
N: Randolph Chung
659664
E: tausq@debian.org
660665
D: Linux/PA-RISC hacker

‎Documentation/DocBook/media/v4l/vidioc-expbuf.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ range from zero to the maximal number of valid planes for the currently active
7373
format. For the single-planar API, applications must set <structfield> plane
7474
</structfield> to zero. Additional flags may be posted in the <structfield>
7575
flags </structfield> field. Refer to a manual for open() for details.
76-
Currently only O_CLOEXEC is supported. All other fields must be set to zero.
76+
Currently only O_CLOEXEC, O_RDONLY, O_WRONLY, and O_RDWR are supported. All
77+
other fields must be set to zero.
7778
In the case of multi-planar API, every plane is exported separately using
7879
multiple <constant> VIDIOC_EXPBUF </constant> calls. </para>
7980

@@ -170,8 +171,9 @@ multi-planar API. Otherwise this value must be set to zero. </entry>
170171
<entry>__u32</entry>
171172
<entry><structfield>flags</structfield></entry>
172173
<entry>Flags for the newly created file, currently only <constant>
173-
O_CLOEXEC </constant> is supported, refer to the manual of open() for more
174-
details.</entry>
174+
O_CLOEXEC </constant>, <constant>O_RDONLY</constant>, <constant>O_WRONLY
175+
</constant>, and <constant>O_RDWR</constant> are supported, refer to the manual
176+
of open() for more details.</entry>
175177
</row>
176178
<row>
177179
<entry>__s32</entry>

‎Documentation/assoc_array.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ This points to a number of methods, all of which need to be provided:
164164

165165
(4) Diff the index keys of two objects.
166166

167-
int (*diff_objects)(const void *a, const void *b);
167+
int (*diff_objects)(const void *object, const void *index_key);
168168

169-
Return the bit position at which the index keys of two objects differ or
170-
-1 if they are the same.
169+
Return the bit position at which the index key of the specified object
170+
differs from the given index key or -1 if they are the same.
171171

172172

173173
(5) Free an object.

‎Documentation/device-mapper/cache.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,12 @@ E.g.
266266
Invalidation is removing an entry from the cache without writing it
267267
back. Cache blocks can be invalidated via the invalidate_cblocks
268268
message, which takes an arbitrary number of cblock ranges. Each cblock
269-
must be expressed as a decimal value, in the future a variant message
270-
that takes cblock ranges expressed in hexidecimal may be needed to
271-
better support efficient invalidation of larger caches. The cache must
272-
be in passthrough mode when invalidate_cblocks is used.
269+
range's end value is "one past the end", meaning 5-10 expresses a range
270+
of values from 5 to 9. Each cblock must be expressed as a decimal
271+
value, in the future a variant message that takes cblock ranges
272+
expressed in hexidecimal may be needed to better support efficient
273+
invalidation of larger caches. The cache must be in passthrough mode
274+
when invalidate_cblocks is used.
273275

274276
invalidate_cblocks [<cblock>|<cblock begin>-<cblock end>]*
275277

‎Documentation/devicetree/bindings/net/davinci_emac.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This file provides information, what the device node
44
for the davinci_emac interface contains.
55

66
Required properties:
7-
- compatible: "ti,davinci-dm6467-emac";
7+
- compatible: "ti,davinci-dm6467-emac" or "ti,am3517-emac"
88
- reg: Offset and length of the register set for the device
99
- ti,davinci-ctrl-reg-offset: offset to control register
1010
- ti,davinci-ctrl-mod-reg-offset: offset to control module register

‎Documentation/devicetree/bindings/net/smsc-lan91c111.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ Required properties:
88
Optional properties:
99
- phy-device : phandle to Ethernet phy
1010
- local-mac-address : Ethernet mac address to use
11+
- reg-io-width : Mask of sizes (in bytes) of the IO accesses that
12+
are supported on the device. Valid value for SMSC LAN91c111 are
13+
1, 2 or 4. If it's omitted or invalid, the size would be 2 meaning
14+
16-bit access only.

‎Documentation/mic/mpssd/mpssd.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ static struct mic_device_desc *get_device_desc(struct mic_info *mic, int type)
313313
int i;
314314
void *dp = get_dp(mic, type);
315315

316-
for (i = mic_aligned_size(struct mic_bootparam); i < PAGE_SIZE;
316+
for (i = sizeof(struct mic_bootparam); i < PAGE_SIZE;
317317
i += mic_total_desc_size(d)) {
318318
d = dp + i;
319319

@@ -445,8 +445,8 @@ init_vr(struct mic_info *mic, int fd, int type,
445445
__func__, mic->name, vr0->va, vr0->info, vr_size,
446446
vring_size(MIC_VRING_ENTRIES, MIC_VIRTIO_RING_ALIGN));
447447
mpsslog("magic 0x%x expected 0x%x\n",
448-
vr0->info->magic, MIC_MAGIC + type);
449-
assert(vr0->info->magic == MIC_MAGIC + type);
448+
le32toh(vr0->info->magic), MIC_MAGIC + type);
449+
assert(le32toh(vr0->info->magic) == MIC_MAGIC + type);
450450
if (vr1) {
451451
vr1->va = (struct mic_vring *)
452452
&va[MIC_DEVICE_PAGE_END + vr_size];
@@ -458,8 +458,8 @@ init_vr(struct mic_info *mic, int fd, int type,
458458
__func__, mic->name, vr1->va, vr1->info, vr_size,
459459
vring_size(MIC_VRING_ENTRIES, MIC_VIRTIO_RING_ALIGN));
460460
mpsslog("magic 0x%x expected 0x%x\n",
461-
vr1->info->magic, MIC_MAGIC + type + 1);
462-
assert(vr1->info->magic == MIC_MAGIC + type + 1);
461+
le32toh(vr1->info->magic), MIC_MAGIC + type + 1);
462+
assert(le32toh(vr1->info->magic) == MIC_MAGIC + type + 1);
463463
}
464464
done:
465465
return va;
@@ -520,7 +520,7 @@ static void *
520520
virtio_net(void *arg)
521521
{
522522
static __u8 vnet_hdr[2][sizeof(struct virtio_net_hdr)];
523-
static __u8 vnet_buf[2][MAX_NET_PKT_SIZE] __aligned(64);
523+
static __u8 vnet_buf[2][MAX_NET_PKT_SIZE] __attribute__ ((aligned(64)));
524524
struct iovec vnet_iov[2][2] = {
525525
{ { .iov_base = vnet_hdr[0], .iov_len = sizeof(vnet_hdr[0]) },
526526
{ .iov_base = vnet_buf[0], .iov_len = sizeof(vnet_buf[0]) } },
@@ -1412,6 +1412,12 @@ mic_config(void *arg)
14121412
}
14131413

14141414
do {
1415+
ret = lseek(fd, 0, SEEK_SET);
1416+
if (ret < 0) {
1417+
mpsslog("%s: Failed to seek to file start '%s': %s\n",
1418+
mic->name, pathname, strerror(errno));
1419+
goto close_error1;
1420+
}
14151421
ret = read(fd, value, sizeof(value));
14161422
if (ret < 0) {
14171423
mpsslog("%s: Failed to read sysfs entry '%s': %s\n",

‎Documentation/networking/packet_mmap.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,16 @@ Transmission process is similar to capture as shown below.
123123
[shutdown] close() --------> destruction of the transmission socket and
124124
deallocation of all associated resources.
125125

126+
Socket creation and destruction is also straight forward, and is done
127+
the same way as in capturing described in the previous paragraph:
128+
129+
int fd = socket(PF_PACKET, mode, 0);
130+
131+
The protocol can optionally be 0 in case we only want to transmit
132+
via this socket, which avoids an expensive call to packet_rcv().
133+
In this case, you also need to bind(2) the TX_RING with sll_protocol = 0
134+
set. Otherwise, htons(ETH_P_ALL) or any other protocol, for example.
135+
126136
Binding the socket to your network interface is mandatory (with zero copy) to
127137
know the header size of frames used in the circular buffer.
128138

‎MAINTAINERS

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -893,20 +893,15 @@ F: arch/arm/include/asm/hardware/dec21285.h
893893
F: arch/arm/mach-footbridge/
894894

895895
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
896+
M: Shawn Guo <shawn.guo@linaro.org>
896897
M: Sascha Hauer <kernel@pengutronix.de>
897898
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
898899
S: Maintained
899-
T: git git://git.pengutronix.de/git/imx/linux-2.6.git
900+
T: git git://git.linaro.org/people/shawnguo/linux-2.6.git
900901
F: arch/arm/mach-imx/
902+
F: arch/arm/boot/dts/imx*
901903
F: arch/arm/configs/imx*_defconfig
902904

903-
ARM/FREESCALE IMX6
904-
M: Shawn Guo <shawn.guo@linaro.org>
905-
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
906-
S: Maintained
907-
T: git git://git.linaro.org/people/shawnguo/linux-2.6.git
908-
F: arch/arm/mach-imx/*imx6*
909-
910905
ARM/FREESCALE MXS ARM ARCHITECTURE
911906
M: Shawn Guo <shawn.guo@linaro.org>
912907
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2138,7 +2133,8 @@ S: Maintained
21382133
F: Documentation/zh_CN/
21392134

21402135
CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
2141-
M: Alexander Shishkin <alexander.shishkin@linux.intel.com>
2136+
M: Peter Chen <Peter.Chen@freescale.com>
2137+
T: git://github.com/hzpeterchen/linux-usb.git
21422138
L: linux-usb@vger.kernel.org
21432139
S: Maintained
21442140
F: drivers/usb/chipidea/
@@ -4044,6 +4040,14 @@ W: http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
40444040
S: Maintained
40454041
F: fs/hpfs/
40464042

4043+
HSI SUBSYSTEM
4044+
M: Sebastian Reichel <sre@debian.org>
4045+
S: Maintained
4046+
F: Documentation/ABI/testing/sysfs-bus-hsi
4047+
F: drivers/hsi/
4048+
F: include/linux/hsi/
4049+
F: include/uapi/linux/hsi/
4050+
40474051
HSO 3G MODEM DRIVER
40484052
M: Jan Dumon <j.dumon@option.com>
40494053
W: http://www.pharscape.org
@@ -4462,10 +4466,8 @@ M: Bruce Allan <bruce.w.allan@intel.com>
44624466
M: Carolyn Wyborny <carolyn.wyborny@intel.com>
44634467
M: Don Skidmore <donald.c.skidmore@intel.com>
44644468
M: Greg Rose <gregory.v.rose@intel.com>
4465-
M: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
44664469
M: Alex Duyck <alexander.h.duyck@intel.com>
44674470
M: John Ronciak <john.ronciak@intel.com>
4468-
M: Tushar Dave <tushar.n.dave@intel.com>
44694471
L: e1000-devel@lists.sourceforge.net
44704472
W: http://www.intel.com/support/feedback.htm
44714473
W: http://e1000.sourceforge.net/
@@ -6461,19 +6463,52 @@ F: drivers/pci/
64616463
F: include/linux/pci*
64626464
F: arch/x86/pci/
64636465

6466+
PCI DRIVER FOR IMX6
6467+
M: Richard Zhu <r65037@freescale.com>
6468+
M: Shawn Guo <shawn.guo@linaro.org>
6469+
L: linux-pci@vger.kernel.org
6470+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6471+
S: Maintained
6472+
F: drivers/pci/host/*imx6*
6473+
6474+
PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
6475+
M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
6476+
M: Jason Cooper <jason@lakedaemon.net>
6477+
L: linux-pci@vger.kernel.org
6478+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6479+
S: Maintained
6480+
F: drivers/pci/host/*mvebu*
6481+
64646482
PCI DRIVER FOR NVIDIA TEGRA
64656483
M: Thierry Reding <thierry.reding@gmail.com>
64666484
L: linux-tegra@vger.kernel.org
6485+
L: linux-pci@vger.kernel.org
64676486
S: Supported
64686487
F: Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
64696488
F: drivers/pci/host/pci-tegra.c
64706489

6490+
PCI DRIVER FOR RENESAS R-CAR
6491+
M: Simon Horman <horms@verge.net.au>
6492+
L: linux-pci@vger.kernel.org
6493+
L: linux-sh@vger.kernel.org
6494+
S: Maintained
6495+
F: drivers/pci/host/*rcar*
6496+
64716497
PCI DRIVER FOR SAMSUNG EXYNOS
64726498
M: Jingoo Han <jg1.han@samsung.com>
64736499
L: linux-pci@vger.kernel.org
6500+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6501+
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
64746502
S: Maintained
64756503
F: drivers/pci/host/pci-exynos.c
64766504

6505+
PCI DRIVER FOR SYNOPSIS DESIGNWARE
6506+
M: Mohit Kumar <mohit.kumar@st.com>
6507+
M: Jingoo Han <jg1.han@samsung.com>
6508+
L: linux-pci@vger.kernel.org
6509+
S: Maintained
6510+
F: drivers/pci/host/*designware*
6511+
64776512
PCMCIA SUBSYSTEM
64786513
P: Linux PCMCIA Team
64796514
L: linux-pcmcia@lists.infradead.org

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 13
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc4
55
NAME = One Giant Leap for Frogkind
66

77
# *DOCUMENTATION*

‎arch/arc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
config ARC
1010
def_bool y
11+
select BUILDTIME_EXTABLE_SORT
1112
select CLONE_BACKWARDS
1213
# ARC Busybox based initramfs absolutely relies on DEVTMPFS for /dev
1314
select DEVTMPFS if !INITRAMFS_SOURCE=""

‎arch/arc/include/uapi/asm/unistd.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
/******** no-legacy-syscalls-ABI *******/
1010

11+
#ifndef _UAPI_ASM_ARC_UNISTD_H
12+
#define _UAPI_ASM_ARC_UNISTD_H
13+
1114
#define __ARCH_WANT_SYS_EXECVE
1215
#define __ARCH_WANT_SYS_CLONE
1316
#define __ARCH_WANT_SYS_VFORK
@@ -32,3 +35,5 @@ __SYSCALL(__NR_arc_gettls, sys_arc_gettls)
3235
/* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */
3336
#define __NR_sysfs (__NR_arch_specific_syscall + 3)
3437
__SYSCALL(__NR_sysfs, sys_sysfs)
38+
39+
#endif

‎arch/arc/kernel/perf_event.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ static int arc_pmu_cache_event(u64 config)
7979
cache_result = (config >> 16) & 0xff;
8080
if (cache_type >= PERF_COUNT_HW_CACHE_MAX)
8181
return -EINVAL;
82-
if (cache_type >= PERF_COUNT_HW_CACHE_OP_MAX)
82+
if (cache_op >= PERF_COUNT_HW_CACHE_OP_MAX)
8383
return -EINVAL;
84-
if (cache_type >= PERF_COUNT_HW_CACHE_RESULT_MAX)
84+
if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX)
8585
return -EINVAL;
8686

8787
ret = arc_pmu_cache_map[cache_type][cache_op][cache_result];

‎arch/arm/boot/dts/am3517-evm.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*/
88
/dts-v1/;
99

10-
#include "omap34xx.dtsi"
10+
#include "am3517.dtsi"
1111

1212
/ {
13-
model = "TI AM3517 EVM (AM3517/05)";
14-
compatible = "ti,am3517-evm", "ti,omap3";
13+
model = "TI AM3517 EVM (AM3517/05 TMDSEVM3517)";
14+
compatible = "ti,am3517-evm", "ti,am3517", "ti,omap3";
1515

1616
memory {
1717
device_type = "memory";

‎arch/arm/boot/dts/am3517.dtsi

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
* Device Tree Source for am3517 SoC
3+
*
4+
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
5+
*
6+
* This file is licensed under the terms of the GNU General Public License
7+
* version 2. This program is licensed "as is" without any warranty of any
8+
* kind, whether express or implied.
9+
*/
10+
11+
#include "omap3.dtsi"
12+
13+
/ {
14+
aliases {
15+
serial3 = &uart4;
16+
};
17+
18+
ocp {
19+
am35x_otg_hs: am35x_otg_hs@5c040000 {
20+
compatible = "ti,omap3-musb";
21+
ti,hwmods = "am35x_otg_hs";
22+
status = "disabled";
23+
reg = <0x5c040000 0x1000>;
24+
interrupts = <71>;
25+
interrupt-names = "mc";
26+
};
27+
28+
davinci_emac: ethernet@0x5c000000 {
29+
compatible = "ti,am3517-emac";
30+
ti,hwmods = "davinci_emac";
31+
status = "disabled";
32+
reg = <0x5c000000 0x30000>;
33+
interrupts = <67 68 69 70>;
34+
ti,davinci-ctrl-reg-offset = <0x10000>;
35+
ti,davinci-ctrl-mod-reg-offset = <0>;
36+
ti,davinci-ctrl-ram-offset = <0x20000>;
37+
ti,davinci-ctrl-ram-size = <0x2000>;
38+
ti,davinci-rmii-en = /bits/ 8 <1>;
39+
local-mac-address = [ 00 00 00 00 00 00 ];
40+
};
41+
42+
davinci_mdio: ethernet@0x5c030000 {
43+
compatible = "ti,davinci_mdio";
44+
ti,hwmods = "davinci_mdio";
45+
status = "disabled";
46+
reg = <0x5c030000 0x1000>;
47+
bus_freq = <1000000>;
48+
#address-cells = <1>;
49+
#size-cells = <0>;
50+
};
51+
52+
uart4: serial@4809e000 {
53+
compatible = "ti,omap3-uart";
54+
ti,hwmods = "uart4";
55+
status = "disabled";
56+
reg = <0x4809e000 0x400>;
57+
interrupts = <84>;
58+
dmas = <&sdma 55 &sdma 54>;
59+
dma-names = "tx", "rx";
60+
clock-frequency = <48000000>;
61+
};
62+
};
63+
};

‎arch/arm/boot/dts/omap3-n900.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/dts-v1/;
1111

12-
#include "omap34xx.dtsi"
12+
#include "omap34xx-hs.dtsi"
1313

1414
/ {
1515
model = "Nokia N900";

0 commit comments

Comments
 (0)