Skip to content

Commit a8729ef

Browse files
committed
Merge tag 'asoc-v5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.15 Quite a quiet release this time, mostly a combination of cleanups and a good set of new drivers. - Lots of cleanups and improvements to the Intel drivers, including some new systems support. - New support for AMD Vangoh, CUI CMM-4030D-261, Mediatek Mt8195, Renesas RZ/G2L Mediatek Mt8195, RealTek RT101P, Renesas RZ/G2L,, Rockchip RK3568 S/PDIF.
2 parents f7b82b1 + 38b7673 commit a8729ef

File tree

1,689 files changed

+37688
-13189
lines changed

Some content is hidden

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

1,689 files changed

+37688
-13189
lines changed

Documentation/ABI/testing/sysfs-ptp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ Description:
3333
frequency adjustment value (a positive integer) in
3434
parts per billion.
3535

36+
What: /sys/class/ptp/ptpN/max_vclocks
37+
Date: May 2021
38+
Contact: Yangbo Lu <yangbo.lu@nxp.com>
39+
Description:
40+
This file contains the maximum number of ptp vclocks.
41+
Write integer to re-configure it.
42+
3643
What: /sys/class/ptp/ptpN/n_alarms
3744
Date: September 2010
3845
Contact: Richard Cochran <richardcochran@gmail.com>
@@ -61,6 +68,19 @@ Description:
6168
This file contains the number of programmable pins
6269
offered by the PTP hardware clock.
6370

71+
What: /sys/class/ptp/ptpN/n_vclocks
72+
Date: May 2021
73+
Contact: Yangbo Lu <yangbo.lu@nxp.com>
74+
Description:
75+
This file contains the number of virtual PTP clocks in
76+
use. By default, the value is 0 meaning that only the
77+
physical clock is in use. Setting the value creates
78+
the corresponding number of virtual clocks and causes
79+
the physical clock to become free running. Setting the
80+
value back to 0 deletes the virtual clocks and
81+
switches the physical clock back to normal, adjustable
82+
operation.
83+
6484
What: /sys/class/ptp/ptpN/pins
6585
Date: March 2014
6686
Contact: Richard Cochran <richardcochran@gmail.com>

Documentation/arm64/tagged-address-abi.rst

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,24 @@ how the user addresses are used by the kernel:
4545

4646
1. User addresses not accessed by the kernel but used for address space
4747
management (e.g. ``mprotect()``, ``madvise()``). The use of valid
48-
tagged pointers in this context is allowed with the exception of
49-
``brk()``, ``mmap()`` and the ``new_address`` argument to
50-
``mremap()`` as these have the potential to alias with existing
51-
user addresses.
52-
53-
NOTE: This behaviour changed in v5.6 and so some earlier kernels may
54-
incorrectly accept valid tagged pointers for the ``brk()``,
55-
``mmap()`` and ``mremap()`` system calls.
48+
tagged pointers in this context is allowed with these exceptions:
49+
50+
- ``brk()``, ``mmap()`` and the ``new_address`` argument to
51+
``mremap()`` as these have the potential to alias with existing
52+
user addresses.
53+
54+
NOTE: This behaviour changed in v5.6 and so some earlier kernels may
55+
incorrectly accept valid tagged pointers for the ``brk()``,
56+
``mmap()`` and ``mremap()`` system calls.
57+
58+
- The ``range.start``, ``start`` and ``dst`` arguments to the
59+
``UFFDIO_*`` ``ioctl()``s used on a file descriptor obtained from
60+
``userfaultfd()``, as fault addresses subsequently obtained by reading
61+
the file descriptor will be untagged, which may otherwise confuse
62+
tag-unaware programs.
63+
64+
NOTE: This behaviour changed in v5.14 and so some earlier kernels may
65+
incorrectly accept valid tagged pointers for this system call.
5666

5767
2. User addresses accessed by the kernel (e.g. ``write()``). This ABI
5868
relaxation is disabled by default and the application thread needs to

Documentation/bpf/libbpf/libbpf_naming_convention.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ This bump in ABI version is at most once per kernel development cycle.
108108

109109
For example, if current state of ``libbpf.map`` is:
110110

