Skip to content

Commit 83e3966

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "This is a fairly large set of bugfixes, most of which had been sent a while ago but only now made it into the soc tree: Maintainer file updates: - Claudiu Beznea now co-maintains the at91 soc family, replacing Ludovic Desroches. - Michael Walle maintains the sl28cpld drivers - Alain Volmat and Raphael Gallais-Pou take over some drivers for ST platforms - Alim Akhtar is an additional reviewer for Samsung platforms Code fixes: - Op-tee had a problem with object lifetime that needs a slightly complex fix, as well as another bug with error handling. - Several minor issues for the OMAP platform, including a regression with the timer - A Kconfig change to fix a build-time issue on Intel SoCFPGA Device tree fixes: - The Amlogic Meson platform fixes a boot regression on am1-odroid, a spurious interrupt, and a problem with reserved memory regions - In the i.MX platform, several bug fixes are needed to make devices work correctly: SD card detection, alarmtimer, and sound card on some board. One patch for the GPU got in there by accident and gets reverted again. - TI K3 needs a fix for J721S2 serial port numbers - ux500 needs a fix to mount the SD card as root on the Skomer phone" * tag 'soc-fixes-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (46 commits) Revert "arm64: dts: imx8mn-venice-gw7902: disable gpu" arm64: Remove ARCH_VULCAN MAINTAINERS: add myself as a maintainer for the sl28cpld MAINTAINERS: add IRC to ARM sub-architectures and Devicetree MAINTAINERS: arm: samsung: add Git tree and IRC ARM: dts: Fix boot regression on Skomer ARM: dts: spear320: Drop unused and undocumented 'irq-over-gpio' property soc: aspeed: lpc-ctrl: Block error printing on probe defer cases docs/ABI: testing: aspeed-uart-routing: Escape asterisk MAINTAINERS: update drm/stm drm/sti and cec/sti maintainers MAINTAINERS: Update Benjamin Gaignard maintainer status ARM: socfpga: fix missing RESET_CONTROLLER arm64: dts: meson-sm1-odroid: fix boot loop after reboot arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 arm64: dts: meson-g12: add ATF BL32 reserved-memory region arm64: dts: meson-gx: add ATF BL32 reserved-memory region arm64: dts: meson-sm1-bananapi-m5: fix wrong GPIO domain for GPIOE_2 arm64: dts: meson-sm1-odroid: use correct enable-gpio pin for tf-io regulator arm64: dts: meson-g12b-odroid-n2: fix typo 'dio2133' optee: use driver internal tee_context for some rpc ...
2 parents adccc16 + 5e5eddd commit 83e3966

Some content is hidden

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

42 files changed

+263
-238
lines changed

‎Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/bus/platform/drivers/aspeed-uart-routing/*/uart*
1+
What: /sys/bus/platform/drivers/aspeed-uart-routing/\*/uart\*
22
Date: September 2021
33
Contact: Oskar Senft <[email protected]>
44
Chia-Wei Wang <[email protected]>
@@ -9,15 +9,15 @@ Description: Selects the RX source of the UARTx device.
99
depends on the selected file.
1010

1111
e.g.
12-
cat /sys/bus/platform/drivers/aspeed-uart-routing/*.uart_routing/uart1
12+
cat /sys/bus/platform/drivers/aspeed-uart-routing/\*.uart_routing/uart1
1313
[io1] io2 io3 io4 uart2 uart3 uart4 io6
1414

1515
In this case, UART1 gets its input from IO1 (physical serial port 1).
1616

1717
Users: OpenBMC. Proposed changes should be mailed to
1818
[email protected]
1919

20-
What: /sys/bus/platform/drivers/aspeed-uart-routing/*/io*
20+
What: /sys/bus/platform/drivers/aspeed-uart-routing/\*/io\*
2121
Date: September 2021
2222
Contact: Oskar Senft <[email protected]>
2323
Chia-Wei Wang <[email protected]>

‎Documentation/devicetree/bindings/arm/omap/omap.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ Boards (incomplete list of examples):
119119
- OMAP3 BeagleBoard : Low cost community board
120120
compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3"
121121

