Skip to content

Commit 55b4083

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Here is a third set of fixes for the soc tree, well within the expected set of changes. Maintainer list changes: - Krzysztof Kozlowski and Jisheng Zhang both have new email addresses - Broadcom iProc has a new git tree Regressions: - Robert Foss sends a revert for a Mediatek DPI bridge patch that caused an inadvertent break in the DT binding - mstar timers need to be included in Kconfig Devicetree fixes for: - Aspeed ast2600 spi pinmux - Tegra eDP panels on Nyan FHD - Tegra display IOMMU - Qualcomm sm8350 UFS clocks - minor DT changes for Marvell Armada, Qualcomm sdx65, Qualcomm sm8450, and Broadcom BCM2711" * tag 'soc-fixes-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 MAINTAINERS: Update Jisheng's email address Revert "arm64: dts: mt8183: jacuzzi: Fix bus properties in anx's DSI endpoint" dt-bindings: drm/bridge: anx7625: Revert DPI support ARM: dts: aspeed: Fix AST2600 quad spi group MAINTAINERS: update Krzysztof Kozlowski's email MAINTAINERS: Update git tree for Broadcom iProc SoCs ARM: tegra: Move Nyan FHD panels to AUX bus arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias ARM: mstar: Select HAVE_ARM_ARCH_TIMER soc: mediatek: mt8192-mmsys: Fix dither to dsi0 path's input sel arm64: dts: mt8183: jacuzzi: Fix bus properties in anx's DSI endpoint ARM: boot: dts: bcm2711: Fix HVS register range arm64: dts: qcom: c630: disable crypto due to serror arm64: dts: qcom: sm8450: fix apps_smmu interrupts arm64: dts: qcom: sm8450: enable GCC_USB3_0_CLKREF_EN for usb arm64: dts: qcom: sm8350: Correct UFS symbol clocks arm64: tegra: Disable ISO SMMU for Tegra194 Revert "dt-bindings: arm: qcom: Document SDX65 platform and boards"
2 parents fe673d3 + 7e606ed commit 55b4083

16 files changed

Lines changed: 78 additions & 58 deletions

File tree

‎.mailmap‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
187187
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
188188
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.cz>
189189
Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>
190+
Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
191+
Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
190192
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
191193
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
192194
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
@@ -216,6 +218,7 @@ Koushik <raghavendra.koushik@neterion.com>
216218
Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
217219
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
218220
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
221+
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
219222
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
220223
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
221224
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

‎Documentation/devicetree/bindings/arm/qcom.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ description: |
4848
sdx65
4949
sm7225
5050
sm8150
51-
sdx65
5251
sm8250
5352
sm8350
5453
sm8450
@@ -228,11 +227,6 @@ properties:
228227
- qcom,sdx65-mtp
229228
- const: qcom,sdx65
230229

231-
- items:
232-
- enum:
233-
- qcom,sdx65-mtp
234-
- const: qcom,sdx65
235-
236230
- items:
237231
- enum:
238232
- qcom,ipq6018-cp01

‎Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,7 @@ properties:
9191
$ref: /schemas/graph.yaml#/$defs/port-base
9292
unevaluatedProperties: false
9393
description:
94-
MIPI DSI/DPI input.
95-
96-
properties:
97-
endpoint:
98-
$ref: /schemas/media/video-interfaces.yaml#
99-
type: object
100-
additionalProperties: false
101-
102-
properties:
103-
remote-endpoint: true
104-
105-
bus-type:
106-
enum: [1, 5]
107-
default: 1
108-
109-
data-lanes: true
94+
Video port for MIPI DSI input.
11095

11196
port@1:
11297
$ref: /schemas/graph.yaml#/properties/port
@@ -155,8 +140,6 @@ examples:
155140
reg = <0>;
156141
anx7625_in: endpoint {
157142
remote-endpoint = <&mipi_dsi>;
158-
bus-type = <5>;
159-
data-lanes = <0 1 2 3>;
160143
};
161144
};
162145

