Skip to content

Commit 97b10a7

Browse files
committed
Merge tag 'asoc-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for for v6.11 There are a lot of changes in here, though the big bulk of things is cleanups and simplifications of various kinds which are internally rather than externally visible. A good chunk of those are DT schema conversions, but there's also a lot of changes in the code. Highlights: - Syncing of features between simple-audio-card and the two audio-graph cards so there is no reason to stick with an older driver. - Support for specifying the order of operations for components within cards to allow quirking for unusual systems. - New support for Asahi Kasei AK4619, Cirrus Logic CS530x, Everest Semiconductors ES8311, NXP i.MX95 and LPC32xx, Qualcomm LPASS v2.5 and WCD937x, Realtek RT1318 and RT1320 and Texas Instruments PCM5242.
2 parents e54dc34 + c51cba4 commit 97b10a7

File tree

661 files changed

+23899
-5937
lines changed

Some content is hidden

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

661 files changed

+23899
-5937
lines changed

Documentation/admin-guide/LSM/tomoyo.rst

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
99

1010
LiveCD-based tutorials are available at
1111

12-
http://tomoyo.sourceforge.jp/1.8/ubuntu12.04-live.html
13-
http://tomoyo.sourceforge.jp/1.8/centos6-live.html
12+
https://tomoyo.sourceforge.net/1.8/ubuntu12.04-live.html
13+
https://tomoyo.sourceforge.net/1.8/centos6-live.html
1414

1515
Though these tutorials use non-LSM version of TOMOYO, they are useful for you
1616
to know what TOMOYO is.
@@ -21,45 +21,32 @@ How to enable TOMOYO?
2121
Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on
2222
kernel's command line.
2323

24-
Please see http://tomoyo.osdn.jp/2.5/ for details.
24+
Please see https://tomoyo.sourceforge.net/2.6/ for details.
2525

2626
Where is documentation?
2727
=======================
2828

2929
User <-> Kernel interface documentation is available at
30-
https://tomoyo.osdn.jp/2.5/policy-specification/index.html .
30+
https://tomoyo.sourceforge.net/2.6/policy-specification/index.html .
3131

3232
Materials we prepared for seminars and symposiums are available at
33-
https://osdn.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .
33+
https://sourceforge.net/projects/tomoyo/files/docs/ .
3434
Below lists are chosen from three aspects.
3535

3636
What is TOMOYO?
3737
TOMOYO Linux Overview
38-
https://osdn.jp/projects/tomoyo/docs/lca2009-takeda.pdf
38+
https://sourceforge.net/projects/tomoyo/files/docs/lca2009-takeda.pdf
3939
TOMOYO Linux: pragmatic and manageable security for Linux
40-
https://osdn.jp/projects/tomoyo/docs/freedomhectaipei-tomoyo.pdf
40+
https://sourceforge.net/projects/tomoyo/files/docs/freedomhectaipei-tomoyo.pdf
4141
TOMOYO Linux: A Practical Method to Understand and Protect Your Own Linux Box
42-
https://osdn.jp/projects/tomoyo/docs/PacSec2007-en-no-demo.pdf
42+
https://sourceforge.net/projects/tomoyo/files/docs/PacSec2007-en-no-demo.pdf
4343

4444
What can TOMOYO do?
4545
Deep inside TOMOYO Linux
46-
https://osdn.jp/projects/tomoyo/docs/lca2009-kumaneko.pdf
46+
https://sourceforge.net/projects/tomoyo/files/docs/lca2009-kumaneko.pdf
4747
The role of "pathname based access control" in security.
48-
https://osdn.jp/projects/tomoyo/docs/lfj2008-bof.pdf
48+
https://sourceforge.net/projects/tomoyo/files/docs/lfj2008-bof.pdf
4949

5050
History of TOMOYO?
5151
Realities of Mainlining
52-
https://osdn.jp/projects/tomoyo/docs/lfj2008.pdf
53-
54-
What is future plan?
55-
====================
56-
57-
We believe that inode based security and name based security are complementary
58-
and both should be used together. But unfortunately, so far, we cannot enable
59-
multiple LSM modules at the same time. We feel sorry that you have to give up
60-
SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.
61-
62-
We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM
63-
version of TOMOYO, available at http://tomoyo.osdn.jp/1.8/ .
64-
LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning
65-
to port non-LSM version's functionalities to LSM versions.
52+
https://sourceforge.net/projects/tomoyo/files/docs/lfj2008.pdf

Documentation/admin-guide/mm/transhuge.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,11 @@ anon_fault_fallback_charge
467467
instead falls back to using huge pages with lower orders or
468468
small pages even though the allocation was successful.
469469

470-
anon_swpout
470+
swpout
471471
is incremented every time a huge page is swapped out in one
472472
piece without splitting.
473473

474-
anon_swpout_fallback
474+
swpout_fallback
475475
is incremented if a huge page has to be split before swapout.
476476
Usually because failed to allocate some continuous swap space
477477
for the huge page.