122+
- OMAP3 BeagleBoard A to B4 : Early BeagleBoard revisions A to B4 with a timer quirk
123+
compatible = "ti,omap3-beagle-ab4", "ti,omap3-beagle", "ti,omap3430", "ti,omap3"
124+
122125
- OMAP3 Tobi with Overo : Commercial expansion board with daughter board
123126
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"
124127

‎MAINTAINERS

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,13 +1620,15 @@ M: Olof Johansson <[email protected]>
16201620
M: [email protected]
16211621
L: [email protected] (moderated for non-subscribers)
16221622
S: Maintained
1623+
C: irc://irc.libera.chat/armlinux
16231624
T: git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
16241625
F: arch/arm/boot/dts/Makefile
16251626
F: arch/arm64/boot/dts/Makefile
16261627

16271628
ARM SUB-ARCHITECTURES
16281629
L: [email protected] (moderated for non-subscribers)
16291630
S: Maintained
1631+
C: irc://irc.libera.chat/armlinux
16301632
T: git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
16311633
F: arch/arm/mach-*/
16321634
F: arch/arm/plat-*/
@@ -1780,6 +1782,7 @@ F: drivers/irqchip/irq-apple-aic.c
17801782
F: drivers/mailbox/apple-mailbox.c
17811783
F: drivers/pinctrl/pinctrl-apple-gpio.c
17821784
F: drivers/soc/apple/*
1785+
F: drivers/watchdog/apple_wdt.c
17831786
F: include/dt-bindings/interrupt-controller/apple-aic.h
17841787
F: include/dt-bindings/pinctrl/apple.h
17851788
F: include/linux/apple-mailbox.h
@@ -2570,10 +2573,13 @@ N: rockchip
25702573

25712574
ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
25722575
M: Krzysztof Kozlowski <[email protected]>
2576+
R: Alim Akhtar <[email protected]>
25732577
L: [email protected] (moderated for non-subscribers)
25742578
L: [email protected]
25752579
S: Maintained
2580+
C: irc://irc.libera.chat/linux-exynos
25762581
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
2582+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
25772583
F: Documentation/arm/samsung/
25782584
F: Documentation/devicetree/bindings/arm/samsung/
25792585
F: Documentation/devicetree/bindings/power/pd-samsung.yaml
@@ -5772,7 +5778,7 @@ F: tools/testing/selftests/dma/
57725778

57735779
DMA-BUF HEAPS FRAMEWORK
57745780
M: Sumit Semwal <[email protected]>
5775-
R: Benjamin Gaignard <benjamin.gaignard@linaro.org>
5781+
R: Benjamin Gaignard <benjamin.gaignard@collabora.com>
57765782
R: Liam Mark <[email protected]>
57775783
R: Laura Abbott <[email protected]>
57785784
R: Brian Starkey <[email protected]>
@@ -6502,7 +6508,7 @@ F: Documentation/devicetree/bindings/display/rockchip/
65026508
F: drivers/gpu/drm/rockchip/
65036509

65046510
DRM DRIVERS FOR STI
6505-
M: Benjamin Gaignard <[email protected]>
6511+
M: Alain Volmat <[email protected]>
65066512
L: [email protected]
65076513
S: Maintained
65086514
T: git git://anongit.freedesktop.org/drm/drm-misc
@@ -6511,8 +6517,8 @@ F: drivers/gpu/drm/sti
65116517

65126518
DRM DRIVERS FOR STM
65136519
M: Yannick Fertre <[email protected]>
6520+
M: Raphael Gallais-Pou <[email protected]>
65146521
M: Philippe Cornu <[email protected]>
6515-
M: Benjamin Gaignard <[email protected]>
65166522
L: [email protected]
65176523
S: Maintained
65186524
T: git git://anongit.freedesktop.org/drm/drm-misc
@@ -14395,6 +14401,7 @@ M: Rob Herring <[email protected]>
1439514401
M: Frank Rowand <[email protected]>
1439614402
L: [email protected]
1439714403
S: Maintained
14404+
C: irc://irc.libera.chat/devicetree
1439814405
W: http://www.devicetree.org/
1439914406
T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
1440014407
F: Documentation/ABI/testing/sysfs-firmware-ofw
@@ -14406,6 +14413,7 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
1440614413
M: Rob Herring <[email protected]>
1440714414
L: [email protected]
1440814415
S: Maintained
14416+
C: irc://irc.libera.chat/devicetree
1440914417
Q: http://patchwork.ozlabs.org/project/devicetree-bindings/list/
1441014418
T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
1441114419
F: Documentation/devicetree/
@@ -15296,9 +15304,11 @@ PIN CONTROLLER - SAMSUNG
1529615304
M: Tomasz Figa <[email protected]>
1529715305
M: Krzysztof Kozlowski <[email protected]>
1529815306
M: Sylwester Nawrocki <[email protected]>
15307+
R: Alim Akhtar <[email protected]>
1529915308
L: [email protected] (moderated for non-subscribers)
1530015309
L: [email protected]
1530115310
S: Maintained
15311+
C: irc://irc.libera.chat/linux-exynos
1530215312
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
1530315313
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
1530415314
F: Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
@@ -17095,6 +17105,7 @@ SAMSUNG SOC CLOCK DRIVERS
1709517105
M: Sylwester Nawrocki <[email protected]>
1709617106
M: Tomasz Figa <[email protected]>
1709717107
M: Chanwoo Choi <[email protected]>
17108+
R: Alim Akhtar <[email protected]>
1709817109
L: [email protected]
1709917110
S: Supported
1710017111
T: git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
@@ -17731,6 +17742,21 @@ S: Maintained
1773117742
W: http://www.winischhofer.at/linuxsisusbvga.shtml
1773217743
F: drivers/usb/misc/sisusbvga/
1773317744

17745+
SL28 CPLD MFD DRIVER
17746+
M: Michael Walle <[email protected]>
17747+
S: Maintained
17748+
F: Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
17749+
F: Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
17750+
F: Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml
17751+
F: Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml
17752+
F: Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml
17753+
F: Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml
17754+
F: drivers/gpio/gpio-sl28cpld.c
17755+
F: drivers/hwmon/sl28cpld-hwmon.c
17756+
F: drivers/irqchip/irq-sl28cpld.c
17757+
F: drivers/pwm/pwm-sl28cpld.c
17758+
F: drivers/watchdog/sl28cpld_wdt.c
17759+
1773417760
SLAB ALLOCATOR
1773517761
M: Christoph Lameter <[email protected]>
1773617762
M: Pekka Enberg <[email protected]>
@@ -18447,7 +18473,7 @@ F: Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
1844718473
F: sound/soc/sti/
1844818474

1844918475
STI CEC DRIVER
18450-
M: Benjamin Gaignard <[email protected]>
18476+
M: Alain Volmat <[email protected]>
1845118477
S: Maintained
1845218478
F: Documentation/devicetree/bindings/media/stih-cec.txt
1845318479
F: drivers/media/cec/platform/sti/

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
806806
logicpd-som-lv-37xx-devkit.dtb \
807807
omap3430-sdp.dtb \
808808
omap3-beagle.dtb \
809+
omap3-beagle-ab4.dtb \
809810
omap3-beagle-xm.dtb \
810811
omap3-beagle-xm-ab.dtb \
811812
omap3-cm-t3517.dtb \

‎arch/arm/boot/dts/am335x-wega.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
2 1 0 0 /* # 0: INACTIVE, 1: TX, 2: RX */
5656
>;
5757
tx-num-evt = <16>;
58-
rt-num-evt = <16>;
58+
rx-num-evt = <16>;
5959
status = "okay";
6060
};
6161

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
target-module@48210000 {
161161
compatible = "ti,sysc-omap4-simple", "ti,sysc";
162162
power-domains = <&prm_mpu>;
163-
clocks = <&mpu_clkctrl DRA7_MPU_CLKCTRL 0>;
163+
clocks = <&mpu_clkctrl DRA7_MPU_MPU_CLKCTRL 0>;
164164
clock-names = "fck";
165165
#address-cells = <1>;
166166
#size-cells = <1>;
@@ -875,10 +875,10 @@
875875
<0x58000014 4>;
876876
reg-names = "rev", "syss";
877877
ti,syss-mask = <1>;
878-
clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 0>,
879-
<&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,
880-
<&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 10>,
881-
<&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 11>;
878+
clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 0>,
879+
<&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 9>,
880+
<&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 10>,
881+
<&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 11>;
882882
clock-names = "fck", "hdmi_clk", "sys_clk", "tv_clk";
883883
#address-cells = <1>;
884884
#size-cells = <1>;
@@ -912,7 +912,7 @@
912912
SYSC_OMAP2_SOFTRESET |
913913
SYSC_OMAP2_AUTOIDLE)>;
914914
ti,syss-mask = <1>;
915-
clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 8>;
915+
clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>;
916916
clock-names = "fck";
917917
#address-cells = <1>;
918918
#size-cells = <1>;
@@ -939,8 +939,8 @@
939939
<SYSC_IDLE_SMART>,
940940
<SYSC_IDLE_SMART_WKUP>;
941941
ti,sysc-mask = <(SYSC_OMAP4_SOFTRESET)>;
942-
clocks = <&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 9>,
943-
<&dss_clkctrl DRA7_DSS_CORE_CLKCTRL 8>;
942+
clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 9>,
943+
<&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 8>;
944944
clock-names = "fck", "dss_clk";
945945
#address-cells = <1>;
946946
#size-cells = <1>;
@@ -979,7 +979,7 @@
979979
compatible = "vivante,gc";
980980
reg = <0x0 0x700>;
981981
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
982-
clocks = <&dss_clkctrl DRA7_BB2D_CLKCTRL 0>;
982+
clocks = <&dss_clkctrl DRA7_DSS_BB2D_CLKCTRL 0>;
983983
clock-names = "core";
984984
};
985985
};
@@ -1333,7 +1333,7 @@
13331333
ti,no-reset-on-init;
13341334
ti,no-idle;
13351335
timer@0 {
1336-
assigned-clocks = <&wkupaon_clkctrl DRA7_TIMER1_CLKCTRL 24>;
1336+
assigned-clocks = <&wkupaon_clkctrl DRA7_WKUPAON_TIMER1_CLKCTRL 24>;
13371337
assigned-clock-parents = <&sys_32k_ck>;
13381338
};
13391339
};

