Commit ba816d3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Only a small number of fixes so far, including some that I had applied
  during the merge window, so this is based on the original merge of the
  other branches.

   - The largest change is a fix for a reference counting bug in the AMD
     TEE driver.

   - Neil Armstrong now co-maintains Amlogic SoC support

   - Two build warning fixes for renesas device tree files

   - A sign expansion bug for optee

   - A DT binding fix for a mismerge"

* tag 'arm-soc-fixes-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: npcm: wpcm450: select interrupt controller driver
  MAINTAINERS: ARM/Amlogic SoCs: add Neil as primary maintainer
  tee: amdtee: unload TA only when its refcount becomes 0
  dt-bindings: nvmem: mediatek: remove duplicate mt8192 line
  firmware: arm_scmi: Remove duplicate declaration of struct scmi_protocol_handle
  firmware: arm_scpi: Prevent the ternary sign expansion bug
  arm64: dts: renesas: Add port@0 node for all CSI-2 nodes to dtsi
  arm64: dts: renesas: aistarvision-mipi-adapter-2.1: Fix CSI40 ports
parents 921dd235 d37316b7

Documentation/devicetree/bindings/nvmem/mtk-efuse.txt

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ Required properties: 
	      "mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173

	      "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192

	      "mediatek,mt8516-efuse", "mediatek,efuse": for MT8516

	      "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192

- reg: Should contain registers location and length



= Data cells =

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1618,8 +1618,8 @@ F: Documentation/devicetree/bindings/sound/amlogic* 
F:	sound/soc/meson/









ARM/Amlogic Meson SoC support









M:	Neil Armstrong <narmstrong@baylibre.com>









M:	Kevin Hilman <khilman@baylibre.com>









R:	Neil Armstrong <narmstrong@baylibre.com>









R:	Jerome Brunet <jbrunet@baylibre.com>









R:	Martin Blumenstingl <martin.blumenstingl@googlemail.com>









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
































arch/arm/mach-npcm/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -10,6 +10,7 @@ config ARCH_WPCM450







	bool "Support for WPCM450 BMC (Hermon)"









	depends on ARCH_MULTI_V5









	select CPU_ARM926T









	select WPCM450_AIC









	select NPCM7XX_TIMER









	help









	  General support for WPCM450 BMC (Hermon).
































arch/arm64/boot/dts/renesas/hihope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi



+0
−2






























Original line number
Diff line number
Diff line







@@ -14,7 +14,6 @@

















	ports {









		port@0 {









			reg = <0>;









			csi20_in: endpoint {









				clock-lanes = <0>;









				data-lanes = <1 2>;








@@ -29,7 +28,6 @@

















	ports {









		port@0 {









			reg = <0>;









			csi40_in: endpoint {









				clock-lanes = <0>;









				data-lanes = <1 2>;
































arch/arm64/boot/dts/renesas/r8a774a1.dtsi



+8
−0






























Original line number
Diff line number
Diff line







@@ -2573,6 +2573,10 @@







				#address-cells = <1>;









				#size-cells = <0>;



















				port@0 {









					reg = <0>;









				};



















				port@1 {









					#address-cells = <1>;









					#size-cells = <0>;








@@ -2628,6 +2632,10 @@







				#address-cells = <1>;









				#size-cells = <0>;



















				port@0 {









					reg = <0>;









				};



















				port@1 {









					#address-cells = <1>;









					#size-cells = <0>;