111-
.. code-block:: c
111+
.. code-block:: none
112112
113113
LIBBPF_0.0.1 {
114114
global:
@@ -121,7 +121,7 @@ For example, if current state of ``libbpf.map`` is:
121121
, and a new symbol ``bpf_func_c`` is being introduced, then
122122
``libbpf.map`` should be changed like this:
123123

124-
.. code-block:: c
124+
.. code-block:: none
125125
126126
LIBBPF_0.0.1 {
127127
global:

Documentation/dev-tools/kunit/running_tips.rst

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,7 @@ Generating code coverage reports under UML
8686
.. note::
8787
TODO(brendanhiggins@google.com): There are various issues with UML and
8888
versions of gcc 7 and up. You're likely to run into missing ``.gcda``
89-
files or compile errors. We know one `faulty GCC commit
90-
<https://github.com/gcc-mirror/gcc/commit/8c9434c2f9358b8b8bad2c1990edf10a21645f9d>`_
91-
but not how we'd go about getting this fixed. The compile errors still
92-
need some investigation.
93-
94-
.. note::
95-
TODO(brendanhiggins@google.com): for recent versions of Linux
96-
(5.10-5.12, maybe earlier), there's a bug with gcov counters not being
97-
flushed in UML. This translates to very low (<1%) reported coverage. This is
98-
related to the above issue and can be worked around by replacing the
99-
one call to ``uml_abort()`` (it's in ``os_dump_core()``) with a plain
100-
``exit()``.
101-
89+
files or compile errors.
10290

10391
This is different from the "normal" way of getting coverage information that is
10492
documented in Documentation/dev-tools/gcov.rst.

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ properties:
5050

5151
reg:
5252
minItems: 1
53-
maxItems: 3
5453
items:
5554
- description: base register
5655
- description: power register

Documentation/devicetree/bindings/display/renesas,du.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ required:
9292
- reg
9393
- clocks
9494
- interrupts
95-
- resets
9695
- ports
9796

9897
allOf:

Documentation/devicetree/bindings/hwmon/adt7475.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,7 @@ properties:
3939
reg:
4040
maxItems: 1
4141

42-
patternProperties:
43-
"^adi,bypass-attenuator-in[0-4]$":
44-
description: |
45-
Configures bypassing the individual voltage input attenuator. If
46-
set to 1 the attenuator is bypassed if set to 0 the attenuator is
47-
not bypassed. If the property is absent then the attenuator
48-
retains it's configuration from the bios/bootloader.
49-
$ref: /schemas/types.yaml#/definitions/uint32
50-
enum: [0, 1]
51-
52-
"^adi,pwm-active-state$":
42+
adi,pwm-active-state:
5343
description: |
5444
Integer array, represents the active state of the pwm outputs If set to 0
5545
the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
@@ -61,6 +51,16 @@ patternProperties:
6151
enum: [0, 1]
6252
default: 1
6353

54+
patternProperties:
55+
"^adi,bypass-attenuator-in[0-4]$":
56+
description: |
57+
Configures bypassing the individual voltage input attenuator. If
58+
set to 1 the attenuator is bypassed if set to 0 the attenuator is
59+
not bypassed. If the property is absent then the attenuator
60+
retains it's configuration from the bios/bootloader.
61+
$ref: /schemas/types.yaml#/definitions/uint32
62+
enum: [0, 1]
63+
6464
required:
6565
- compatible
6666
- reg

Documentation/devicetree/bindings/iio/st,st-sensors.yaml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -152,47 +152,6 @@ allOf:
152152
maxItems: 1
153153
st,drdy-int-pin: false
154154

155-
- if:
156-
properties:
157-
compatible:
158-
enum:
159-
# Two intertial interrupts i.e. accelerometer/gyro interrupts
160-
- st,h3lis331dl-accel
161-
- st,l3g4200d-gyro
162-
- st,l3g4is-gyro
163-
- st,l3gd20-gyro
164-
- st,l3gd20h-gyro
165-
- st,lis2de12
166-
- st,lis2dw12
167-
- st,lis2hh12
168-
- st,lis2dh12-accel
169-
- st,lis331dl-accel
170-
- st,lis331dlh-accel
171-
- st,lis3de
172-
- st,lis3dh-accel
173-
- st,lis3dhh
174-
- st,lis3mdl-magn
175-
- st,lng2dm-accel
176-
- st,lps331ap-press
177-
- st,lsm303agr-accel
178-
- st,lsm303dlh-accel
179-
- st,lsm303dlhc-accel
180-
- st,lsm303dlm-accel
181-
- st,lsm330-accel
182-
- st,lsm330-gyro
183-
- st,lsm330d-accel
184-
- st,lsm330d-gyro
185-
- st,lsm330dl-accel
186-
- st,lsm330dl-gyro
187-
- st,lsm330dlc-accel
188-
- st,lsm330dlc-gyro
189-
- st,lsm9ds0-gyro
190-
- st,lsm9ds1-magn
191-
then:
192-
properties:
193-
interrupts:
194-
maxItems: 2
195-
196155
required:
197156
- compatible
198157
- reg

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ properties:
5252
items:
5353
- const: marvell,ap806-smmu-500
5454
- const: arm,mmu-500
55-
- description: NVIDIA SoCs that program two ARM MMU-500s identically
56-
items:
5755
- description: NVIDIA SoCs that require memory controller interaction
5856
and may program multiple ARM MMU-500s identically with the memory
5957
controller interleaving translations between multiple instances
6058
for improved performance.
6159
items:
6260
- enum:
63-
- const: nvidia,tegra194-smmu
64-
- const: nvidia,tegra186-smmu
61+
- nvidia,tegra194-smmu
62+
- nvidia,tegra186-smmu
6563
- const: nvidia,smmu-500
6664
- items:
6765
- const: arm,mmu-500

Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ properties:
2828
- description: configuration registers for MMU instance 0
2929
- description: configuration registers for MMU instance 1
3030
minItems: 1
31-
maxItems: 2
3231

3332
interrupts:
3433
items:
3534
- description: interruption for MMU instance 0
3635
- description: interruption for MMU instance 1
3736
minItems: 1
38-
maxItems: 2
3937

4038
clocks:
4139
items:

0 commit comments

Comments
 (0)