Commit 83e39664 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents adccc16e 5e5eddd9

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

+3 −3
Original line number Diff line number Diff line 
What:		/sys/bus/platform/drivers/aspeed-uart-routing/*/uart*

What:		/sys/bus/platform/drivers/aspeed-uart-routing/\*/uart\*

Date:		September 2021

Contact:	Oskar Senft <osk@google.com>

		Chia-Wei Wang <chiawei_wang@aspeedtech.com>
@@ -9,7 +9,7 @@ Description: Selects the RX source of the UARTx device. 
		depends on the selected file.



		e.g.

		cat /sys/bus/platform/drivers/aspeed-uart-routing/*.uart_routing/uart1

		cat /sys/bus/platform/drivers/aspeed-uart-routing/\*.uart_routing/uart1

		[io1] io2 io3 io4 uart2 uart3 uart4 io6



		In this case, UART1 gets its input from IO1 (physical serial port 1).
@@ -17,7 +17,7 @@ Description: Selects the RX source of the UARTx device. 
Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org



What:		/sys/bus/platform/drivers/aspeed-uart-routing/*/io*

What:		/sys/bus/platform/drivers/aspeed-uart-routing/\*/io\*

Date:		September 2021

Contact:	Oskar Senft <osk@google.com>

		Chia-Wei Wang <chiawei_wang@aspeedtech.com>

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

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ Boards (incomplete list of examples): 
- OMAP3 BeagleBoard : Low cost community board

  compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3"



- OMAP3 BeagleBoard A to B4 : Early BeagleBoard revisions A to B4 with a timer quirk

  compatible = "ti,omap3-beagle-ab4", "ti,omap3-beagle", "ti,omap3430", "ti,omap3"



- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"

MAINTAINERS

+30 −4
Original line number Diff line number Diff line
@@ -1620,6 +1620,7 @@ M: Olof Johansson <olof@lixom.net> 
M:	soc@kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

C:	irc://irc.libera.chat/armlinux

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git

F:	arch/arm/boot/dts/Makefile

F:	arch/arm64/boot/dts/Makefile
@@ -1627,6 +1628,7 @@ F: arch/arm64/boot/dts/Makefile 
ARM SUB-ARCHITECTURES

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

C:	irc://irc.libera.chat/armlinux

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git

F:	arch/arm/mach-*/

F:	arch/arm/plat-*/
@@ -1780,6 +1782,7 @@ F: drivers/irqchip/irq-apple-aic.c 
F:	drivers/mailbox/apple-mailbox.c

F:	drivers/pinctrl/pinctrl-apple-gpio.c

F:	drivers/soc/apple/*

F:	drivers/watchdog/apple_wdt.c

F:	include/dt-bindings/interrupt-controller/apple-aic.h

F:	include/dt-bindings/pinctrl/apple.h

F:	include/linux/apple-mailbox.h
@@ -2570,10 +2573,13 @@ N: rockchip 








ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









C:	irc://irc.libera.chat/linux-exynos









Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git









F:	Documentation/arm/samsung/









F:	Documentation/devicetree/bindings/arm/samsung/









F:	Documentation/devicetree/bindings/power/pd-samsung.yaml








@@ -5772,7 +5778,7 @@ F:	tools/testing/selftests/dma/















DMA-BUF HEAPS FRAMEWORK









M:	Sumit Semwal <sumit.semwal@linaro.org>









R:	Benjamin Gaignard <benjamin.gaignard@linaro.org>









R:	Benjamin Gaignard <benjamin.gaignard@collabora.com>









R:	Liam Mark <lmark@codeaurora.org>









R:	Laura Abbott <labbott@redhat.com>









R:	Brian Starkey <Brian.Starkey@arm.com>








@@ -6502,7 +6508,7 @@ F:	Documentation/devicetree/bindings/display/rockchip/







F:	drivers/gpu/drm/rockchip/

















DRM DRIVERS FOR STI









M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>









M:	Alain Volmat <alain.volmat@foss.st.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm-misc








@@ -6511,8 +6517,8 @@ F:	drivers/gpu/drm/sti















DRM DRIVERS FOR STM









M:	Yannick Fertre <yannick.fertre@foss.st.com>









M:	Raphael Gallais-Pou <raphael.gallais-pou@foss.st.com>









M:	Philippe Cornu <philippe.cornu@foss.st.com>









M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm-misc








@@ -14395,6 +14401,7 @@ M:	Rob Herring <robh+dt@kernel.org>







M:	Frank Rowand <frowand.list@gmail.com>









L:	devicetree@vger.kernel.org









S:	Maintained









C:	irc://irc.libera.chat/devicetree









W:	http://www.devicetree.org/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git









F:	Documentation/ABI/testing/sysfs-firmware-ofw








@@ -14406,6 +14413,7 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS







M:	Rob Herring <robh+dt@kernel.org>









L:	devicetree@vger.kernel.org









S:	Maintained









C:	irc://irc.libera.chat/devicetree









Q:	http://patchwork.ozlabs.org/project/devicetree-bindings/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git









F:	Documentation/devicetree/








@@ -15296,9 +15304,11 @@ PIN CONTROLLER - SAMSUNG







M:	Tomasz Figa <tomasz.figa@gmail.com>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









C:	irc://irc.libera.chat/linux-exynos









Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git









F:	Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt








@@ -17095,6 +17105,7 @@ SAMSUNG SOC CLOCK DRIVERS







M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









M:	Tomasz Figa <tomasz.figa@gmail.com>









M:	Chanwoo Choi <cw00.choi@samsung.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-samsung-soc@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git








@@ -17731,6 +17742,21 @@ S:	Maintained







W:	http://www.winischhofer.at/linuxsisusbvga.shtml









F:	drivers/usb/misc/sisusbvga/

















SL28 CPLD MFD DRIVER









M:	Michael Walle <michael@walle.cc>









S:	Maintained









F:	Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml









F:	Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml









F:	Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml









F:	Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml









F:	Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml









F:	Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml









F:	drivers/gpio/gpio-sl28cpld.c









F:	drivers/hwmon/sl28cpld-hwmon.c









F:	drivers/irqchip/irq-sl28cpld.c









F:	drivers/pwm/pwm-sl28cpld.c









F:	drivers/watchdog/sl28cpld_wdt.c

















SLAB ALLOCATOR









M:	Christoph Lameter <cl@linux.com>









M:	Pekka Enberg <penberg@kernel.org>








@@ -18447,7 +18473,7 @@ F:	Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt







F:	sound/soc/sti/

















STI CEC DRIVER









M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>









M:	Alain Volmat <alain.volmat@foss.st.com>









S:	Maintained









F:	Documentation/devicetree/bindings/media/stih-cec.txt









F:	drivers/media/cec/platform/sti/

























arch/arm/boot/dts/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -806,6 +806,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \







	logicpd-som-lv-37xx-devkit.dtb \









	omap3430-sdp.dtb \









	omap3-beagle.dtb \









	omap3-beagle-ab4.dtb \









	omap3-beagle-xm.dtb \









	omap3-beagle-xm-ab.dtb \









	omap3-cm-t3517.dtb \
































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



+1
−1






























Original line number
Diff line number
Diff line







@@ -55,7 +55,7 @@







		2 1 0 0 /* # 0: INACTIVE, 1: TX, 2: RX */









	>;









	tx-num-evt = <16>;









	rt-num-evt = <16>;









	rx-num-evt = <16>;









	status = "okay";









};