Documentation/cdrom/cdrom-standard.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ current *struct* is::
217217
int (*media_changed)(struct cdrom_device_info *, int);
218218
int (*tray_move)(struct cdrom_device_info *, int);
219219
int (*lock_door)(struct cdrom_device_info *, int);
220-
int (*select_speed)(struct cdrom_device_info *, int);
220+
int (*select_speed)(struct cdrom_device_info *, unsigned long);
221221
int (*get_last_session) (struct cdrom_device_info *,
222222
struct cdrom_multisession *);
223223
int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
@@ -396,7 +396,7 @@ action need be taken, and the return value should be 0.
396396

397397
::
398398

399-
int select_speed(struct cdrom_device_info *cdi, int speed)
399+
int select_speed(struct cdrom_device_info *cdi, unsigned long speed)
400400

401401
Some CD-ROM drives are capable of changing their head-speed. There
402402
are several reasons for changing the speed of a CD-ROM drive. Badly

Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,10 @@ unevaluatedProperties: false
5454

5555
examples:
5656
- |
57-
mlahb: ahb@38000000 {
57+
ahb {
5858
compatible = "st,mlahb", "simple-bus";
5959
#address-cells = <1>;
6060
#size-cells = <1>;
61-
reg = <0x10000000 0x40000>;
6261
ranges;
6362
dma-ranges = <0x00000000 0x38000000 0x10000>,
6463
<0x10000000 0x10000000 0x60000>,

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ properties:
5757
- const: allwinner,sun8i-v3s
5858

5959
- description: Anbernic RG35XX (2024)
60-
- items:
60+
items:
6161
- const: anbernic,rg35xx-2024
6262
- const: allwinner,sun50i-h700
6363

6464
- description: Anbernic RG35XX Plus
65-
- items:
65+
items:
6666
- const: anbernic,rg35xx-plus
6767
- const: allwinner,sun50i-h700
6868

6969
- description: Anbernic RG35XX H
70-
- items:
70+
items:
7171
- const: anbernic,rg35xx-h
7272
- const: allwinner,sun50i-h700
7373

Documentation/devicetree/bindings/input/elan,ekth6915.yaml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ allOf:
1818

1919
properties:
2020
compatible:
21-
enum:
22-
- elan,ekth6915
23-
- ilitek,ili2901
21+
oneOf:
22+
- items:
23+
- enum:
24+
- elan,ekth5015m
25+
- const: elan,ekth6915
26+
- const: elan,ekth6915
2427

2528
reg:
2629
const: 0x10
@@ -33,6 +36,12 @@ properties:
3336
reset-gpios:
3437
description: Reset GPIO; not all touchscreens using eKTH6915 hook this up.
3538

39+
no-reset-on-power-off:
40+
type: boolean
41+
description:
42+
Reset line is wired so that it can (and should) be left deasserted when
43+
the power supply is off.
44+
3645
vcc33-supply:
3746
description: The 3.3V supply to the touchscreen.
3847

@@ -58,8 +67,8 @@ examples:
5867
#address-cells = <1>;
5968
#size-cells = <0>;
6069
61-
ap_ts: touchscreen@10 {
62-
compatible = "elan,ekth6915";
70+
touchscreen@10 {
71+
compatible = "elan,ekth5015m", "elan,ekth6915";
6372
reg = <0x10>;
6473
6574
interrupt-parent = <&tlmm>;
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/ilitek,ili2901.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ilitek ILI2901 touchscreen controller
8+
9+
maintainers:
10+
- Jiri Kosina <[email protected]>
11+
12+
description:
13+
Supports the Ilitek ILI2901 touchscreen controller.
14+
This touchscreen controller uses the i2c-hid protocol with a reset GPIO.
15+
16+
allOf:
17+
- $ref: /schemas/input/touchscreen/touchscreen.yaml#
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- ilitek,ili2901
23+
24+
reg:
25+
maxItems: 1
26+
27+
interrupts:
28+
maxItems: 1
29+
30+
panel: true
31+
32+
reset-gpios:
33+
maxItems: 1
34+
35+
vcc33-supply: true
36+
37+
vccio-supply: true
38+
39+
required:
40+
- compatible
41+
- reg
42+
- interrupts
43+
- vcc33-supply
44+
45+
additionalProperties: false
46+
47+
examples:
48+
- |
49+
#include <dt-bindings/gpio/gpio.h>
50+
#include <dt-bindings/interrupt-controller/irq.h>
51+
52+
i2c {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
touchscreen@41 {
57+
compatible = "ilitek,ili2901";
58+
reg = <0x41>;
59+
60+
interrupt-parent = <&tlmm>;
61+
interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
62+
63+
reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
64+
vcc33-supply = <&pp3300_ts>;
65+
};
66+
};

Documentation/devicetree/bindings/sound/ak4104.txt

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

Documentation/devicetree/bindings/sound/ak4554.txt

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

Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt

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

0 commit comments

Comments
 (0)