Commit 49c13ed0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "This should be the last set of bugfixes in the SoC tree:

   - Two fixes for Arm integrator, dealing with a regression caused by
     invalid DT properties combined with a change in dma address
     translation, and missing device_type annotations on the PCI bus

   - Fixes for drivers/reset/, addressing bugs in i.MX8MP, Sparx5 and
     NPCM8XX platforms

   - Bjorn Andersson's email address changes in the MAINTAINERS file

   - Multiple minor fixes to Qualcomm dts files, and a change to the
     remoteproc firmware filename that did not match the actual path in
     the linux-firmware package

   - Minor code fixes for the Allwinner/sunxi SRAM driver, and the
     broadcom STB Bus Interface Unit driver

   - A build fix for the sunplus sp7021 platform

   - Two dts fixes for TI OMAP family SoCs, addressing an extraneous
     usb4 device node and an incorrect DMA handle"

* tag 'soc-fixes-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: integrator: Fix DMA ranges
  ARM: dts: integrator: Tag PCI host with device_type
  ARM: sunplus: fix serial console kconfig and build problems
  reset: npcm: fix iprst2 and iprst4 setting
  arm64: dts: qcom: sm8350: fix UFS PHY serdes size
  soc: bcm: brcmstb: biuctrl: Avoid double of_node_put()
  arm64: dts: qcom: sc8280xp-x13s: Update firmware location
  soc: sunxi: sram: Fix debugfs info for A64 SRAM C
  soc: sunxi: sram: Fix probe function ordering issues
  soc: sunxi: sram: Prevent the driver from being unbound
  soc: sunxi: sram: Actually claim SRAM regions
  ARM: dts: am5748: keep usb4_tm disabled
  reset: microchip-sparx5: issue a reset on startup
  reset: imx7: Fix the iMX8MP PCIe PHY PERST support
  MAINTAINERS: Update Bjorn's email address
  arm64: dts: qcom: sc7280: move USB wakeup-source property
  arm64: dts: qcom: thinkpad-x13s: Fix firmware location
  arm64: dts: qcom: sm8150: Fix fastrpc iommu values
  ARM: dts: am33xx: Fix MMCHS0 dma properties
parents 46452d37 7bea67a9

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ Ben M Cahill <ben.m.cahill@intel.com> 
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>

MAINTAINERS

+6 −6
Original line number Diff line number Diff line
@@ -2579,7 +2579,7 @@ W: http://www.armlinux.org.uk/ 








ARM/QUALCOMM SUPPORT









M:	Andy Gross <agross@kernel.org>









M:	Bjorn Andersson <bjorn.andersson@linaro.org>









M:	Bjorn Andersson <andersson@kernel.org>









R:	Konrad Dybcio <konrad.dybcio@somainline.org>









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









S:	Maintained










@@ -8944,7 +8944,7 @@ F:	include/linux/hw_random.h















HARDWARE SPINLOCK CORE









M:	Ohad Ben-Cohen <ohad@wizery.com>









M:	Bjorn Andersson <bjorn.andersson@linaro.org>









M:	Bjorn Andersson <andersson@kernel.org>









R:	Baolin Wang <baolin.wang7@gmail.com>









L:	linux-remoteproc@vger.kernel.org









S:	Maintained










@@ -16126,7 +16126,7 @@ F:	drivers/gpio/gpio-sama5d2-piobu.c







F:	drivers/pinctrl/pinctrl-at91*

















PIN CONTROLLER - QUALCOMM









M:	Bjorn Andersson <bjorn.andersson@linaro.org>









M:	Bjorn Andersson <andersson@kernel.org>









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









S:	Maintained









F:	Documentation/devicetree/bindings/pinctrl/qcom,*.txt










@@ -16819,7 +16819,7 @@ F:	Documentation/devicetree/bindings/media/*camss*







F:	drivers/media/platform/qcom/camss/

















QUALCOMM CLOCK DRIVERS









M:	Bjorn Andersson <bjorn.andersson@linaro.org>









M:	Bjorn Andersson <andersson@kernel.org>









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









S:	Supported









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










@@ -17309,7 +17309,7 @@ S:	Supported







F:	fs/reiserfs/

















REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM









M:	Bjorn Andersson <bjorn.andersson@linaro.org>









M:	Bjorn Andersson <andersson@kernel.org>









M:	Mathieu Poirier <mathieu.poirier@linaro.org>









L:	linux-remoteproc@vger.kernel.org









S:	Maintained










@@ -17322,7 +17322,7 @@ F:	include/linux/remoteproc.h







F:	include/linux/remoteproc/

















REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM









M:	Bjorn Andersson <bjorn.andersson@linaro.org>









M:	Bjorn Andersson <andersson@kernel.org>









M:	Mathieu Poirier <mathieu.poirier@linaro.org>









L:	linux-remoteproc@vger.kernel.org









S:	Maintained

























arch/arm/boot/dts/am33xx-l4.dtsi



+1
−2






























Original line number
Diff line number
Diff line







@@ -1502,8 +1502,7 @@ SYSC_OMAP2_SOFTRESET |







			mmc1: mmc@0 {









				compatible = "ti,am335-sdhci";









				ti,needs-special-reset;









				dmas = <&edma_xbar 24 0 0









					&edma_xbar 25 0 0>;









				dmas = <&edma 24 0>, <&edma 25 0>;









				dma-names = "tx", "rx";









				interrupts = <64>;









				reg = <0x0 0x1000>;


































arch/arm/boot/dts/am5748.dtsi



+4
−0






























Original line number
Diff line number
Diff line







@@ -25,6 +25,10 @@ &usb3_tm {







	status = "disabled";









};



















&usb4_tm {









	status = "disabled";









};



















&atl_tm {









	status = "disabled";









};
























arch/arm/boot/dts/integratorap-im-pd1.dts



+1
−0






























Original line number
Diff line number
Diff line







@@ -249,6 +249,7 @@ display@1000000 {







		/* 640x480 16bpp @ 25.175MHz is 36827428 bytes/s */









		max-memory-bandwidth = <40000000>;









		memory-region = <&impd1_ram>;









		dma-ranges;



















		port@0 {









			#address-cells = <1>;