diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-20 14:46:26 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-20 14:46:26 -1000 |
| commit | ba816d3c265cfe9ed0ee8347eab63cf5ac3cf5dc (patch) | |
| tree | 4f8c516db5814e82ba59ba8fefd1b43a25dccd5f /arch/arm | |
| parent | 921dd23597704b31fb3b51c7eae9cf3022846625 (diff) | |
| parent | d37316b72e8bf95a52d1c3e93c823d128c09b521 (diff) | |
| download | linux-stable-ba816d3c265cfe9ed0ee8347eab63cf5ac3cf5dc.tar.gz linux-stable-ba816d3c265cfe9ed0ee8347eab63cf5ac3cf5dc.tar.bz2 linux-stable-ba816d3c265cfe9ed0ee8347eab63cf5ac3cf5dc.zip | |
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
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-npcm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-npcm/Kconfig b/arch/arm/mach-npcm/Kconfig index 658c8efb4ca1..a71cf1d189ae 100644 --- a/arch/arm/mach-npcm/Kconfig +++ b/arch/arm/mach-npcm/Kconfig @@ -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). |