‎MAINTAINERS‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2572,7 +2572,7 @@ F: sound/soc/rockchip/
25722572
N: rockchip
25732573

25742574
ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
2575-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
2575+
M: Krzysztof Kozlowski <krzk@kernel.org>
25762576
R: Alim Akhtar <alim.akhtar@samsung.com>
25772577
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
25782578
L: linux-samsung-soc@vger.kernel.org
@@ -2739,7 +2739,7 @@ N: stm32
27392739
N: stm
27402740

27412741
ARM/Synaptics SoC support
2742-
M: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
2742+
M: Jisheng Zhang <jszhang@kernel.org>
27432743
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
27442744
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
27452745
S: Maintained
@@ -3905,7 +3905,7 @@ M: Scott Branden <sbranden@broadcom.com>
39053905
M: bcm-kernel-feedback-list@broadcom.com
39063906
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
39073907
S: Maintained
3908-
T: git git://github.com/broadcom/cygnus-linux.git
3908+
T: git git://github.com/broadcom/stblinux.git
39093909
F: arch/arm64/boot/dts/broadcom/northstar2/*
39103910
F: arch/arm64/boot/dts/broadcom/stingray/*
39113911
F: drivers/clk/bcm/clk-ns*
@@ -11675,7 +11675,7 @@ F: drivers/iio/proximity/mb1232.c
1167511675

1167611676
MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
1167711677
R: Iskren Chernev <iskren.chernev@gmail.com>
11678-
R: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11678+
R: Krzysztof Kozlowski <krzk@kernel.org>
1167911679
R: Marek Szyprowski <m.szyprowski@samsung.com>
1168011680
R: Matheus Castello <matheus@castello.eng.br>
1168111681
L: linux-pm@vger.kernel.org
@@ -11685,7 +11685,7 @@ F: drivers/power/supply/max17040_battery.c
1168511685

1168611686
MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
1168711687
R: Hans de Goede <hdegoede@redhat.com>
11688-
R: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11688+
R: Krzysztof Kozlowski <krzk@kernel.org>
1168911689
R: Marek Szyprowski <m.szyprowski@samsung.com>
1169011690
R: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
1169111691
R: Purism Kernel Team <kernel@puri.sm>
@@ -11730,7 +11730,7 @@ F: Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml
1173011730
F: drivers/power/supply/max77976_charger.c
1173111731

1173211732
MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
11733-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11733+
M: Krzysztof Kozlowski <krzk@kernel.org>
1173411734
M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
1173511735
L: linux-pm@vger.kernel.org
1173611736
S: Supported
@@ -11739,7 +11739,7 @@ F: drivers/power/supply/max77693_charger.c
1173911739

1174011740
MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
1174111741
M: Chanwoo Choi <cw00.choi@samsung.com>
11742-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
11742+
M: Krzysztof Kozlowski <krzk@kernel.org>
1174311743
M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
1174411744
L: linux-kernel@vger.kernel.org
1174511745
S: Supported
@@ -12428,7 +12428,7 @@ F: include/linux/memblock.h
1242812428
F: mm/memblock.c
1242912429

1243012430
MEMORY CONTROLLER DRIVERS
12431-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
12431+
M: Krzysztof Kozlowski <krzk@kernel.org>
1243212432
L: linux-kernel@vger.kernel.org
1243312433
S: Maintained
1243412434
T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
@@ -13565,7 +13565,7 @@ F: include/uapi/linux/nexthop.h
1356513565
F: net/ipv4/nexthop.c
1356613566

1356713567
NFC SUBSYSTEM
13568-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
13568+
M: Krzysztof Kozlowski <krzk@kernel.org>
1356913569
L: linux-nfc@lists.01.org (subscribers-only)
1357013570
L: netdev@vger.kernel.org
1357113571
S: Maintained
@@ -13879,7 +13879,7 @@ F: Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
1387913879
F: drivers/regulator/pf8x00-regulator.c
1388013880

1388113881
NXP PTN5150A CC LOGIC AND EXTCON DRIVER
13882-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
13882+
M: Krzysztof Kozlowski <krzk@kernel.org>
1388313883
L: linux-kernel@vger.kernel.org
1388413884
S: Maintained
1388513885
F: Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@ -15305,7 +15305,7 @@ F: drivers/pinctrl/renesas/
1530515305

1530615306
PIN CONTROLLER - SAMSUNG
1530715307
M: Tomasz Figa <tomasz.figa@gmail.com>
15308-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
15308+
M: Krzysztof Kozlowski <krzk@kernel.org>
1530915309
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
1531015310
R: Alim Akhtar <alim.akhtar@samsung.com>
1531115311
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -16947,7 +16947,7 @@ W: http://www.ibm.com/developerworks/linux/linux390/
1694716947
F: drivers/s390/scsi/zfcp_*
1694816948

1694916949
S3C ADC BATTERY DRIVER
16950-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
16950+
M: Krzysztof Kozlowski <krzk@kernel.org>
1695116951
L: linux-samsung-soc@vger.kernel.org
1695216952
S: Odd Fixes
1695316953
F: drivers/power/supply/s3c_adc_battery.c
@@ -16992,15 +16992,15 @@ F: Documentation/admin-guide/LSM/SafeSetID.rst
1699216992
F: security/safesetid/
1699316993

1699416994
SAMSUNG AUDIO (ASoC) DRIVERS
16995-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
16995+
M: Krzysztof Kozlowski <krzk@kernel.org>
1699616996
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
1699716997
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1699816998
S: Supported
1699916999
F: Documentation/devicetree/bindings/sound/samsung*
1700017000
F: sound/soc/samsung/
1700117001

1700217002
SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
17003-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
17003+
M: Krzysztof Kozlowski <krzk@kernel.org>
1700417004
L: linux-crypto@vger.kernel.org
1700517005
L: linux-samsung-soc@vger.kernel.org
1700617006
S: Maintained
@@ -17035,7 +17035,7 @@ S: Maintained
1703517035
F: drivers/platform/x86/samsung-laptop.c
1703617036

1703717037
SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
17038-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
17038+
M: Krzysztof Kozlowski <krzk@kernel.org>
1703917039
M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
1704017040
L: linux-kernel@vger.kernel.org
1704117041
L: linux-samsung-soc@vger.kernel.org
@@ -17061,7 +17061,7 @@ F: drivers/media/platform/s3c-camif/
1706117061
F: include/media/drv-intf/s3c_camif.h
1706217062

1706317063
SAMSUNG S3FWRN5 NFC DRIVER
17064-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
17064+
M: Krzysztof Kozlowski <krzk@kernel.org>
1706517065
M: Krzysztof Opasiak <k.opasiak@samsung.com>
1706617066
L: linux-nfc@lists.01.org (subscribers-only)
1706717067
S: Maintained
@@ -17083,7 +17083,7 @@ S: Supported
1708317083
F: drivers/media/i2c/s5k5baf.c
1708417084

1708517085
SAMSUNG S5P Security SubSystem (SSS) DRIVER
17086-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
17086+
M: Krzysztof Kozlowski <krzk@kernel.org>
1708717087
M: Vladimir Zapolskiy <vz@mleia.com>
1708817088
L: linux-crypto@vger.kernel.org
1708917089
L: linux-samsung-soc@vger.kernel.org
@@ -17118,7 +17118,7 @@ F: include/linux/clk/samsung.h
1711817118
F: include/linux/platform_data/clk-s3c2410.h
1711917119

1712017120
SAMSUNG SPI DRIVERS
17121-
M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
17121+
M: Krzysztof Kozlowski <krzk@kernel.org>
1712217122
M: Andi Shyti <andi@etezian.org>
1712317123
L: linux-spi@vger.kernel.org
1712417124
L: linux-samsung-soc@vger.kernel.org

‎arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
};
119119

120120
pinctrl_fwqspid_default: fwqspid_default {
121-
function = "FWQSPID";
121+
function = "FWSPID";
122122
groups = "FWQSPID";
123123
};
124124

‎arch/arm/boot/dts/bcm2711.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@
290290

291291
hvs: hvs@7e400000 {
292292
compatible = "brcm,bcm2711-hvs";
293+
reg = <0x7e400000 0x8000>;
293294
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
294295
};
295296

‎arch/arm/boot/dts/tegra124-nyan-big-fhd.dts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55

66
/ {
77
/* Version of Nyan Big with 1080p panel */
8-
panel {
9-
compatible = "auo,b133htn01";
8+
host1x@50000000 {
9+
dpaux@545c0000 {
10+
aux-bus {
11+
panel: panel {
12+
compatible = "auo,b133htn01";
13+
};
14+
};
15+
};
1016
};
1117
};

