Skip to content

Commit 2d98f9d

Browse files
committed
ASoC: Additional exports for hdmi-codec
Merge series from Dmitry Baryshkov <dmitry.baryshkov@linaro.org>: Provide some more functionality from the hdmi-codec driver to facilitate some DRM framework enhancements.
2 parents 9d49925 + 5b0779a commit 2d98f9d

341 files changed

Lines changed: 2678 additions & 1840 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
121121
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
122122
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
123123
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
124+
Bingwu Zhang <xtex@aosc.io> <xtexchooser@duck.com>
125+
Bingwu Zhang <xtex@aosc.io> <xtex@xtexx.eu.org>
124126
Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>
125127
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>
126128
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>

CREDITS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ N: Thomas Abraham
2020
E: thomas.ab@samsung.com
2121
D: Samsung pin controller driver
2222

23+
N: Jose Abreu
24+
E: jose.abreu@synopsys.com
25+
D: Synopsys DesignWare XPCS MDIO/PCS driver.
26+
2327
N: Dragos Acostachioaie
2428
E: dragos@iname.com
2529
W: http://www.arbornet.org/~dragos
@@ -1428,6 +1432,10 @@ S: 8124 Constitution Apt. 7
14281432
S: Sterling Heights, Michigan 48313
14291433
S: USA
14301434

1435+
N: Andy Gospodarek
1436+
E: andy@greyhouse.net
1437+
D: Maintenance and contributions to the network interface bonding driver.
1438+
14311439
N: Wolfgang Grandegger
14321440
E: wg@grandegger.com
14331441
D: Controller Area Network (device drivers)
@@ -1812,6 +1820,10 @@ D: Author/maintainer of most DRM drivers (especially ATI, MGA)
18121820
D: Core DRM templates, general DRM and 3D-related hacking
18131821
S: No fixed address
18141822

1823+
N: Woojung Huh
1824+
E: woojung.huh@microchip.com
1825+
D: Microchip LAN78XX USB Ethernet driver
1826+
18151827
N: Kenn Humborg
18161828
E: kenn@wombat.ie
18171829
D: Mods to loop device to support sparse backing files

Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ properties:
4242
interrupts:
4343
maxItems: 1
4444

45+
'#sound-dai-cells':
46+
const: 0
47+
4548
ports:
4649
$ref: /schemas/graph.yaml#/properties/ports
4750
properties:
@@ -85,7 +88,21 @@ required:
8588
- ports
8689
- max-linkrate-mhz
8790

88-
additionalProperties: false
91+
allOf:
92+
- $ref: /schemas/sound/dai-common.yaml#
93+
- if:
94+
not:
95+
properties:
96+
compatible:
97+
contains:
98+
enum:
99+
- mediatek,mt8188-dp-tx
100+
- mediatek,mt8195-dp-tx
101+
then:
102+
properties:
103+
'#sound-dai-cells': false
104+
105+
unevaluatedProperties: false
89106

90107
examples:
91108
- |

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ properties:
6565
- st,lsm9ds0-gyro
6666
- description: STMicroelectronics Magnetometers
6767
enum:
68+
- st,iis2mdc
6869
- st,lis2mdl
6970
- st,lis3mdl-magn
7071
- st,lsm303agr-magn

Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ properties:
8181
List of phandles, each pointing to the power supply for the
8282
corresponding pairset named in 'pairset-names'. This property
8383
aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4.
84-
PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133)
84+
PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145-3)
8585
|-----------|---------------|---------------|---------------|---------------|
8686
| Conductor | Alternative A | Alternative A | Alternative B | Alternative B |
8787
| | (MDI-X) | (MDI) | (X) | (S) |

Documentation/virt/kvm/api.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1914,6 +1914,9 @@ No flags are specified so far, the corresponding field must be set to zero.
19141914
#define KVM_IRQ_ROUTING_HV_SINT 4
19151915
#define KVM_IRQ_ROUTING_XEN_EVTCHN 5
19161916

