Skip to content

Commit 2911ed9

Browse files
committed
Merge tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char / misc driver updates from Greg KH: "Here is the big char/misc driver update for 5.11-rc1. Continuing the tradition of previous -rc1 pulls, there seems to be more and more tiny driver subsystems flowing through this tree. Lots of different things, all of which have been in linux-next for a while with no reported issues: - extcon driver updates - habannalab driver updates - mei driver updates - uio driver updates - binder fixes and features added - soundwire driver updates - mhi bus driver updates - phy driver updates - coresight driver updates - fpga driver updates - speakup driver updates - slimbus driver updates - various small char and misc driver updates" * tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (305 commits) extcon: max77693: Fix modalias string extcon: fsa9480: Support TI TSU6111 variant extcon: fsa9480: Rewrite bindings in YAML and extend dt-bindings: extcon: add binding for TUSB320 extcon: Add driver for TI TUSB320 slimbus: qcom: fix potential NULL dereference in qcom_slim_prg_slew() siox: Make remove callback return void siox: Use bus_type functions for probe, remove and shutdown spmi: Add driver shutdown support spmi: fix some coding style issues at the spmi core spmi: get rid of a warning when built with W=1 uio: uio_hv_generic: use devm_kzalloc() for private data alloc uio: uio_fsl_elbc_gpcm: use device-managed allocators uio: uio_aec: use devm_kzalloc() for uio_info object uio: uio_cif: use devm_kzalloc() for uio_info object uio: uio_netx: use devm_kzalloc() for or uio_info object uio: uio_mf624: use devm_kzalloc() for uio_info object uio: uio_sercos3: use device-managed functions for simple allocs uio: uio_dmem_genirq: finalize conversion of probe to devm_ handlers uio: uio_dmem_genirq: convert simple allocations to device-managed ...
2 parents 7240153 + 93f9988 commit 2911ed9

File tree

290 files changed

+23644
-4099
lines changed

Some content is hidden

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

290 files changed

+23644
-4099
lines changed

Documentation/ABI/testing/sysfs-driver-w1_therm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Users: any user space application which wants to communicate with
1414
w1_term device
1515

1616

17-
What: /sys/bus/w1/devices/.../eeprom
17+
What: /sys/bus/w1/devices/.../eeprom_cmd
1818
Date: May 2020
1919
Contact: Akira Shimahara <[email protected]>
2020
Description:

Documentation/admin-guide/spkguide.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ spk key_slash = say_attributes
344344
spk key_8 = speakup_paste
345345
shift spk key_m = say_first_char
346346
ctrl spk key_semicolon = say_last_char
347+
spk key_r = read_all_doc
347348

348349
5. The Speakup Sys System
349350

Documentation/devicetree/bindings/clock/ingenic,cgu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ required:
9292

9393
patternProperties:
9494
"^usb-phy@[a-f0-9]+$":
95-
allOf: [ $ref: "../usb/ingenic,jz4770-phy.yaml#" ]
95+
allOf: [ $ref: "../phy/ingenic,phy-usb.yaml#" ]
9696

9797
additionalProperties: false
9898

Documentation/devicetree/bindings/extcon/extcon-fsa9480.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/extcon/extcon-usbc-tusb320.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TI TUSB320 USB Type-C CC Logic controller
8+
9+
maintainers:
10+
- Michael Auchter <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: ti,tusb320
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
required:
23+
- compatible
24+
- reg
25+
- interrupts
26+
27+
additionalProperties: false
28+
29+
examples:
30+
- |
31+
i2c0 {
32+
#address-cells = <1>;
33+
#size-cells = <0>;
34+
tusb320@61 {
35+
compatible = "ti,tusb320";
36+
reg = <0x61>;
37+
interrupt-parent = <&gpio>;
38+
interrupts = <27 1>;
39+
};
40+
};
41+
...
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/extcon/fcs,fsa880.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Fairchild Semiconductor FSA880, FSA9480 and compatibles
8+
9+
maintainers:
10+
- Linus Walleij <[email protected]>
11+
12+
description:
13+
The FSA880 and FSA9480 are USB port accessory detectors and switches.
14+
The switch is fully controlled using I2C and enables USB data, stereo
15+
and mono audio, video, microphone, and UART data to use a common
16+
connector port. Compatible switches exist from other manufacturers.
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- fcs,fsa880
22+
- fcs,fsa9480
23+
- ti,tsu6111
24+
25+
reg:
26+
maxItems: 1
27+
description: The I2C address for an FSA880 compatible device is
28+
usually 0x25.
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
required:
34+
- compatible
35+
- reg
36+
- interrupts
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
#include <dt-bindings/interrupt-controller/irq.h>
43+
i2c {
44+
#address-cells = <1>;
45+
#size-cells = <0>;
46+
usb-switch@25 {
47+
compatible = "fcs,fsa880";
48+
reg = <0x25>;
49+
interrupt-parent = <&gpio>;
50+
interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
51+
};
52+
};

