Skip to content

Commit eeea8b4

Browse files
committed
Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v4.9 Apart from the cleanups done by Morimoto-san this has very much been a driver focused release with very little generic change: - A big factoring out of the simple-card code to allow it to be shared more with the rcar generic card from Kuninori Morimoto. - Removal of some operations duplicated on the CODEC level, again by Kuninori Morimoto. - Lots more machine support for x86 systems. - New drivers for Nuvoton NAU88C10, Realtek RT5660 and RT5663.
2 parents 3383c5c + 513e43e commit eeea8b4

1,364 files changed

Lines changed: 24708 additions & 8897 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ Kay Sievers <kay.sievers@vrfy.org>
8888
Kenneth W Chen <kenneth.w.chen@intel.com>
8989
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
9090
Koushik <raghavendra.koushik@neterion.com>
91+
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
9192
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
9293
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
9394
Leonid I Ananiev <leonid.i.ananiev@intel.com>
@@ -158,6 +159,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
158159
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
159160
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
160161
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
162+
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
163+
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
161164
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
162165
Yusuke Goda <goda.yusuke@renesas.com>
163166
Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/ABI/stable/sysfs-devices

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Note: This documents additional properties of any device beyond what
22
# is documented in Documentation/sysfs-rules.txt
33

4-
What: /sys/devices/*/of_path
4+
What: /sys/devices/*/of_node
55
Date: February 2015
66
Contact: Device Tree mailing list <devicetree@vger.kernel.org>
77
Description:

Documentation/PCI/MSI-HOWTO.txt

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,11 @@ has a requirements for a minimum number of vectors the driver can pass a
9494
min_vecs argument set to this limit, and the PCI core will return -ENOSPC
9595
if it can't meet the minimum number of vectors.
9696

97-
The flags argument should normally be set to 0, but can be used to pass the
98-
PCI_IRQ_NOMSI and PCI_IRQ_NOMSIX flag in case a device claims to support
99-
MSI or MSI-X, but the support is broken, or to pass PCI_IRQ_NOLEGACY in
100-
case the device does not support legacy interrupt lines.
101-
102-
By default this function will spread the interrupts around the available
103-
CPUs, but this feature can be disabled by passing the PCI_IRQ_NOAFFINITY
104-
flag.
97+
The flags argument is used to specify which type of interrupt can be used
98+
by the device and the driver (PCI_IRQ_LEGACY, PCI_IRQ_MSI, PCI_IRQ_MSIX).
99+
A convenient short-hand (PCI_IRQ_ALL_TYPES) is also available to ask for
100+
any possible kind of interrupt. If the PCI_IRQ_AFFINITY flag is set,
101+
pci_alloc_irq_vectors() will spread the interrupts around the available CPUs.
105102

106103
To get the Linux IRQ numbers passed to request_irq() and free_irq() and the
107104
vectors, use the following function:
@@ -131,7 +128,7 @@ larger than the number supported by the device it will automatically be
131128
capped to the supported limit, so there is no need to query the number of
132129
vectors supported beforehand:
133130

134-
nvec = pci_alloc_irq_vectors(pdev, 1, nvec, 0);
131+
nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_ALL_TYPES)
135132
if (nvec < 0)
136133
goto out_err;
137134

@@ -140,23 +137,22 @@ interrupts it can request a particular number of interrupts by passing that
140137
number to pci_alloc_irq_vectors() function as both 'min_vecs' and
141138
'max_vecs' parameters:
142139

143-
ret = pci_alloc_irq_vectors(pdev, nvec, nvec, 0);
140+
ret = pci_alloc_irq_vectors(pdev, nvec, nvec, PCI_IRQ_ALL_TYPES);
144141
if (ret < 0)
145142
goto out_err;
146143

147144
The most notorious example of the request type described above is enabling
148145
the single MSI mode for a device. It could be done by passing two 1s as
149146
'min_vecs' and 'max_vecs':
150147

151-
ret = pci_alloc_irq_vectors(pdev, 1, 1, 0);
148+
ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
152149
if (ret < 0)
153150
goto out_err;
154151

155152
Some devices might not support using legacy line interrupts, in which case
156-
the PCI_IRQ_NOLEGACY flag can be used to fail the request if the platform
157-
can't provide MSI or MSI-X interrupts:
153+
the driver can specify that only MSI or MSI-X is acceptable:
158154