1917+
On s390, adding a KVM_IRQ_ROUTING_S390_ADAPTER is rejected on ucontrol VMs with
1918+
error -EINVAL.
1919+
19171920
flags:
19181921

19191922
- KVM_MSI_VALID_DEVID: used along with KVM_IRQ_ROUTING_MSI routing entry

Documentation/virt/kvm/devices/s390_flic.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,15 @@ Groups:
5858
Enables async page faults for the guest. So in case of a major page fault
5959
the host is allowed to handle this async and continues the guest.
6060

61+
-EINVAL is returned when called on the FLIC of a ucontrol VM.
62+
6163
KVM_DEV_FLIC_APF_DISABLE_WAIT
6264
Disables async page faults for the guest and waits until already pending
6365
async page faults are done. This is necessary to trigger a completion interrupt
6466
for every init interrupt before migrating the interrupt list.
6567

68+
-EINVAL is returned when called on the FLIC of a ucontrol VM.
69+
6670
KVM_DEV_FLIC_ADAPTER_REGISTER
6771
Register an I/O adapter interrupt source. Takes a kvm_s390_io_adapter
6872
describing the adapter to register::

MAINTAINERS

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,6 @@ AMAZON ETHERNET DRIVERS
949949
M: Shay Agroskin <shayagr@amazon.com>
950950
M: Arthur Kiyanovski <akiyano@amazon.com>
951951
R: David Arinzon <darinzon@amazon.com>
952-
R: Noam Dagan <ndagan@amazon.com>
953952
R: Saeed Bishara <saeedb@amazon.com>
954953
L: netdev@vger.kernel.org
955954
S: Supported
@@ -2690,7 +2689,6 @@ N: at91
26902689
N: atmel
26912690

26922691
ARM/Microchip Sparx5 SoC support
2693-
M: Lars Povlsen <lars.povlsen@microchip.com>
26942692
M: Steen Hegelund <Steen.Hegelund@microchip.com>
26952693
M: Daniel Machon <daniel.machon@microchip.com>
26962694
M: UNGLinuxDriver@microchip.com
@@ -4058,7 +4056,6 @@ F: net/bluetooth/
40584056

40594057
BONDING DRIVER
40604058
M: Jay Vosburgh <jv@jvosburgh.net>
4061-
M: Andy Gospodarek <andy@greyhouse.net>
40624059
L: netdev@vger.kernel.org
40634060
S: Maintained
40644061
F: Documentation/networking/bonding.rst
@@ -4131,7 +4128,6 @@ S: Odd Fixes
41314128
F: drivers/net/ethernet/netronome/nfp/bpf/
41324129

41334130
BPF JIT for POWERPC (32-BIT AND 64-BIT)
4134-
M: Michael Ellerman <mpe@ellerman.id.au>
41354131
M: Hari Bathini <hbathini@linux.ibm.com>
41364132
M: Christophe Leroy <christophe.leroy@csgroup.eu>
41374133
R: Naveen N Rao <naveen@kernel.org>
@@ -12632,7 +12628,7 @@ F: arch/mips/include/uapi/asm/kvm*
1263212628
F: arch/mips/kvm/
1263312629

1263412630
KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
12635-
M: Michael Ellerman <mpe@ellerman.id.au>
12631+
M: Madhavan Srinivasan <maddy@linux.ibm.com>
1263612632
R: Nicholas Piggin <npiggin@gmail.com>
1263712633
L: linuxppc-dev@lists.ozlabs.org
1263812634
L: kvm@vger.kernel.org
@@ -13211,11 +13207,11 @@ X: drivers/macintosh/adb-iop.c
1321113207
X: drivers/macintosh/via-macii.c
1321213208