Documentation/devicetree/bindings/nvmem/mtk-efuse.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Required properties:
77
"mediatek,mt7622-efuse", "mediatek,efuse": for MT7622
88
"mediatek,mt7623-efuse", "mediatek,efuse": for MT7623
99
"mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173
10+
"mediatek,mt8516-efuse", "mediatek,efuse": for MT8516
1011
- reg: Should contain registers location and length
1112

1213
= Data cells =

Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,18 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
const: qcom,qfprom
17+
items:
18+
- enum:
19+
- qcom,apq8064-qfprom
20+
- qcom,apq8084-qfprom
21+
- qcom,msm8974-qfprom
22+
- qcom,msm8916-qfprom
23+
- qcom,msm8996-qfprom
24+
- qcom,msm8998-qfprom
25+
- qcom,qcs404-qfprom
26+
- qcom,sc7180-qfprom
27+
- qcom,sdm845-qfprom
28+
- const: qcom,qfprom
1829

1930
reg:
2031
# If the QFPROM is read-only OS image then only the corrected region
@@ -60,7 +71,7 @@ examples:
6071
#size-cells = <2>;
6172
6273
efuse@784000 {
63-
compatible = "qcom,qfprom";
74+
compatible = "qcom,sc7180-qfprom", "qcom,qfprom";
6475
reg = <0 0x00784000 0 0x8ff>,
6576
<0 0x00780000 0 0x7a0>,
6677
<0 0x00782000 0 0x100>,
@@ -85,7 +96,7 @@ examples:
8596
#size-cells = <2>;
8697
8798
efuse@784000 {
88-
compatible = "qcom,qfprom";
99+
compatible = "qcom,sdm845-qfprom", "qcom,qfprom";
89100
reg = <0 0x00784000 0 0x8ff>;
90101
#address-cells = <1>;
91102
#size-cells = <1>;
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2020 BayLibre, SAS
3+
%YAML 1.2
4+
---
5+
$id: "http://devicetree.org/schemas/phy/amlogic,axg-mipi-dphy.yaml#"
6+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
7+
8+
title: Amlogic AXG MIPI D-PHY
9+
10+
maintainers:
11+
- Neil Armstrong <[email protected]>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- amlogic,axg-mipi-dphy
17+
18+
reg:
19+
maxItems: 1
20+
21+
clocks:
22+
maxItems: 1
23+
24+
clock-names:
25+
items:
26+
- const: pclk
27+
28+
resets:
29+
maxItems: 1
30+
31+
reset-names:
32+
items:
33+
- const: phy
34+
35+
"#phy-cells":
36+
const: 0
37+
38+
phys:
39+
maxItems: 1
40+
41+
phy-names:
42+
items:
43+
- const: analog
44+
45+
required:
46+
- compatible
47+
- reg
48+
- clocks
49+
- clock-names
50+
- resets
51+
- reset-names
52+
- phys
53+
- phy-names
54+
- "#phy-cells"
55+
56+
additionalProperties: false
57+
58+
examples:
59+
- |
60+
phy@ff640000 {
61+
compatible = "amlogic,axg-mipi-dphy";
62+
reg = <0xff640000 0x100>;
63+
clocks = <&clk_mipi_dsi_phy>;
64+
clock-names = "pclk";
65+
resets = <&reset_phy>;
66+
reset-names = "phy";
67+
phys = <&mipi_pcie_analog_dphy>;
68+
phy-names = "analog";
69+
#phy-cells = <0>;
70+
};

Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie-analog.yaml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,32 @@ title: Amlogic AXG shared MIPI/PCIE analog PHY
99
maintainers:
1010
- Remi Pommarel <[email protected]>
1111

12+
description: |+
13+
The Everything-Else Power Domains node should be the child of a syscon
14+
node with the required property:
15+
16+
- compatible: Should be the following:
17+
"amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon"
18+
19+
Refer to the the bindings described in
20+
Documentation/devicetree/bindings/mfd/syscon.yaml
21+
1222
properties:
1323
compatible:
1424
const: amlogic,axg-mipi-pcie-analog-phy
1525

16-
reg:
17-
maxItems: 1
18-
1926
"#phy-cells":
20-
const: 1
27+
const: 0
2128

2229
required:
2330
- compatible
24-
- reg
2531
- "#phy-cells"
2632

2733
additionalProperties: false
2834

2935
examples:
3036
- |
31-
mpphy: phy@0 {
37+
mpphy: phy {
3238
compatible = "amlogic,axg-mipi-pcie-analog-phy";
33-
reg = <0x0 0xc>;
34-
#phy-cells = <1>;
39+
#phy-cells = <0>;
3540
};

0 commit comments

Comments
 (0)