159-
nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_NOLEGACY);
155+
nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_MSI | PCI_IRQ_MSIX);
160156
if (nvec < 0)
161157
goto out_err;
162158

Documentation/PCI/pci.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ initialization with a pointer to a structure describing the driver
124124

125125
The ID table is an array of struct pci_device_id entries ending with an
126126
all-zero entry. Definitions with static const are generally preferred.
127-
Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.
128127

129128
Each entry consists of:
130129

Documentation/arm/CCN.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ and config2 fields of the perf_event_attr structure. The "events"
1818
directory provides configuration templates for all documented
1919
events, that can be used with perf tool. For example "xp_valid_flit"
2020
is an equivalent of "type=0x8,event=0x4". Other parameters must be
21-
explicitly specified. For events originating from device, "node"
22-
defines its index. All crosspoint events require "xp" (index),
23-
"port" (device port number) and "vc" (virtual channel ID) and
24-
"dir" (direction). Watchpoints (special "event" value 0xfe) also
25-
require comparator values ("cmp_l" and "cmp_h") and "mask", being
26-
index of the comparator mask.
21+
explicitly specified.
2722

23+
For events originating from device, "node" defines its index.
24+
25+
Crosspoint PMU events require "xp" (index), "bus" (bus number)
26+
and "vc" (virtual channel ID).
27+
28+
Crosspoint watchpoint-based events (special "event" value 0xfe)
29+
require "xp" and "vc" as as above plus "port" (device port index),
30+
"dir" (transmit/receive direction), comparator values ("cmp_l"
31+
and "cmp_h") and "mask", being index of the comparator mask.
2832
Masks are defined separately from the event description
2933
(due to limited number of the config values) in the "cmp_mask"
3034
directory, with first 8 configurable by user and additional

Documentation/arm64/silicon-errata.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ stable kernels.
5353
| ARM | Cortex-A57 | #832075 | ARM64_ERRATUM_832075 |
5454
| ARM | Cortex-A57 | #852523 | N/A |
5555
| ARM | Cortex-A57 | #834220 | ARM64_ERRATUM_834220 |
56+
| ARM | Cortex-A72 | #853709 | N/A |
5657
| ARM | MMU-500 | #841119,#826419 | N/A |
5758
| | | | |
5859
| Cavium | ThunderX ITS | #22375, #24313 | CAVIUM_ERRATUM_22375 |

Documentation/cpu-freq/cpufreq-stats.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Config Main Menu
103103
Power management options (ACPI, APM) --->
104104
CPU Frequency scaling --->
105105
[*] CPU Frequency scaling
106-
<*> CPU frequency translation statistics
106+
[*] CPU frequency translation statistics
107107
[*] CPU frequency translation statistics details
108108

109109

Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@ Required properties:
1616
- vref-supply: The regulator supply ADC reference voltage.
1717
- #io-channel-cells: Should be 1, see ../iio-bindings.txt
1818

19+
Optional properties:
20+
- resets: Must contain an entry for each entry in reset-names if need support
21+
this option. See ../reset/reset.txt for details.
22+
- reset-names: Must include the name "saradc-apb".
23+
1924
Example:
2025
saradc: saradc@2006c000 {
2126
compatible = "rockchip,saradc";
2227
reg = <0x2006c000 0x100>;
2328
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
2429
clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
2530
clock-names = "saradc", "apb_pclk";
31+
resets = <&cru SRST_SARADC>;
32+
reset-names = "saradc-apb";
2633
#io-channel-cells = <1>;
2734
vref-supply = <&vcc18>;
2835
};

Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Required properties:
1313
- touchscreen-size-y : See touchscreen.txt
1414

1515
Optional properties:
16+
- firmware-name : File basename (string) for board specific firmware
1617
- touchscreen-inverted-x : See touchscreen.txt
1718
- touchscreen-inverted-y : See touchscreen.txt
1819
- touchscreen-swapped-x-y : See touchscreen.txt

Documentation/devicetree/bindings/mmc/sdhci-st.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Required properties:
1010
subsystem (mmcss) inside the FlashSS (available in STiH407 SoC
1111
family).
1212

13-
- clock-names: Should be "mmc".
13+
- clock-names: Should be "mmc" and "icn". (NB: The latter is not compulsory)
1414
See: Documentation/devicetree/bindings/resource-names.txt
1515
- clocks: Phandle to the clock.
1616
See: Documentation/devicetree/bindings/clock/clock-bindings.txt

0 commit comments

Comments
 (0)