1321313209
LINUX FOR POWERPC (32-BIT AND 64-BIT)
13210+
M: Madhavan Srinivasan <maddy@linux.ibm.com>
1321413211
M: Michael Ellerman <mpe@ellerman.id.au>
1321513212
R: Nicholas Piggin <npiggin@gmail.com>
1321613213
R: Christophe Leroy <christophe.leroy@csgroup.eu>
1321713214
R: Naveen N Rao <naveen@kernel.org>
13218-
M: Madhavan Srinivasan <maddy@linux.ibm.com>
1321913215
L: linuxppc-dev@lists.ozlabs.org
1322013216
S: Supported
1322113217
W: https://github.com/linuxppc/wiki/wiki
@@ -14566,7 +14562,6 @@ F: drivers/dma/mediatek/
1456614562
MEDIATEK ETHERNET DRIVER
1456714563
M: Felix Fietkau <nbd@nbd.name>
1456814564
M: Sean Wang <sean.wang@mediatek.com>
14569-
M: Mark Lee <Mark-MC.Lee@mediatek.com>
1457014565
M: Lorenzo Bianconi <lorenzo@kernel.org>
1457114566
L: netdev@vger.kernel.org
1457214567
S: Maintained
@@ -22503,11 +22498,8 @@ F: Documentation/devicetree/bindings/phy/st,stm32mp25-combophy.yaml
2250322498
F: drivers/phy/st/phy-stm32-combophy.c
2250422499

2250522500
STMMAC ETHERNET DRIVER
22506-
M: Alexandre Torgue <alexandre.torgue@foss.st.com>
22507-
M: Jose Abreu <joabreu@synopsys.com>
2250822501
L: netdev@vger.kernel.org
22509-
S: Supported
22510-
W: http://www.stlinux.com
22502+
S: Orphan
2251122503
F: Documentation/networking/device_drivers/ethernet/stmicro/
2251222504
F: drivers/net/ethernet/stmicro/stmmac/
2251322505

@@ -22739,9 +22731,8 @@ S: Supported
2273922731
F: drivers/net/ethernet/synopsys/
2274022732

2274122733
SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVER
22742-
M: Jose Abreu <Jose.Abreu@synopsys.com>
2274322734
L: netdev@vger.kernel.org
22744-
S: Supported
22735+
S: Orphan
2274522736
F: drivers/net/pcs/pcs-xpcs.c
2274622737
F: drivers/net/pcs/pcs-xpcs.h
2274722738
F: include/linux/pcs/pcs-xpcs.h
@@ -23649,7 +23640,6 @@ F: tools/testing/selftests/timers/
2364923640

2365023641
TIPC NETWORK LAYER
2365123642
M: Jon Maloy <jmaloy@redhat.com>
23652-
M: Ying Xue <ying.xue@windriver.com>
2365323643
L: netdev@vger.kernel.org (core kernel code)
2365423644
L: tipc-discussion@lists.sourceforge.net (user apps, general discussion)
2365523645
S: Maintained
@@ -24255,7 +24245,8 @@ F: Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
2425524245
F: drivers/usb/isp1760/*
2425624246

2425724247
USB LAN78XX ETHERNET DRIVER
24258-
M: Woojung Huh <woojung.huh@microchip.com>
24248+
M: Thangaraj Samynathan <Thangaraj.S@microchip.com>
24249+
M: Rengarajan Sundararajan <Rengarajan.S@microchip.com>
2425924250
M: UNGLinuxDriver@microchip.com
2426024251
L: netdev@vger.kernel.org
2426124252
S: Maintained

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 13
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc6
5+
EXTRAVERSION = -rc7
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

arch/arm/boot/dts/nxp/imx/imxrt1050.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
reg = <0x402c0000 0x4000>;
8888
interrupts = <110>;
8989
clocks = <&clks IMXRT1050_CLK_IPG_PDOF>,
90-
<&clks IMXRT1050_CLK_OSC>,
90+
<&clks IMXRT1050_CLK_AHB_PODF>,
9191
<&clks IMXRT1050_CLK_USDHC1>;
9292
clock-names = "ipg", "ahb", "per";
9393
bus-width = <4>;

0 commit comments

Comments
 (0)