‎arch/arm/mach-mstar/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ menuconfig ARCH_MSTARV7
33
depends on ARCH_MULTI_V7
44
select ARM_GIC
55
select ARM_HEAVY_MB
6+
select HAVE_ARM_ARCH_TIMER
67
select MST_IRQ
78
select MSTAR_MSC313_MPLL
89
help

‎arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
aliases {
2020
spi0 = &spi0;
21+
ethernet0 = &eth0;
2122
ethernet1 = &eth1;
2223
mmc0 = &sdhci0;
2324
mmc1 = &sdhci1;
@@ -138,7 +139,9 @@
138139
/*
139140
* U-Boot port for Turris Mox has a bug which always expects that "ranges" DT property
140141
* contains exactly 2 ranges with 3 (child) address cells, 2 (parent) address cells and
141-
* 2 size cells and also expects that the second range starts at 16 MB offset. If these
142+
* 2 size cells and also expects that the second range starts at 16 MB offset. Also it
143+
* expects that first range uses same address for PCI (child) and CPU (parent) cells (so
144+
* no remapping) and that this address is the lowest from all specified ranges. If these
142145
* conditions are not met then U-Boot crashes during loading kernel DTB file. PCIe address
143146
* space is 128 MB long, so the best split between MEM and IO is to use fixed 16 MB window
144147
* for IO and the rest 112 MB (64+32+16) for MEM, despite that maximal IO size is just 64 kB.
@@ -147,6 +150,9 @@
147150
* https://source.denx.de/u-boot/u-boot/-/commit/cb2ddb291ee6fcbddd6d8f4ff49089dfe580f5d7
148151
* https://source.denx.de/u-boot/u-boot/-/commit/c64ac3b3185aeb3846297ad7391fc6df8ecd73bf
149152
* https://source.denx.de/u-boot/u-boot/-/commit/4a82fca8e330157081fc132a591ebd99ba02ee33
153+
* Bug related to requirement of same child and parent addresses for first range is fixed
154+
* in U-Boot version 2022.04 by following commit:
155+
* https://source.denx.de/u-boot/u-boot/-/commit/1fd54253bca7d43d046bba4853fe5fafd034bc17
150156
*/
151157
#address-cells = <3>;
152158
#size-cells = <2>;

‎arch/arm64/boot/dts/marvell/armada-37xx.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499
* (totaling 127 MiB) for MEM.
500500
*/
501501
ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x07f00000 /* Port 0 MEM */
502-
0x81000000 0 0xefff0000 0 0xefff0000 0 0x00010000>; /* Port 0 IO */
502+
0x81000000 0 0x00000000 0 0xefff0000 0 0x00010000>; /* Port 0 IO */
503503
interrupt-map-mask = <0 0 0 7>;
504504
interrupt-map = <0 0 0 1 &pcie_intc 0>,
505505
<0 0 0 2 &pcie_intc 1>,

0 commit comments

Comments
 (0)