Commit 1709b887 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "A number of fixes have accumulated, but they are largely for harmless
  issues:

   - Several OF node leak fixes

   - A fix to the Exynos7885 UART clock description

   - DTS fixes to prevent boot failures on TI AM64 and J721s2

   - Bus probe error handling fixes for Baikal-T1

   - A fixup to the way STM32 SoCs use separate dts files for different
     firmware stacks

   - Multiple code fixes for Arm SCMI firmware, all dealing with
     robustness of the implementation

   - Multiple NXP i.MX devicetree fixes, addressing incorrect data in DT
     nodes

   - Three updates to the MAINTAINERS file, including Florian Fainelli
     taking over BCM283x/BCM2711 (Raspberry Pi) from Nicolas Saenz
     Julienne"

* tag 'soc-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits)
  ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom
  arm: mach-spear: Add missing of_node_put() in time.c
  ARM: cns3xxx: Fix refcount leak in cns3xxx_init
  MAINTAINERS: Update email address
  arm64: dts: ti: k3-am64-main: Remove support for HS400 speed mode
  arm64: dts: ti: k3-j721s2: Fix overlapping GICD memory region
  ARM: dts: bcm2711-rpi-400: Fix GPIO line names
  bus: bt1-axi: Don't print error on -EPROBE_DEFER
  bus: bt1-apb: Don't print error on -EPROBE_DEFER
  ARM: Fix refcount leak in axxia_boot_secondary
  ARM: dts: stm32: move SCMI related nodes in a dedicated file for stm32mp15
  soc: imx: imx8m-blk-ctrl: fix display clock for LCDIF2 power domain
  ARM: dts: imx6qdl-colibri: Fix capacitive touch reset polarity
  ARM: dts: imx6qdl: correct PU regulator ramp delay
  firmware: arm_scmi: Fix incorrect error propagation in scmi_voltage_descriptors_get
  firmware: arm_scmi: Avoid using extended string-buffers sizes if not necessary
  firmware: arm_scmi: Fix SENSOR_AXIS_NAME_GET behaviour when unsupported
  ARM: dts: imx7: Move hsic_phy power domain to HSIC PHY node
  soc: bcm: brcmstb: pm: pm-arm: Fix refcount leak in brcmstb_pm_probe
  MAINTAINERS: Update BCM2711/BCM2835 maintainer
  ...
parents 413c1f14 7f058112

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -2469,6 +2469,7 @@ ARM/NXP S32G ARCHITECTURE 
M:	Chester Lin <clin@suse.com>

R:	Andreas Färber <afaerber@suse.de>

R:	Matthias Brugger <mbrugger@suse.com>

R:	NXP S32 Linux Team <s32@nxp.com>

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

S:	Maintained

F:	arch/arm64/boot/dts/freescale/s32g*.dts*
@@ -3812,12 +3813,12 @@ N: bcmbca 
N:	bcm[9]?47622









BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE









M:	Nicolas Saenz Julienne <nsaenz@kernel.org>









M:	Florian Fainelli <f.fainelli@gmail.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









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









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









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git









T:	git git://github.com/broadcom/stblinux.git









F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml









F:	drivers/pci/controller/pcie-brcmstb.c









F:	drivers/staging/vc04_services








@@ -16536,7 +16537,7 @@ F:	Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml







F:	drivers/cpufreq/qcom-cpufreq-nvmem.c

















QUALCOMM CRYPTO DRIVERS









M:	Thara Gopinath <thara.gopinath@linaro.org>









M:	Thara Gopinath <thara.gopinath@gmail.com>









L:	linux-crypto@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained








@@ -16647,7 +16648,7 @@ F:	include/linux/if_rmnet.h















QUALCOMM TSENS THERMAL DRIVER









M:	Amit Kucheria <amitk@kernel.org>









M:	Thara Gopinath <thara.gopinath@linaro.org>









M:	Thara Gopinath <thara.gopinath@gmail.com>









L:	linux-pm@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained
































arch/arm/boot/dts/Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -1586,7 +1586,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \







	aspeed-bmc-lenovo-hr630.dtb \









	aspeed-bmc-lenovo-hr855xg2.dtb \









	aspeed-bmc-microsoft-olympus.dtb \









	aspeed-bmc-nuvia-dc-scm.dtb \









	aspeed-bmc-opp-lanyang.dtb \









	aspeed-bmc-opp-mihawk.dtb \









	aspeed-bmc-opp-mowgli.dtb \








@@ -1599,6 +1598,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \







	aspeed-bmc-opp-witherspoon.dtb \









	aspeed-bmc-opp-zaius.dtb \









	aspeed-bmc-portwell-neptune.dtb \









	aspeed-bmc-qcom-dc-scm-v1.dtb \









	aspeed-bmc-quanta-q71l.dtb \









	aspeed-bmc-quanta-s6q.dtb \









	aspeed-bmc-supermicro-x11spi.dtb \
































arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts→arch/arm/boot/dts/aspeed-bmc-qcom-dc-scm-v1.dts



+2
−2






























Original line number
Diff line number
Diff line







@@ -6,8 +6,8 @@







#include "aspeed-g6.dtsi"



















/ {









	model = "Nuvia DC-SCM BMC";









	compatible = "nuvia,dc-scm-bmc", "aspeed,ast2600";









	model = "Qualcomm DC-SCM V1 BMC";









	compatible = "qcom,dc-scm-v1-bmc", "aspeed,ast2600";



















	aliases {









		serial4 = &uart5;
































arch/arm/boot/dts/bcm2711-rpi-400.dts



+3
−3






























Original line number
Diff line number
Diff line







@@ -28,12 +28,12 @@







&expgpio {









	gpio-line-names = "BT_ON",









			  "WL_ON",









			  "",









			  "PWR_LED_OFF",









			  "GLOBAL_RESET",









			  "VDD_SD_IO_SEL",









			  "CAM_GPIO",









			  "GLOBAL_SHUTDOWN",









			  "SD_PWR_ON",









			  "SD_OC_N";









			  "SHUTDOWN_REQUEST";









};



















&genet_mdio {
































arch/arm/boot/dts/imx6qdl-colibri.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -593,7 +593,7 @@







		pinctrl-names = "default";









		pinctrl-0 = <&pinctrl_atmel_conn>;









		reg = <0x4a>;









		reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;	/* SODIMM 106 */









		reset-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;	/* SODIMM 106 */









		status = "disabled";









	};









};