‎arch/arm/boot/dts/imx23-evk.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
MX23_PAD_LCD_RESET__GPIO_1_18
8080
MX23_PAD_PWM3__GPIO_1_29
8181
MX23_PAD_PWM4__GPIO_1_30
82-
MX23_PAD_SSP1_DETECT__SSP1_DETECT
8382
>;
8483
fsl,drive-strength = <MXS_DRIVE_4mA>;
8584
fsl,voltage = <MXS_VOLTAGE_HIGH>;

‎arch/arm/boot/dts/imx6qdl-udoo.dtsi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* Author: Fabio Estevam <[email protected]>
66
*/
77

8+
#include <dt-bindings/gpio/gpio.h>
9+
810
/ {
911
aliases {
1012
backlight = &backlight;
@@ -226,6 +228,7 @@
226228
MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
227229
MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
228230
MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
231+
MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0
229232
>;
230233
};
231234

@@ -304,7 +307,7 @@
304307
&usdhc3 {
305308
pinctrl-names = "default";
306309
pinctrl-0 = <&pinctrl_usdhc3>;
307-
non-removable;
310+
cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
308311
status = "okay";
309312
};
310313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
260260
clocks = <&pcc2 IMX7ULP_CLK_WDG1>;
261261
assigned-clocks = <&pcc2 IMX7ULP_CLK_WDG1>;
262-
assigned-clocks-parents = <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>;
262+
assigned-clock-parents = <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>;
263263
timeout-sec = <40>;
264264
};
265265

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
};
6060

6161
uart_A: serial@84c0 {
62-
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
62+
compatible = "amlogic,meson6-uart";
6363
reg = <0x84c0 0x18>;
6464
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
6565
fifo-size = <128>;
6666
status = "disabled";
6767
};
6868

6969
uart_B: serial@84dc {
70-
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
70+
compatible = "amlogic,meson6-uart";
7171
reg = <0x84dc 0x18>;
7272
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
7373
status = "disabled";
@@ -105,7 +105,7 @@
105105
};
106106

107107
uart_C: serial@8700 {
108-
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
108+
compatible = "amlogic,meson6-uart";
109109
reg = <0x8700 0x18>;
110110
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
111111
status = "disabled";
@@ -228,7 +228,7 @@
228228
};
229229

230230
uart_AO: serial@4c0 {
231-
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";
231+
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart";
232232
reg = <0x4c0 0x18>;
233233
interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
234234
status = "disabled";

0 commit comments

Comments
 (0)