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

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Here are a couple of bug fixes, mostly for devicetree files

  NXP i.MX:
   - Use correct voltage on some i.MX8M board device trees to avoid
     hardware damage
   - Code fixes for a compiler warning and incorrect reference counting,
     both harmless.
   - Fix the i.MX8M SoC driver to correctly identify imx8mp
   - Fix watchdog configuration in imx6ul-kontron device tree.

  Broadcom:
   - A small regression fix for the Raspberry-Pi firmware driver
   - A Kconfig change to use the correct timer driver on Northstar
   - A DT fix for the Luxul XWC-2000 machine
   - Two more DT fixes for NSP SoCs

  STmicroelectronics STI
   - Revert one broken patch for L2 cache configuration

  ARM Versatile Express:
   - Fix a regression by reverting a broken DT cleanup

  TEE drivers:
   - MAINTAINERS: change tee mailing list"

* tag 'arm-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  Revert "ARM: sti: Implement dummy L2 cache's write_sec"
  soc: imx8m: fix build warning
  ARM: imx6: add missing put_device() call in imx6q_suspend_init()
  ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
  soc: imx8m: Correct i.MX8MP UID fuse offset
  ARM: dts: imx6ul-kontron: Change WDOG_ANY signal from push-pull to open-drain
  ARM: dts: imx6ul-kontron: Move watchdog from Kontron i.MX6UL/ULL board to SoM
  arm64: dts: imx8mm-beacon: Fix voltages on LDO1 and LDO2
  arm64: dts: imx8mn-ddr4-evk: correct ldo1/ldo2 voltage range
  arm64: dts: imx8mm-evk: correct ldo1/ldo2 voltage range
  ARM: dts: NSP: Correct FA2 mailbox node
  ARM: bcm2835: Fix integer overflow in rpi_firmware_print_firmware_revision()
  MAINTAINERS: change tee mailing list
  ARM: dts: NSP: Disable PL330 by default, add dma-coherent property
  ARM: bcm: Select ARM_TIMER_SP804 for ARCH_BCM_NSP
  ARM: dts: BCM5301X: Add missing memory "device_type" for Luxul XWC-2000
  arm: dts: vexpress: Move mcc node back into motherboard node
parents 668f532d 42d3f7e8

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -12695,13 +12695,13 @@ F: arch/mips/boot/dts/ralink/omega2p.dts 














OP-TEE DRIVER















M:	Jens Wiklander <jens.wiklander@linaro.org>













L:	tee-dev@lists.linaro.org













L:	op-tee@lists.trustedfirmware.org















S:	Maintained















F:	drivers/tee/optee/





























OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER















M:	Sumit Garg <sumit.garg@linaro.org>













L:	tee-dev@lists.linaro.org













L:	op-tee@lists.trustedfirmware.org















S:	Maintained















F:	drivers/char/hw_random/optee-rng.c
























@@ -16774,7 +16774,7 @@ F:	include/media/i2c/tw9910.h



























TEE SUBSYSTEM















M:	Jens Wiklander <jens.wiklander@linaro.org>













L:	tee-dev@lists.linaro.org













L:	op-tee@lists.trustedfirmware.org















S:	Maintained















F:	Documentation/tee.txt















F:	drivers/tee/

































arch/arm/boot/dts/bcm-nsp.dtsi



+6
−4






























Original line number
Diff line number
Diff line








@@ -200,7 +200,7 @@













			status = "disabled";















		};





























		dma@20000 {













		dma: dma@20000 {















			compatible = "arm,pl330", "arm,primecell";















			reg = <0x20000 0x1000>;















			interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,









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













			clocks = <&iprocslow>;















			clock-names = "apb_pclk";















			#dma-cells = <1>;













			dma-coherent;













			status = "disabled";















		};































		sdio: sdhci@21000 {










@@ -257,10 +259,10 @@













			status = "disabled";















		};





























		mailbox: mailbox@25000 {













		mailbox: mailbox@25c00 {















			compatible = "brcm,iproc-fa2-mbox";













			reg = <0x25000 0x445>;













			interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;













			reg = <0x25c00 0x400>;













			interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;















			#mbox-cells = <1>;















			brcm,rx-status-len = <32>;















			brcm,use-bcm-hdr;

































arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts



+1
−0






























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













	};































	memory {













		device_type = "memory";















		reg = <0x00000000 0x08000000















		       0x88000000 0x18000000>;















	};

































arch/arm/boot/dts/bcm958522er.dts



+4
−0






























Original line number
Diff line number
Diff line








@@ -58,6 +58,10 @@





























/* USB 3 support needed to be complete */





























&dma {













	status = "okay";













};





























&amac0 {















	status = "okay";















};

































arch/arm/boot/dts/bcm958525er.dts



+4
−0






























Original line number
Diff line number
Diff line








@@ -58,6 +58,10 @@





























/* USB 3 support needed to be complete */





























&dma {













	status = "okay";













};





























&amac0 {















	status = "okay";















};









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE