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

Pull ARM new SoC support from Arnd Bergmann:
 "This adds initial support for two SoC families that have been under
  review for a while. In both cases, the origonal idea was to have a
  minimally functional version, but we ended up leaving out the clk
  drivers that are still under review and will be merged through the
  corresponding subsystem tree.

  The Nuvoton NPCM8xx is a 64-bit Baseboard Management Controller and
  based on the 32-bit NPCM7xx family but is now getting added to
  arch/arm64 as well.

  Sunplus SP7021, also known as Plus1, is a general-purpose
  System-in-Package design based on the 32-bit Cortex-A7 SoC on the main
  chip, plus an I/O chip and memory in the same"

* tag 'arm-newsoc-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits)
  MAINTAINERS: rectify entry for ARM/NUVOTON NPCM ARCHITECTURE
  arm64: defconfig: Add Nuvoton NPCM family support
  arm64: dts: nuvoton: Add initial NPCM845 EVB device tree
  arm64: dts: nuvoton: Add initial NPCM8XX device tree
  arm64: npcm: Add support for Nuvoton NPCM8XX BMC SoC
  dt-bindings: arm: npcm: Add nuvoton,npcm845 GCR compatible string
  dt-bindings: arm: npcm: Add nuvoton,npcm845 compatible string
  dt-bindings: arm: npcm: Add maintainer
  reset: npcm: Add NPCM8XX support
  dt-bindings: reset: npcm: Add support for NPCM8XX
  reset: npcm: using syscon instead of device data
  ARM: dts: nuvoton: add reset syscon property
  dt-bindings: reset: npcm: add GCR syscon property
  dt-binding: clk: npcm845: Add binding for Nuvoton NPCM8XX Clock
  dt-bindings: watchdog: npcm: Add npcm845 compatible string
  dt-bindings: timer: npcm: Add npcm845 compatible string
  ARM: dts: Add Sunplus SP7021-Demo-V3 board device tree
  ARM: sp7021_defconfig: Add Sunplus SP7021 defconfig
  ARM: sunplus: Add initial support for Sunplus SP7021 SoC
  irqchip: Add Sunplus SP7021 interrupt controller driver
  ...

diff --combined MAINTAINERS
index 1c8ac3444c880dec466d9ee26da43b304ade053a,9e64321d5e27c9abc500af3382cae605a2a50d30..09aa574db5f5f51b44997d7882462ecd8ffd89e1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -242,11 -242,6 +242,11 @@@ F:       include/trace/events/9p.
  F:    include/uapi/linux/virtio_9p.h
  F:    net/9p/
  
 +A64FX DIAG DRIVER
 +M:    Hitomi Hasegawa <[email protected]>
 +S:    Supported
 +F:    drivers/soc/fujitsu/a64fx-diag.c
 +
  A8293 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -431,6 -426,7 +431,6 @@@ F: drivers/acpi/*thermal
  ACPI VIOT DRIVER
  M:    Jean-Philippe Brucker <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/acpi/viot.c
@@@ -964,6 -960,7 +964,6 @@@ F: drivers/video/fbdev/geode
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <[email protected]>
  R:    Suravee Suthikulpanit <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -1043,7 -1040,6 +1043,7 @@@ F:      arch/arm64/boot/dts/amd
  
  AMD XGBE DRIVER
  M:    Tom Lendacky <[email protected]>
 +M:    "Shyam Sundar S K" <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
@@@ -1899,7 -1895,6 +1899,7 @@@ L:      [email protected] (moder
  S:    Supported
  Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 +F:    Documentation/devicetree/bindings/arm/aspeed/
  F:    arch/arm/boot/dts/aspeed-*
  F:    arch/arm/mach-aspeed/
  N:    aspeed
@@@ -2455,9 -2450,11 +2455,11 @@@ F:    Documentation/devicetree/bindings/*/
  F:    Documentation/devicetree/bindings/arm/npcm/*
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    arch/arm/mach-npcm/
+ F:    arch/arm64/boot/dts/nuvoton/
  F:    drivers/*/*npcm*
  F:    drivers/*/*/*npcm*
  F:    include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
+ F:    include/dt-bindings/clock/nuvoton,npcm845-clk.h
  
  ARM/NUVOTON WPCM450 ARCHITECTURE
  M:    Jonathan Neuschäfer <[email protected]>
@@@ -2504,8 -2501,10 +2506,8 @@@ F:     drivers/power/reset/oxnas-restart.
  N:    oxnas
  
  ARM/PALM TREO SUPPORT
 -M:    Tomas Cech <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://hackndev.com
 +S:    Orphan
  F:    arch/arm/mach-pxa/palmtreo.*
  
  ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
@@@ -2543,7 -2542,6 +2545,7 @@@ W:      http://www.armlinux.org.uk
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
  M:    Bjorn Andersson <[email protected]>
 +R:    Konrad Dybcio <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -2622,8 -2620,6 +2624,8 @@@ Q:      http://patchwork.kernel.org/project/
  C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
 +F:    Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
 +F:    Documentation/devicetree/bindings/soc/renesas/
  F:    arch/arm64/boot/dts/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
@@@ -2742,7 -2738,6 +2744,7 @@@ Q:      http://patchwork.kernel.org/project/
  C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
 +F:    Documentation/devicetree/bindings/soc/renesas/
  F:    arch/arm/boot/dts/emev2*
  F:    arch/arm/boot/dts/gr-peach*
  F:    arch/arm/boot/dts/iwg20d-q7*
@@@ -2832,6 -2827,23 +2834,23 @@@ F:    drivers/clocksource/armv7m_systick.
  N:    stm32
  N:    stm
  
+ ARM/SUNPLUS SP7021 SOC SUPPORT
+ M:    Qin Jian <[email protected]>
+ L:    [email protected] (moderated for mon-subscribers)
+ S:    Maintained
+ W:    https://sunplus-tibbo.atlassian.net/wiki/spaces/doc/overview
+ F:    Documentation/devicetree/bindings/arm/sunplus,sp7021.yaml
+ F:    Documentation/devicetree/bindings/clock/sunplus,sp7021-clkc.yaml
+ F:    Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.yaml
+ F:    Documentation/devicetree/bindings/reset/sunplus,reset.yaml
+ F:    arch/arm/boot/dts/sunplus-sp7021*.dts*
+ F:    arch/arm/configs/sp7021_*defconfig
+ F:    arch/arm/mach-sunplus/
+ F:    drivers/irqchip/irq-sp7021-intc.c
+ F:    drivers/reset/reset-sunplus.c
+ F:    include/dt-bindings/clock/sunplus,sp7021-clkc.h
+ F:    include/dt-bindings/reset/sunplus,sp7021-reset.h
+ 
  ARM/Synaptics SoC support
  M:    Jisheng Zhang <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
@@@ -3624,18 -3636,16 +3643,18 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
  F:    drivers/iio/accel/bma400*
  
 -BPF (Safe dynamic programs and tools)
 +BPF [GENERAL] (Safe Dynamic Programs and Tools)
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  M:    Andrii Nakryiko <[email protected]>
 -R:    Martin KaFai Lau <[email protected]>
 -R:    Song Liu <song[email protected]>
 +R:    Martin KaFai Lau <[email protected]>
 +R:    Song Liu <song@kernel.org>
  R:    Yonghong Song <[email protected]>
  R:    John Fastabend <[email protected]>
  R:    KP Singh <[email protected]>
 -L:    [email protected]
 +R:    Stanislav Fomichev <[email protected]>
 +R:    Hao Luo <[email protected]>
 +R:    Jiri Olsa <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://bpf.io/
@@@ -3667,9 -3677,12 +3686,9 @@@ F:     scripts/pahole-version.s
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
 -N:    bpf
 -K:    bpf
  
  BPF JIT for ARM
  M:    Shubham Bansal <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/arm/net/
@@@ -3678,6 -3691,7 +3697,6 @@@ BPF JIT for ARM6
  M:    Daniel Borkmann <[email protected]>
  M:    Alexei Starovoitov <[email protected]>
  M:    Zi Shen Lim <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/arm64/net/
@@@ -3685,12 -3699,14 +3704,12 @@@
  BPF JIT for MIPS (32-BIT AND 64-BIT)
  M:    Johan Almbladh <[email protected]>
  M:    Paul Burton <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/mips/net/
  
  BPF JIT for NFP NICs
  M:    Jakub Kicinski <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/netronome/nfp/bpf/
@@@ -3698,6 -3714,7 +3717,6 @@@
  BPF JIT for POWERPC (32-BIT AND 64-BIT)
  M:    Naveen N. Rao <[email protected]>
  M:    Michael Ellerman <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/powerpc/net/
@@@ -3705,6 -3722,7 +3724,6 @@@
  BPF JIT for RISC-V (32-bit)
  M:    Luke Nelson <[email protected]>
  M:    Xi Wang <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3712,6 -3730,7 +3731,6 @@@ X:      arch/riscv/net/bpf_jit_comp64.
  
  BPF JIT for RISC-V (64-bit)
  M:    Björn Töpel <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3721,6 -3740,7 +3740,6 @@@ BPF JIT for S39
  M:    Ilya Leoshkevich <[email protected]>
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/s390/net/
@@@ -3728,12 -3748,14 +3747,12 @@@ X:   arch/s390/net/pnet.
  
  BPF JIT for SPARC (32-BIT AND 64-BIT)
  M:    David S. Miller <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/sparc/net/
  
  BPF JIT for X86 32-BIT
  M:    Wang YanQing <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/x86/net/bpf_jit_comp32.c
@@@ -3741,60 -3763,13 +3760,60 @@@
  BPF JIT for X86 64-BIT
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/net/
  X:    arch/x86/net/bpf_jit_comp32.c
  
 -BPF LSM (Security Audit and Enforcement using BPF)
 +BPF [CORE]
 +M:    Alexei Starovoitov <[email protected]>
 +M:    Daniel Borkmann <[email protected]>
 +R:    John Fastabend <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/verifier.c
 +F:    kernel/bpf/tnum.c
 +F:    kernel/bpf/core.c
 +F:    kernel/bpf/syscall.c
 +F:    kernel/bpf/dispatcher.c
 +F:    kernel/bpf/trampoline.c
 +F:    include/linux/bpf*
 +F:    include/linux/filter.h
 +
 +BPF [BTF]
 +M:    Martin KaFai Lau <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/btf.c
 +F:    include/linux/btf*
 +
 +BPF [TRACING]
 +M:    Song Liu <[email protected]>
 +R:    Jiri Olsa <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/trace/bpf_trace.c
 +F:    kernel/bpf/stackmap.c
 +
 +BPF [NETWORKING] (tc BPF, sock_addr)
 +M:    Martin KaFai Lau <[email protected]>
 +M:    Daniel Borkmann <[email protected]>
 +R:    John Fastabend <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    net/core/filter.c
 +F:    net/sched/act_bpf.c
 +F:    net/sched/cls_bpf.c
 +
 +BPF [NETWORKING] (struct_ops, reuseport)
 +M:    Martin KaFai Lau <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/bpf_struct*
 +
 +BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
  M:    KP Singh <[email protected]>
  R:    Florent Revest <[email protected]>
  R:    Brendan Jackman <[email protected]>
@@@ -3805,27 -3780,7 +3824,27 @@@ F:    include/linux/bpf_lsm.
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
  
 -BPF L7 FRAMEWORK
 +BPF [STORAGE & CGROUPS]
 +M:    Martin KaFai Lau <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/cgroup.c
 +F:    kernel/bpf/*storage.c
 +F:    kernel/bpf/bpf_lru*
 +
 +BPF [RINGBUF]
 +M:    Andrii Nakryiko <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/ringbuf.c
 +
 +BPF [ITERATOR]
 +M:    Yonghong Song <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/*iter.c
 +
 +BPF [L7 FRAMEWORK] (sockmap)
  M:    John Fastabend <[email protected]>
  M:    Jakub Sitnicki <[email protected]>
  L:    [email protected]
@@@ -3838,31 -3793,13 +3857,31 @@@ F:   net/ipv4/tcp_bpf.
  F:    net/ipv4/udp_bpf.c
  F:    net/unix/unix_bpf.c
  
 -BPFTOOL
 +BPF [LIBRARY] (libbpf)
 +M:    Andrii Nakryiko <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    tools/lib/bpf/
 +
 +BPF [TOOLING] (bpftool)
  M:    Quentin Monnet <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    kernel/bpf/disasm.*
  F:    tools/bpf/bpftool/
  
 +BPF [SELFTESTS] (Test Runners & Infrastructure)
 +M:    Andrii Nakryiko <[email protected]>
 +R:    Mykola Lysenko <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    tools/testing/selftests/bpf/
 +
 +BPF [MISC]
 +L:    [email protected]
 +S:    Odd Fixes
 +K:    (?:\b|_)bpf(?:\b|_)
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
  L:    [email protected]
@@@ -3884,28 -3821,15 +3903,28 @@@ BROADCOM BCMBCA ARM ARCHITECTUR
  M:    William Zhang <[email protected]>
  M:    Anand Gore <[email protected]>
  M:    Kursad Oney <[email protected]>
 +M:    Florian Fainelli <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
  F:    Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
 -F:    arch/arm/boot/dts/bcm47622.dtsi
 -F:    arch/arm/boot/dts/bcm947622.dts
 +F:    arch/arm64/boot/dts/broadcom/bcmbca/*
  N:    bcmbca
  N:    bcm[9]?47622
 +N:    bcm[9]?4912
 +N:    bcm[9]?63138
 +N:    bcm[9]?63146
 +N:    bcm[9]?63148
 +N:    bcm[9]?63158
 +N:    bcm[9]?63178
 +N:    bcm[9]?6756
 +N:    bcm[9]?6813
 +N:    bcm[9]?6846
 +N:    bcm[9]?6855
 +N:    bcm[9]?6856
 +N:    bcm[9]?6858
 +N:    bcm[9]?6878
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
@@@ -3981,6 -3905,14 +4000,6 @@@ S:     Maintaine
  F:    arch/arm/boot/dts/bcm47189*
  F:    arch/arm/boot/dts/bcm53573*
  
 -BROADCOM BCM63XX ARM ARCHITECTURE
 -M:    Florian Fainelli <[email protected]>
 -R:    Broadcom internal kernel review list <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://github.com/broadcom/stblinux.git
 -N:    bcm63xx
 -
  BROADCOM BCM63XX/BCM33XX UDC DRIVER
  M:    Kevin Cernekee <[email protected]>
  L:    [email protected]
@@@ -5063,7 -4995,6 +5082,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  F:    Documentation/devicetree/bindings/clock/
  F:    drivers/clk/
 +F:    include/dt-bindings/clock/
  F:    include/linux/clk-pr*
  F:    include/linux/clk/
  F:    include/linux/of_clk.h
@@@ -5114,7 -5045,7 +5133,7 @@@ COMPUTE EXPRESS LINK (CXL
  M:    Alison Schofield <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Ira Weiny <[email protected]>
 -M:    Ben Widawsky <b[email protected]>
 +M:    Ben Widawsky <b[email protected]>
  M:    Dan Williams <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -6066,6 -5997,7 +6085,6 @@@ DMA MAPPING HELPER
  M:    Christoph Hellwig <[email protected]>
  M:    Marek Szyprowski <[email protected]>
  R:    Robin Murphy <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
@@@ -6078,6 -6010,7 +6097,6 @@@ F:      kernel/dma
  
  DMA MAPPING BENCHMARK
  M:    Xiang Chen <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  F:    kernel/dma/map_benchmark.c
  F:    tools/testing/selftests/dma/
@@@ -7499,8 -7432,6 +7518,8 @@@ F:      include/video/s1d13xxxfb.
  EROFS FILE SYSTEM
  M:    Gao Xiang <[email protected]>
  M:    Chao Yu <[email protected]>
 +R:    Yue Hu <[email protected]>
 +R:    Jeffle Xu <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
@@@ -7664,6 -7595,7 +7683,6 @@@ F:      drivers/gpu/drm/exynos/exynos_dp
  
  EXYNOS SYSMMU (IOMMU) driver
  M:    Marek Szyprowski <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/iommu/exynos-iommu.c
@@@ -9052,12 -8984,6 +9071,12 @@@ F:    Documentation/admin-guide/perf/hisi-
  F:    Documentation/admin-guide/perf/hisi-pmu.rst
  F:    drivers/perf/hisilicon
  
 +HISILICON HNS3 PMU DRIVER
 +M:    Guangbin Huang <[email protected]>
 +S:    Supported
 +F:    Documentation/admin-guide/perf/hns3-pmu.rst
 +F:    drivers/perf/hisilicon/hns3_pmu.c
 +
  HISILICON QM AND ZIP Controller DRIVER
  M:    Zhou Wang <[email protected]>
  L:    [email protected]
@@@ -9640,7 -9566,6 +9659,7 @@@ F:      drivers/input/misc/ideapad_slidebar.
  
  IDMAPPED MOUNTS
  M:    Christian Brauner <[email protected]>
 +M:    Seth Forshee <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
@@@ -9929,10 -9854,7 +9948,10 @@@ INTEL ASoC DRIVER
  M:    Cezary Rojewski <[email protected]>
  M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
 -M:    Jie Yang <[email protected]>
 +M:    Peter Ujfalusi <[email protected]>
 +M:    Bard Liao <[email protected]>
 +M:    Ranjani Sridharan <[email protected]>
 +M:    Kai Vehmanen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/intel/
@@@ -10095,6 -10017,7 +10114,6 @@@ F:   drivers/hid/intel-ish-hid
  INTEL IOMMU (VT-d)
  M:    David Woodhouse <[email protected]>
  M:    Lu Baolu <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -10474,6 -10397,7 +10493,6 @@@ F:   include/linux/iomap.
  IOMMU DRIVERS
  M:    Joerg Roedel <[email protected]>
  M:    Will Deacon <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -12633,6 -12557,7 +12652,6 @@@ F:   drivers/i2c/busses/i2c-mt65xx.
  
  MEDIATEK IOMMU DRIVER
  M:    Yong Wu <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -14385,8 -14310,7 +14404,8 @@@ S:   Maintaine
  F:    drivers/net/phy/nxp-c45-tja11xx.c
  
  NXP FSPI DRIVER
 -M:    Ashish Kumar <[email protected]>
 +M:    Han Xu <[email protected]>
 +M:    Haibo Chen <[email protected]>
  R:    Yogesh Gaur <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14492,8 -14416,9 +14511,8 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/tfa989x.c
  
  NXP-NCI NFC DRIVER
 -R:    Charles Gorand <[email protected]>
  L:    [email protected] (subscribers-only)
 -S:    Supported
 +S:    Orphan
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
@@@ -15872,7 -15797,7 +15891,7 @@@ PIN CONTROLLER - FREESCAL
  M:    Dong Aisheng <[email protected]>
  M:    Fabio Estevam <[email protected]>
  M:    Shawn Guo <[email protected]>
 -M:    Stefan Agner <[email protected]>
 +M:    Jacky Bai <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -15882,7 -15807,7 +15901,7 @@@ F:   drivers/pinctrl/freescale
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <[email protected]>
  M:    Andy Shevchenko <[email protected]>
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  F:    drivers/pinctrl/intel/
  
@@@ -16404,7 -16329,7 +16423,7 @@@ F:   drivers/crypto/qat
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <[email protected]>
 -M:    Banajit Goswami <bgoswami@codeaurora.org>
 +M:    Banajit Goswami <bgoswami@quicinc.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/codecs/lpass-va-macro.c
@@@ -16683,15 -16608,9 +16702,15 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt
  F:    drivers/i2c/busses/i2c-qcom-cci.c
  
 +QUALCOMM INTERCONNECT BWMON DRIVER
 +M:    Krzysztof Kozlowski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
 +F:    drivers/soc/qcom/icc-bwmon.c
 +
  QUALCOMM IOMMU
  M:    Rob Clark <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17303,15 -17222,12 +17322,15 @@@ N:        risc
  K:    riscv
  
  RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
 -M:    Lewis Hanly <[email protected]>
  M:    Conor Dooley <[email protected]>
 +M:    Daire McNamara <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/riscv/boot/dts/microchip/
 +F:    drivers/char/hw_random/mpfs-rng.c
 +F:    drivers/clk/microchip/clk-mpfs.c
  F:    drivers/mailbox/mailbox-mpfs.c
 +F:    drivers/pci/controller/pcie-microchip-host.c
  F:    drivers/soc/microchip/
  F:    include/soc/microchip/mpfs.h
  
@@@ -18208,7 -18124,6 +18227,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <[email protected]>
 +M:    Wenjia Zhang <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -18841,10 -18756,8 +18860,10 @@@ F: sound/soc
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
  M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
 +M:    Peter Ujfalusi <[email protected]>
 +M:    Bard Liao <[email protected]>
  M:    Ranjani Sridharan <[email protected]>
 -M:    Kai Vehmanen <[email protected]>
 +R:    Kai Vehmanen <[email protected]>
  M:    Daniel Baluta <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -19323,6 -19236,7 +19342,6 @@@ F:   arch/x86/boot/video
  
  SWIOTLB SUBSYSTEM
  M:    Christoph Hellwig <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
@@@ -21998,6 -21912,7 +22017,6 @@@ XEN SWIOTLB SUBSYSTE
  M:    Juergen Gross <[email protected]>
  M:    Stefano Stabellini <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/xen/*swiotlb*

diff --combined arch/arm/boot/dts/Makefile
index b327059c83da525f9654127a2ebd36da32fea990,e8f31aa96e1e8acb0249dbd299ec257b009e6b18..05d8aef6e5d252b9cb2be1d23fc47b282cf16258
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -79,6 -79,8 +79,8 @@@ dtb-$(CONFIG_SOC_SAM_V7) += 
        at91-vinco.dtb
  dtb-$(CONFIG_SOC_SAMA7G5) += \
        at91-sama7g5ek.dtb
+ dtb-$(CONFIG_SOC_SP7021) += \
+       sunplus-sp7021-demo-v3.dtb
  dtb-$(CONFIG_ARCH_AXXIA) += \
        axm5516-amarillo.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += \
@@@ -135,7 -137,6 +137,7 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
        bcm47094-luxul-xwr-3150-v1.dtb \
        bcm47094-netgear-r8500.dtb \
        bcm47094-phicomm-k3.dtb \
 +      bcm53015-meraki-mr26.dtb \
        bcm53016-meraki-mr32.dtb \
        bcm94708.dtb \
        bcm94709.dtb \
@@@ -147,6 -148,8 +149,6 @@@ dtb-$(CONFIG_ARCH_BCM_53573) += 
        bcm47189-luxul-xap-810.dtb \
        bcm47189-tenda-ac9.dtb \
        bcm947189acdbmr.dtb
 -dtb-$(CONFIG_ARCH_BCM_63XX) += \
 -      bcm963138dvt.dtb
  dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
        bcm911360_entphn.dtb \
        bcm911360k.dtb \
@@@ -181,15 -184,7 +183,15 @@@ dtb-$(CONFIG_ARCH_BERLIN) += 
  dtb-$(CONFIG_ARCH_BRCMSTB) += \
        bcm7445-bcm97445svmb.dtb
  dtb-$(CONFIG_ARCH_BCMBCA) += \
 -      bcm947622.dtb
 +      bcm947622.dtb \
 +      bcm963138.dtb \
 +      bcm963138dvt.dtb \
 +      bcm963148.dtb \
 +      bcm963178.dtb \
 +      bcm96756.dtb \
 +      bcm96846.dtb \
 +      bcm96855.dtb \
 +      bcm96878.dtb
  dtb-$(CONFIG_ARCH_CLPS711X) += \
        ep7211-edb7211.dtb
  dtb-$(CONFIG_ARCH_DAVINCI) += \
@@@ -557,7 -552,6 +559,7 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6q-apalis-eval.dtb \
        imx6q-apalis-ixora.dtb \
        imx6q-apalis-ixora-v1.1.dtb \
 +      imx6q-apalis-ixora-v1.2.dtb \
        imx6q-apf6dev.dtb \
        imx6q-arm2.dtb \
        imx6q-b450v3.dtb \
@@@ -749,12 -743,8 +751,12 @@@ dtb-$(CONFIG_SOC_IMX7D) += 
        imx7d-cl-som-imx7.dtb \
        imx7d-colibri-aster.dtb \
        imx7d-colibri-emmc-aster.dtb \
 +      imx7d-colibri-emmc-iris.dtb \
 +      imx7d-colibri-emmc-iris-v2.dtb \
        imx7d-colibri-emmc-eval-v3.dtb \
        imx7d-colibri-eval-v3.dtb \
 +      imx7d-colibri-iris.dtb \
 +      imx7d-colibri-iris-v2.dtb \
        imx7d-flex-concentrator.dtb \
        imx7d-flex-concentrator-mfg.dtb \
        imx7d-mba7.dtb \
@@@ -774,8 -764,6 +776,8 @@@
        imx7d-zii-rpu2.dtb \
        imx7s-colibri-aster.dtb \
        imx7s-colibri-eval-v3.dtb \
 +      imx7s-colibri-iris.dtb \
 +      imx7s-colibri-iris-v2.dtb \
        imx7s-mba7.dtb \
        imx7s-warp.dtb
  dtb-$(CONFIG_SOC_IMX7ULP) += \
@@@ -784,10 -772,9 +786,10 @@@
  dtb-$(CONFIG_SOC_IMXRT) += \
        imxrt1050-evk.dtb
  dtb-$(CONFIG_SOC_LAN966) += \
 -      lan966x-pcb8291.dtb \
        lan966x-kontron-kswitch-d10-mmt-6g-2gs.dtb \
 -      lan966x-kontron-kswitch-d10-mmt-8g.dtb
 +      lan966x-kontron-kswitch-d10-mmt-8g.dtb \
 +      lan966x-pcb8291.dtb \
 +      lan966x-pcb8309.dtb
  dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-iot.dtb \
        ls1021a-moxa-uc-8410a.dtb \
@@@ -1163,7 -1150,7 +1165,7 @@@ dtb-$(CONFIG_ARCH_S5PV210) += 
        s5pv210-torbreck.dtb
  dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \
        socfpga_arria5_socdk.dtb \
 -      socfpga_arria10_mercury_aa1.dtb \
 +      socfpga_arria10_chameleonv3.dtb \
        socfpga_arria10_socdk_nand.dtb \
        socfpga_arria10_socdk_qspi.dtb \
        socfpga_arria10_socdk_sdmmc.dtb \
@@@ -1207,7 -1194,6 +1209,7 @@@ dtb-$(CONFIG_ARCH_STM32) += 
        stm32mp151a-prtt1c.dtb \
        stm32mp151a-prtt1s.dtb \
        stm32mp153c-dhcom-drc02.dtb \
 +      stm32mp153c-dhcor-drc-compact.dtb \
        stm32mp157a-avenger96.dtb \
        stm32mp157a-dhcor-avenger96.dtb \
        stm32mp157a-dk1.dtb \
@@@ -1574,6 -1560,7 +1576,6 @@@ dtb-$(CONFIG_ARCH_ASPEED) += 
        aspeed-ast2600-evb.dtb \
        aspeed-bmc-amd-ethanolx.dtb \
        aspeed-bmc-ampere-mtjade.dtb \
 -      aspeed-bmc-arm-centriq2400-rep.dtb \
        aspeed-bmc-arm-stardragon4800-rep2.dtb \
        aspeed-bmc-asrock-e3c246d4i.dtb \
        aspeed-bmc-asrock-romed8hm3.dtb \

diff --combined arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
index 9633b50a9c6decc5b4a87892e05539496c43e15f,8a2f290162918ecc3403abe607f9d91d9071dfc2..c7b5ef15b71629654498fb47a38133f42e960b63
--- 1/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
--- 2/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
+++ b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
@@@ -110,6 -110,7 +110,7 @@@
                        compatible = "nuvoton,npcm750-reset";
                        reg = <0xf0801000 0x70>;
                        #reset-cells = <2>;
+                       nuvoton,sysgcr = <&gcr>;
                };
  
                clk: clock-controller@f0801000 {
@@@ -128,7 -129,7 +129,7 @@@
                        interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "macirq";
                        ethernet = <0>;
 -                      clocks  = <&clk_rg1refck>, <&clk NPCM7XX_CLK_AHB>;
 +                      clocks = <&clk_rg1refck>, <&clk NPCM7XX_CLK_AHB>;
                        clock-names = "stmmaceth", "clk_gmac";
                        pinctrl-names = "default";
                        pinctrl-0 = <&rg1_pins

diff --combined arch/arm/configs/multi_v7_defconfig
index cff991cfe8645018b73b87b3d35112f20d6f3e19,1a796b16e54ef2f86bf5f97ca98f87c68ef5967a..bcd7a431c66ef5867f4f21db6d6b83fe4621473e
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -6,7 -6,6 +6,7 @@@ CONFIG_BLK_DEV_INITRD=
  CONFIG_EMBEDDED=y
  CONFIG_PERF_EVENTS=y
  CONFIG_ARCH_VIRT=y
 +CONFIG_ARCH_AIROHA=y
  CONFIG_ARCH_ACTIONS=y
  CONFIG_ARCH_ALPINE=y
  CONFIG_ARCH_ARTPEC=y
@@@ -29,16 -28,15 +29,16 @@@ CONFIG_ARCH_BCM_21664=
  CONFIG_ARCH_BCM_23550=y
  CONFIG_ARCH_BCM2835=y
  CONFIG_ARCH_BCM_53573=y
 -CONFIG_ARCH_BCM_63XX=y
  CONFIG_ARCH_BRCMSTB=y
  CONFIG_ARCH_BCMBCA=y
 +CONFIG_ARCH_BCMBCA_CORTEXA7=y
 +CONFIG_ARCH_BCMBCA_CORTEXA9=y
 +CONFIG_ARCH_BCMBCA_BRAHMAB15=y
  CONFIG_ARCH_BERLIN=y
  CONFIG_MACH_BERLIN_BG2=y
  CONFIG_MACH_BERLIN_BG2CD=y
  CONFIG_MACH_BERLIN_BG2Q=y
  CONFIG_ARCH_DIGICOLOR=y
 -CONFIG_ARCH_AIROHA=y
  CONFIG_ARCH_EXYNOS=y
  CONFIG_ARCH_HIGHBANK=y
  CONFIG_ARCH_HISI=y
@@@ -96,6 -94,7 +96,7 @@@ CONFIG_MACH_SPEAR1310=
  CONFIG_MACH_SPEAR1340=y
  CONFIG_ARCH_STI=y
  CONFIG_ARCH_STM32=y
+ CONFIG_ARCH_SUNPLUS=y
  CONFIG_ARCH_SUNXI=y
  CONFIG_ARCH_TEGRA=y
  CONFIG_ARCH_UNIPHIER=y
@@@ -131,6 -130,12 +132,6 @@@ CONFIG_ARM_EXYNOS_CPUIDLE=
  CONFIG_ARM_TEGRA_CPUIDLE=y
  CONFIG_ARM_QCOM_SPM_CPUIDLE=y
  CONFIG_KERNEL_MODE_NEON=y
 -CONFIG_ARM_SCMI_PROTOCOL=y
 -CONFIG_RASPBERRYPI_FIRMWARE=y
 -CONFIG_TRUSTED_FOUNDATIONS=y
 -CONFIG_BCM47XX_NVRAM=y
 -CONFIG_BCM47XX_SPROM=y
 -CONFIG_EFI_CAPSULE_LOADER=m
  CONFIG_ARM_CRYPTO=y
  CONFIG_CRYPTO_SHA1_ARM_NEON=m
  CONFIG_CRYPTO_SHA1_ARM_CE=m
@@@ -203,12 -208,6 +204,12 @@@ CONFIG_PCI_EPF_TEST=
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_OMAP_OCP2SCP=y
 +CONFIG_ARM_SCMI_PROTOCOL=y
 +CONFIG_RASPBERRYPI_FIRMWARE=y
 +CONFIG_TRUSTED_FOUNDATIONS=y
 +CONFIG_BCM47XX_NVRAM=y
 +CONFIG_BCM47XX_SPROM=y
 +CONFIG_EFI_CAPSULE_LOADER=m
  CONFIG_MTD=y
  CONFIG_MTD_CMDLINE_PARTS=y
  CONFIG_MTD_BLOCK=y
@@@ -229,6 -228,7 +230,6 @@@ CONFIG_MTD_NAND_DAVINCI=
  CONFIG_MTD_NAND_STM32_FMC2=y
  CONFIG_MTD_NAND_PL35X=y
  CONFIG_MTD_SPI_NOR=y
 -CONFIG_SPI_ASPEED_SMC=m
  CONFIG_MTD_UBI=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_RAM=y
@@@ -260,13 -260,13 +261,13 @@@ CONFIG_SATA_MV=
  CONFIG_SATA_RCAR=y
  CONFIG_NETDEVICES=y
  CONFIG_NET_VENDOR_ASIX=y
 -CONFIG_SPI_AX88796C=m
  CONFIG_VIRTIO_NET=y
  CONFIG_B53_SPI_DRIVER=m
  CONFIG_B53_MDIO_DRIVER=m
  CONFIG_B53_MMAP_DRIVER=m
  CONFIG_NET_DSA_BCM_SF2=m
  CONFIG_SUN4I_EMAC=y
 +CONFIG_SPI_AX88796C=m
  CONFIG_BCMGENET=m
  CONFIG_BGMAC_BCMA=y
  CONFIG_SYSTEMPORT=m
@@@ -299,6 -299,7 +300,6 @@@ CONFIG_MARVELL_PHY=
  CONFIG_AT803X_PHY=y
  CONFIG_ROCKCHIP_PHY=y
  CONFIG_DP83867_PHY=y
 -CONFIG_USB_BRCMSTB=m
  CONFIG_MDIO_MSCC_MIIM=m
  CONFIG_USB_PEGASUS=y
  CONFIG_USB_RTL8152=m
@@@ -435,7 -436,6 +436,7 @@@ CONFIG_I2C_RCAR=
  CONFIG_I2C_CROS_EC_TUNNEL=m
  CONFIG_I2C_SLAVE_EEPROM=y
  CONFIG_SPI=y
 +CONFIG_SPI_ASPEED_SMC=m
  CONFIG_SPI_ATMEL=m
  CONFIG_SPI_ATMEL_QUADSPI=m
  CONFIG_SPI_BCM2835=y
@@@ -466,10 -466,10 +467,10 @@@ CONFIG_SPI_SPIDEV=
  CONFIG_SPMI=y
  CONFIG_PTP_1588_CLOCK=y
  CONFIG_PINCTRL_AS3722=y
 -CONFIG_PINCTRL_STMFX=y
  CONFIG_PINCTRL_MICROCHIP_SGPIO=y
  CONFIG_PINCTRL_OCELOT=y
  CONFIG_PINCTRL_PALMAS=y
 +CONFIG_PINCTRL_STMFX=y
  CONFIG_PINCTRL_OWL=y
  CONFIG_PINCTRL_S500=y
  CONFIG_PINCTRL_MSM=y
@@@ -512,6 -512,7 +513,6 @@@ CONFIG_BATTERY_ACT8945A=
  CONFIG_BATTERY_CPCAP=m
  CONFIG_BATTERY_SBS=y
  CONFIG_BATTERY_BQ27XXX=m
 -CONFIG_BATTERY_ACER_A500=m
  CONFIG_AXP20X_POWER=m
  CONFIG_BATTERY_MAX17040=m
  CONFIG_BATTERY_MAX17042=m
@@@ -523,7 -524,6 +524,7 @@@ CONFIG_CHARGER_MAX8997=
  CONFIG_CHARGER_MAX8998=m
  CONFIG_CHARGER_SMB347=m
  CONFIG_CHARGER_TPS65090=y
 +CONFIG_BATTERY_ACER_A500=m
  CONFIG_SENSORS_ARM_SCMI=y
  CONFIG_SENSORS_ASPEED=m
  CONFIG_SENSORS_IIO_HWMON=y
@@@ -578,6 -578,7 +579,6 @@@ CONFIG_GXP_WATCHDOG=
  CONFIG_BCMA_HOST_SOC=y
  CONFIG_BCMA_DRIVER_GMAC_CMN=y
  CONFIG_BCMA_DRIVER_GPIO=y
 -CONFIG_MFD_ACER_A500_EC=m
  CONFIG_MFD_ACT8945A=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
@@@ -610,7 -611,6 +611,7 @@@ CONFIG_MFD_TPS6586X=
  CONFIG_MFD_TPS65910=y
  CONFIG_MFD_STM32_LPTIMER=m
  CONFIG_MFD_STPMIC1=y
 +CONFIG_MFD_ACER_A500_EC=m
  CONFIG_REGULATOR_ACT8865=y
  CONFIG_REGULATOR_ACT8945A=y
  CONFIG_REGULATOR_ANATOP=y
@@@ -665,31 -665,31 +666,31 @@@ CONFIG_MEDIA_SUPPORT=
  CONFIG_MEDIA_USB_SUPPORT=y
  CONFIG_USB_VIDEO_CLASS=m
  CONFIG_V4L_PLATFORM_DRIVERS=y
 -CONFIG_VIDEO_MMP_CAMERA=m
 +CONFIG_V4L_MEM2MEM_DRIVERS=y
  CONFIG_VIDEO_ASPEED=m
 -CONFIG_VIDEO_STM32_DCMI=m
 +CONFIG_VIDEO_ATMEL_ISC=m
 +CONFIG_VIDEO_ATMEL_XISC=m
 +CONFIG_VIDEO_ATMEL_ISI=m
 +CONFIG_VIDEO_MICROCHIP_CSI2DC=m
 +CONFIG_VIDEO_MMP_CAMERA=m
 +CONFIG_VIDEO_TEGRA_VDE=m
  CONFIG_VIDEO_RENESAS_CEU=m
 +CONFIG_VIDEO_RCAR_VIN=m
 +CONFIG_VIDEO_RENESAS_FDP1=m
 +CONFIG_VIDEO_RENESAS_JPU=m
 +CONFIG_VIDEO_RENESAS_VSP1=m
 +CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
  CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
  CONFIG_VIDEO_S5P_FIMC=m
  CONFIG_VIDEO_S5P_MIPI_CSIS=m
  CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
  CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
 -CONFIG_VIDEO_RCAR_VIN=m
 -CONFIG_VIDEO_ATMEL_ISC=m
 -CONFIG_VIDEO_ATMEL_XISC=m
 -CONFIG_VIDEO_ATMEL_ISI=m
 -CONFIG_VIDEO_MICROCHIP_CSI2DC=m
 -CONFIG_V4L_MEM2MEM_DRIVERS=y
  CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
  CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 -CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
  CONFIG_VIDEO_STI_BDISP=m
 -CONFIG_VIDEO_STI_HVA=m
  CONFIG_VIDEO_STI_DELTA=m
 -CONFIG_VIDEO_RENESAS_FDP1=m
 -CONFIG_VIDEO_RENESAS_JPU=m
 -CONFIG_VIDEO_RENESAS_VSP1=m
 -CONFIG_VIDEO_TEGRA_VDE=m
 +CONFIG_VIDEO_STI_HVA=m
 +CONFIG_VIDEO_STM32_DCMI=m
  CONFIG_V4L_TEST_DRIVERS=y
  CONFIG_VIDEO_VIVID=m
  CONFIG_VIDEO_ADV7180=m
@@@ -726,13 -726,13 +727,13 @@@ CONFIG_DRM_PANEL_LVDS=
  CONFIG_DRM_PANEL_SIMPLE=y
  CONFIG_DRM_PANEL_EDP=y
  CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 -CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
  CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
  CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
  CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
  CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 -CONFIG_DRM_LVDS_CODEC=m
 +CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
  CONFIG_DRM_DISPLAY_CONNECTOR=m
 +CONFIG_DRM_LVDS_CODEC=m
  CONFIG_DRM_NXP_PTN3460=m
  CONFIG_DRM_PARADE_PS8622=m
  CONFIG_DRM_SII902X=m
@@@ -748,7 -748,6 +749,7 @@@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=
  CONFIG_DRM_IMX_TVE=m
  CONFIG_DRM_IMX_LDB=m
  CONFIG_DRM_IMX_HDMI=m
 +CONFIG_DRM_V3D=m
  CONFIG_DRM_VC4=m
  CONFIG_DRM_ETNAVIV=m
  CONFIG_DRM_MXSFB=m
@@@ -834,7 -833,6 +835,7 @@@ CONFIG_USB_OTG=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_MVEBU=y
  CONFIG_USB_XHCI_TEGRA=m
 +CONFIG_USB_BRCMSTB=m
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_HCD_STI=y
  CONFIG_USB_EHCI_EXYNOS=m
@@@ -939,10 -937,10 +940,10 @@@ CONFIG_LEDS_CLASS_FLASH=
  CONFIG_LEDS_CPCAP=m
  CONFIG_LEDS_GPIO=y
  CONFIG_LEDS_PWM=y
 -CONFIG_LEDS_MAX77693=m
  CONFIG_LEDS_MAX8997=m
  CONFIG_LEDS_ACER_A500=m
  CONFIG_LEDS_TRIGGERS=y
 +CONFIG_LEDS_MAX77693=m
  CONFIG_LEDS_TRIGGER_TIMER=y
  CONFIG_LEDS_TRIGGER_ONESHOT=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@@ -1165,10 -1163,10 +1166,10 @@@ CONFIG_KEYSTONE_IRQ=
  CONFIG_RESET_MCHP_SPARX5=y
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_SUN9I_USB=y
 +CONFIG_PHY_BRCM_USB=m
  CONFIG_PHY_HIX5HD2_SATA=y
  CONFIG_PHY_BERLIN_SATA=y
  CONFIG_PHY_BERLIN_USB=y
 -CONFIG_PHY_BRCM_USB=m
  CONFIG_PHY_MMP3_USB=m
  CONFIG_PHY_LAN966X_SERDES=m
  CONFIG_PHY_CPCAP_USB=m

diff --combined arch/arm64/Kconfig.platforms
index 1a8510a7ba8ffa58a8f8040fdd69aa334ed2d3df,c68d1b4f89753ca98a29bcd3e5f0996e63569a51..74e9e9de37597dd63f25e05d1a8e5a4b6d6dccf2
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -49,7 -49,6 +49,7 @@@ config ARCH_BCM283
  
  config ARCH_BCM4908
        bool "Broadcom BCM4908 family"
 +      select ARCH_BCMBCA
        select GPIOLIB
        help
          This enables support for the Broadcom BCM4906, BCM4908 and
@@@ -64,15 -63,6 +64,15 @@@ config ARCH_BCM_IPRO
        help
          This enables support for Broadcom iProc based SoCs
  
 +config ARCH_BCMBCA
 +      bool "Broadcom Broadband Carrier Access (BCA) origin SoC"
 +      help
 +        Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based
 +        BCA chipset.
 +
 +        This enables support for Broadcom BCA ARM-based broadband chipsets,
 +        including the DSL, PON and Wireless family of chips.
 +
  config ARCH_BERLIN
        bool "Marvell Berlin SoC Family"
        select DW_APB_ICTL
@@@ -192,13 -182,11 +192,13 @@@ config ARCH_MVEB
        select PINCTRL_ARMADA_37XX
        select PINCTRL_ARMADA_AP806
        select PINCTRL_ARMADA_CP110
 +      select PINCTRL_AC5
        help
          This enables support for Marvell EBU familly, including:
           - Armada 3700 SoC Family
           - Armada 7K SoC Family
           - Armada 8K SoC Family
 +         - 98DX2530 SoC Family
  
  config ARCH_MXC
        bool "ARMv8 based NXP i.MX SoC family"
@@@ -214,6 -202,17 +214,17 @@@
          This enables support for the ARMv8 based SoCs in the
          NXP i.MX family.
  
+ config ARCH_NPCM
+       bool "Nuvoton NPCM Architecture"
+       select PINCTRL
+       select GPIOLIB
+       select NPCM7XX_TIMER
+       select RESET_CONTROLLER
+       select MFD_SYSCON
+       help
+         General support for NPCM8xx BMC (Arbel).
+         Nuvoton NPCM8xx BMC based on the Cortex A35.
+ 
  config ARCH_QCOM
        bool "Qualcomm Platforms"
        select GPIOLIB
@@@ -260,8 -259,7 +271,8 @@@ config ARCH_INTEL_SOCFPG
        bool "Intel's SoCFPGA ARMv8 Families"
        help
          This enables support for Intel's SoCFPGA ARMv8 families:
 -        Stratix 10 (ex. Altera), Agilex and eASIC N5X.
 +        Stratix 10 (ex. Altera), Stratix10 Software Virtual Platform,
 +        Agilex and eASIC N5X.
  
  config ARCH_SYNQUACER
        bool "Socionext SynQuacer SoC Family"

diff --combined arch/arm64/configs/defconfig
index 96d06b4610c2e10d6e73cefa389f37cfd422e033,c4a237a84efa6309c7ad3dcb0565f743a497dac9..d5b2d2dd49043d26aaa71a7e996c083fc75963df
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -28,6 -28,7 +28,6 @@@ CONFIG_USER_NS=
  CONFIG_SCHED_AUTOGROUP=y
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_KALLSYMS_ALL=y
 -# CONFIG_COMPAT_BRK is not set
  CONFIG_PROFILING=y
  CONFIG_ARCH_ACTIONS=y
  CONFIG_ARCH_SUNXI=y
@@@ -35,7 -36,6 +35,7 @@@ CONFIG_ARCH_ALPINE=
  CONFIG_ARCH_APPLE=y
  CONFIG_ARCH_BCM2835=y
  CONFIG_ARCH_BCM4908=y
 +CONFIG_ARCH_BCMBCA=y
  CONFIG_ARCH_BCM_IPROC=y
  CONFIG_ARCH_BERLIN=y
  CONFIG_ARCH_BRCMSTB=y
@@@ -49,6 -49,7 +49,7 @@@ CONFIG_ARCH_MEDIATEK=
  CONFIG_ARCH_MESON=y
  CONFIG_ARCH_MVEBU=y
  CONFIG_ARCH_MXC=y
+ CONFIG_ARCH_NPCM=y
  CONFIG_ARCH_QCOM=y
  CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_ROCKCHIP=y
@@@ -93,12 -94,12 +94,12 @@@ CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVM
  CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
  CONFIG_ARM_SCPI_CPUFREQ=y
  CONFIG_ARM_IMX_CPUFREQ_DT=m
 +CONFIG_ARM_MEDIATEK_CPUFREQ=y
  CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y
  CONFIG_ARM_QCOM_CPUFREQ_HW=y
  CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
  CONFIG_ARM_SCMI_CPUFREQ=y
  CONFIG_ARM_TEGRA186_CPUFREQ=y
 -CONFIG_ARM_MEDIATEK_CPUFREQ=y
  CONFIG_QORIQ_CPUFREQ=y
  CONFIG_ACPI=y
  CONFIG_ACPI_APEI=y
@@@ -121,10 -122,10 +122,10 @@@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=
  CONFIG_CRYPTO_CHACHA20_NEON=m
  CONFIG_CRYPTO_AES_ARM64_BS=m
  CONFIG_JUMP_LABEL=y
 -CONFIG_SECCOMP=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 +# CONFIG_COMPAT_BRK is not set
  CONFIG_KSM=y
  CONFIG_MEMORY_FAILURE=y
  CONFIG_TRANSPARENT_HUGEPAGE=y
@@@ -174,6 -175,7 +175,6 @@@ CONFIG_NET_CLS_ACT=
  CONFIG_NET_ACT_GACT=m
  CONFIG_NET_ACT_MIRRED=m
  CONFIG_NET_ACT_GATE=m
 -CONFIG_QRTR=m
  CONFIG_QRTR_SMD=m
  CONFIG_QRTR_TUN=m
  CONFIG_CAN=m
@@@ -263,9 -265,9 +264,9 @@@ CONFIG_MTD_PHYSMAP_OF=
  CONFIG_MTD_DATAFLASH=y
  CONFIG_MTD_SST25L=y
  CONFIG_MTD_RAW_NAND=y
 -CONFIG_MTD_NAND_BRCMNAND=m
  CONFIG_MTD_NAND_DENALI_DT=y
  CONFIG_MTD_NAND_MARVELL=y
 +CONFIG_MTD_NAND_BRCMNAND=m
  CONFIG_MTD_NAND_FSL_IFC=y
  CONFIG_MTD_NAND_QCOM=y
  CONFIG_MTD_SPI_NOR=y
@@@ -287,6 -289,11 +288,6 @@@ CONFIG_SCSI_HISI_SAS=
  CONFIG_SCSI_HISI_SAS_PCI=y
  CONFIG_MEGARAID_SAS=y
  CONFIG_SCSI_MPT3SAS=m
 -CONFIG_SCSI_UFSHCD=y
 -CONFIG_SCSI_UFSHCD_PLATFORM=y
 -CONFIG_SCSI_UFS_QCOM=m
 -CONFIG_SCSI_UFS_HISI=y
 -CONFIG_SCSI_UFS_EXYNOS=y
  CONFIG_ATA=y
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_AHCI_PLATFORM=y
@@@ -316,8 -323,8 +317,8 @@@ CONFIG_AMD_XGBE=
  CONFIG_NET_XGENE=y
  CONFIG_ATL1C=m
  CONFIG_BCMGENET=m
 -CONFIG_SYSTEMPORT=m
  CONFIG_BNX2X=m
 +CONFIG_SYSTEMPORT=m
  CONFIG_MACB=y
  CONFIG_THUNDER_NIC_PF=y
  CONFIG_FEC=y
@@@ -369,6 -376,7 +370,6 @@@ CONFIG_DP83867_PHY=
  CONFIG_VITESSE_PHY=y
  CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
  CONFIG_MDIO_BUS_MUX_MMIOREG=y
 -CONFIG_USB_BRCMSTB=m
  CONFIG_USB_PEGASUS=m
  CONFIG_USB_RTL8150=m
  CONFIG_USB_RTL8152=m
@@@ -418,10 -426,10 +419,10 @@@ CONFIG_SERIAL_8250_EXTENDED=
  CONFIG_SERIAL_8250_SHARE_IRQ=y
  CONFIG_SERIAL_8250_BCM2835AUX=y
  CONFIG_SERIAL_8250_DW=y
 +CONFIG_SERIAL_8250_EM=y
  CONFIG_SERIAL_8250_OMAP=y
  CONFIG_SERIAL_8250_MT6577=y
  CONFIG_SERIAL_8250_UNIPHIER=y
 -CONFIG_SERIAL_8250_EM=y
  CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@@ -457,7 -465,6 +458,7 @@@ CONFIG_I2C_CHARDEV=
  CONFIG_I2C_MUX=y
  CONFIG_I2C_MUX_PCA954x=y
  CONFIG_I2C_BCM2835=m
 +CONFIG_I2C_CADENCE=m
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
  CONFIG_I2C_GPIO=m
  CONFIG_I2C_IMX=y
@@@ -479,6 -486,7 +480,6 @@@ CONFIG_I2C_TEGRA=
  CONFIG_I2C_UNIPHIER_F=y
  CONFIG_I2C_RCAR=y
  CONFIG_I2C_CROS_EC_TUNNEL=y
 -CONFIG_I2C_CADENCE=m
  CONFIG_SPI=y
  CONFIG_SPI_ARMADA_3700=y
  CONFIG_SPI_BCM2835=m
@@@ -520,7 -528,6 +521,7 @@@ CONFIG_PINCTRL_IMX8QM=
  CONFIG_PINCTRL_IMX8QXP=y
  CONFIG_PINCTRL_IMX8DXL=y
  CONFIG_PINCTRL_IMX8ULP=y
 +CONFIG_PINCTRL_IMX93=y
  CONFIG_PINCTRL_MSM=y
  CONFIG_PINCTRL_IPQ8074=y
  CONFIG_PINCTRL_IPQ6018=y
@@@ -533,7 -540,6 +534,7 @@@ CONFIG_PINCTRL_QDF2XXX=
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_PINCTRL_SC7180=y
  CONFIG_PINCTRL_SC7280=y
 +CONFIG_PINCTRL_SC8280XP=y
  CONFIG_PINCTRL_SDM845=y
  CONFIG_PINCTRL_SM8150=y
  CONFIG_PINCTRL_SM8250=y
@@@ -572,7 -578,6 +573,7 @@@ CONFIG_CHARGER_BQ25890=
  CONFIG_CHARGER_BQ25980=m
  CONFIG_SENSORS_ARM_SCMI=y
  CONFIG_SENSORS_ARM_SCPI=y
 +CONFIG_SENSORS_GPIO_FAN=m
  CONFIG_SENSORS_JC42=m
  CONFIG_SENSORS_LM75=m
  CONFIG_SENSORS_LM90=m
@@@ -600,15 -605,16 +601,15 @@@ CONFIG_EXYNOS_THERMAL=
  CONFIG_TEGRA_SOCTHERM=m
  CONFIG_TEGRA_BPMP_THERMAL=m
  CONFIG_QCOM_TSENS=y
 +CONFIG_QCOM_SPMI_ADC_TM5=m
  CONFIG_QCOM_SPMI_TEMP_ALARM=m
  CONFIG_QCOM_LMH=m
 -CONFIG_QCOM_SPMI_ADC_TM5=m
  CONFIG_UNIPHIER_THERMAL=y
  CONFIG_WATCHDOG=y
  CONFIG_SL28CPLD_WATCHDOG=m
  CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_ARM_SBSA_WATCHDOG=y
  CONFIG_S3C2410_WATCHDOG=y
 -CONFIG_BCM7038_WDT=m
  CONFIG_DW_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=m
  CONFIG_IMX2_WDT=y
@@@ -622,7 -628,7 +623,8 @@@ CONFIG_RENESAS_RZG2LWDT=
  CONFIG_UNIPHIER_WATCHDOG=y
  CONFIG_PM8916_WATCHDOG=m
  CONFIG_BCM2835_WDT=y
 +CONFIG_BCM7038_WDT=m
+ CONFIG_NPCM7XX_WATCHDOG=y
  CONFIG_MFD_ALTERA_SYSMGR=y
  CONFIG_MFD_BD9571MWV=y
  CONFIG_MFD_AXP20X_I2C=y
@@@ -680,21 -686,21 +682,21 @@@ CONFIG_MEDIA_PLATFORM_SUPPORT=
  CONFIG_MEDIA_USB_SUPPORT=y
  CONFIG_USB_VIDEO_CLASS=m
  CONFIG_V4L_PLATFORM_DRIVERS=y
 +CONFIG_SDR_PLATFORM_DRIVERS=y
 +CONFIG_V4L_MEM2MEM_DRIVERS=y
  CONFIG_VIDEO_QCOM_CAMSS=m
 +CONFIG_VIDEO_QCOM_VENUS=m
 +CONFIG_VIDEO_RCAR_ISP=m
  CONFIG_VIDEO_RCAR_CSI2=m
  CONFIG_VIDEO_RCAR_VIN=m
 -CONFIG_VIDEO_SUN6I_CSI=m
 -CONFIG_VIDEO_RCAR_ISP=m
 -CONFIG_V4L_MEM2MEM_DRIVERS=y
 -CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 -CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 -CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 -CONFIG_VIDEO_RENESAS_FDP1=m
  CONFIG_VIDEO_RENESAS_FCP=m
 +CONFIG_VIDEO_RENESAS_FDP1=m
  CONFIG_VIDEO_RENESAS_VSP1=m
 -CONFIG_VIDEO_QCOM_VENUS=m
 -CONFIG_SDR_PLATFORM_DRIVERS=y
  CONFIG_VIDEO_RCAR_DRIF=m
 +CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 +CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 +CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 +CONFIG_VIDEO_SUN6I_CSI=m
  CONFIG_VIDEO_IMX219=m
  CONFIG_VIDEO_OV5640=m
  CONFIG_VIDEO_OV5645=m
@@@ -750,7 -756,6 +752,7 @@@ CONFIG_DRM_CDNS_MHDP8546=
  CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
  CONFIG_DRM_DW_HDMI_CEC=m
  CONFIG_DRM_IMX_DCSS=m
 +CONFIG_DRM_V3D=m
  CONFIG_DRM_VC4=m
  CONFIG_DRM_ETNAVIV=m
  CONFIG_DRM_HISI_HIBMC=m
@@@ -799,16 -804,12 +801,16 @@@ CONFIG_SND_SOC_RK3399_GRU_SOUND=
  CONFIG_SND_SOC_SAMSUNG=y
  CONFIG_SND_SOC_RCAR=m
  CONFIG_SND_SOC_RZ=m
 +CONFIG_SND_SUN8I_CODEC=m
 +CONFIG_SND_SUN8I_CODEC_ANALOG=m
 +CONFIG_SND_SUN50I_CODEC_ANALOG=m
  CONFIG_SND_SUN4I_I2S=m
  CONFIG_SND_SUN4I_SPDIF=m
  CONFIG_SND_SOC_TEGRA=m
  CONFIG_SND_SOC_TEGRA210_AHUB=m
  CONFIG_SND_SOC_TEGRA210_DMIC=m
  CONFIG_SND_SOC_TEGRA210_I2S=m
 +CONFIG_SND_SOC_TEGRA210_OPE=m
  CONFIG_SND_SOC_TEGRA186_ASRC=m
  CONFIG_SND_SOC_TEGRA186_DSPK=m
  CONFIG_SND_SOC_TEGRA210_ADMAIF=m
@@@ -854,7 -855,6 +856,7 @@@ CONFIG_USB_OTG=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_PCI_RENESAS=m
  CONFIG_USB_XHCI_TEGRA=y
 +CONFIG_USB_BRCMSTB=m
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_EXYNOS=y
  CONFIG_USB_EHCI_HCD_PLATFORM=y
@@@ -933,20 -933,13 +935,20 @@@ CONFIG_MMC_MTK=
  CONFIG_MMC_SDHCI_XENON=y
  CONFIG_MMC_SDHCI_AM654=y
  CONFIG_MMC_OWL=y
 +CONFIG_SCSI_UFSHCD=y
 +CONFIG_SCSI_UFSHCD_PLATFORM=y
 +CONFIG_SCSI_UFS_QCOM=m
 +CONFIG_SCSI_UFS_HISI=y
 +CONFIG_SCSI_UFS_EXYNOS=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
 +CONFIG_LEDS_CLASS_MULTICOLOR=m
  CONFIG_LEDS_LM3692X=m
  CONFIG_LEDS_PCA9532=m
  CONFIG_LEDS_GPIO=y
  CONFIG_LEDS_PWM=y
  CONFIG_LEDS_SYSCON=y
 +CONFIG_LEDS_QCOM_LPG=m
  CONFIG_LEDS_TRIGGER_TIMER=y
  CONFIG_LEDS_TRIGGER_DISK=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@@ -981,8 -974,8 +983,8 @@@ CONFIG_RTC_DRV_PM8XXX=
  CONFIG_RTC_DRV_TEGRA=y
  CONFIG_RTC_DRV_SNVS=m
  CONFIG_RTC_DRV_IMX_SC=m
 -CONFIG_RTC_DRV_XGENE=y
  CONFIG_RTC_DRV_MT6397=m
 +CONFIG_RTC_DRV_XGENE=y
  CONFIG_DMADEVICES=y
  CONFIG_DMA_BCM2835=y
  CONFIG_DMA_SUN6I=m
@@@ -1030,6 -1023,7 +1032,7 @@@ CONFIG_COMMON_CLK_FSL_SAI=
  CONFIG_COMMON_CLK_S2MPS11=y
  CONFIG_COMMON_CLK_PWM=y
  CONFIG_COMMON_CLK_VC5=y
+ CONFIG_COMMON_CLK_NPCM8XX=y
  CONFIG_COMMON_CLK_BD718XX=m
  CONFIG_CLK_RASPBERRYPI=m
  CONFIG_CLK_IMX8MM=y
@@@ -1038,7 -1032,6 +1041,7 @@@ CONFIG_CLK_IMX8MP=
  CONFIG_CLK_IMX8MQ=y
  CONFIG_CLK_IMX8QXP=y
  CONFIG_CLK_IMX8ULP=y
 +CONFIG_CLK_IMX93=y
  CONFIG_TI_SCI_CLK=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_QCOM_A53PLL=y
@@@ -1055,16 -1048,15 +1058,16 @@@ CONFIG_MSM_GCC_8998=
  CONFIG_QCS_GCC_404=y
  CONFIG_SC_GCC_7180=y
  CONFIG_SC_GCC_7280=y
 +CONFIG_SC_GCC_8280XP=y
  CONFIG_SDM_CAMCC_845=m
  CONFIG_SDM_GPUCC_845=y
  CONFIG_SDM_VIDEOCC_845=y
  CONFIG_SDM_DISPCC_845=y
 +CONFIG_SM_DISPCC_8250=y
  CONFIG_SM_GCC_8350=y
  CONFIG_SM_GCC_8450=y
  CONFIG_SM_GPUCC_8150=y
  CONFIG_SM_GPUCC_8250=y
 -CONFIG_SM_DISPCC_8250=y
  CONFIG_SM_VIDEOCC_8250=y
  CONFIG_QCOM_HFPLL=y
  CONFIG_CLK_GFM_LPASS_SM8250=m
@@@ -1102,6 -1094,7 +1105,6 @@@ CONFIG_FSL_MC_DPIO=
  CONFIG_FSL_RCPM=y
  CONFIG_MTK_DEVAPC=m
  CONFIG_MTK_PMIC_WRAP=y
 -CONFIG_MAILBOX=y
  CONFIG_QCOM_AOSS_QMP=y
  CONFIG_QCOM_COMMAND_DB=y
  CONFIG_QCOM_CPR=y
@@@ -1118,7 -1111,6 +1121,7 @@@ CONFIG_QCOM_SOCINFO=
  CONFIG_QCOM_STATS=m
  CONFIG_QCOM_WCNSS_CTRL=m
  CONFIG_QCOM_APR=m
 +CONFIG_QCOM_ICC_BWMON=m
  CONFIG_ARCH_R8A77995=y
  CONFIG_ARCH_R8A77990=y
  CONFIG_ARCH_R8A77950=y
@@@ -1130,7 -1122,6 +1133,7 @@@ CONFIG_ARCH_R8A779F0=
  CONFIG_ARCH_R8A77980=y
  CONFIG_ARCH_R8A77970=y
  CONFIG_ARCH_R8A779A0=y
 +CONFIG_ARCH_R8A779G0=y
  CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A774E1=y
  CONFIG_ARCH_R8A774A1=y
@@@ -1207,10 -1198,8 +1210,10 @@@ CONFIG_PHY_MTK_TPHY=
  CONFIG_PHY_QCOM_PCIE2=m
  CONFIG_PHY_QCOM_QMP=m
  CONFIG_PHY_QCOM_QUSB2=m
 -CONFIG_PHY_QCOM_USB_HS=y
 -CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y
 +CONFIG_PHY_QCOM_USB_HS=m
 +CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
 +CONFIG_PHY_QCOM_USB_HS_28NM=m
 +CONFIG_PHY_QCOM_USB_SS=m
  CONFIG_PHY_RCAR_GEN3_PCIE=y
  CONFIG_PHY_RCAR_GEN3_USB2=y
  CONFIG_PHY_RCAR_GEN3_USB3=m
@@@ -1261,12 -1250,8 +1264,12 @@@ CONFIG_INTERCONNECT_IMX8MN=
  CONFIG_INTERCONNECT_IMX8MQ=m
  CONFIG_INTERCONNECT_QCOM=y
  CONFIG_INTERCONNECT_QCOM_MSM8916=m
 +CONFIG_INTERCONNECT_QCOM_MSM8996=m
  CONFIG_INTERCONNECT_QCOM_OSM_L3=m
 +CONFIG_INTERCONNECT_QCOM_QCS404=m
 +CONFIG_INTERCONNECT_QCOM_SC7180=m
  CONFIG_INTERCONNECT_QCOM_SC7280=y
 +CONFIG_INTERCONNECT_QCOM_SC8280XP=y
  CONFIG_INTERCONNECT_QCOM_SDM845=y
  CONFIG_INTERCONNECT_QCOM_SM8150=m
  CONFIG_INTERCONNECT_QCOM_SM8250=m
@@@ -1314,11 -1299,11 +1317,11 @@@ CONFIG_CRYPTO_DEV_HISI_HPRE=
  CONFIG_CRYPTO_DEV_HISI_TRNG=m
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y
 -CONFIG_DEBUG_INFO=y
 +CONFIG_DEBUG_KERNEL=y
 +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
  CONFIG_DEBUG_INFO_REDUCED=y
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_DEBUG_FS=y
 -CONFIG_DEBUG_KERNEL=y
  # CONFIG_SCHED_DEBUG is not set
  # CONFIG_DEBUG_PREEMPT is not set
  # CONFIG_FTRACE is not set

diff --combined drivers/irqchip/Kconfig
index 2935912b195f0845c33694a4014c6ba7d9ec8eda,4dd4f2108f7a71f42668bc2376316513e9e921e8..66b9fa408bf2422fd083acddbaf705e6ddce6b9a
--- 1/drivers/irqchip/Kconfig
--- 2/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -8,7 -8,7 +8,7 @@@ config IRQCHI
  config ARM_GIC
        bool
        select IRQ_DOMAIN_HIERARCHY
 -      select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
  
  config ARM_GIC_PM
        bool
@@@ -34,7 -34,7 +34,7 @@@ config ARM_GIC_V
        bool
        select IRQ_DOMAIN_HIERARCHY
        select PARTITION_PERCPU
 -      select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
  
  config ARM_GIC_V3_ITS
        bool
@@@ -76,7 -76,7 +76,7 @@@ config ARMADA_370_XP_IR
        bool
        select GENERIC_IRQ_CHIP
        select PCI_MSI if PCI
 -      select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
  
  config ALPINE_MSI
        bool
@@@ -112,7 -112,7 +112,7 @@@ config BCM6345_L1_IR
        bool
        select GENERIC_IRQ_CHIP
        select IRQ_DOMAIN
 -      select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
  
  config BCM7038_L1_IRQ
        tristate "Broadcom STB 7038-style L1/L2 interrupt controller driver"
@@@ -120,7 -120,7 +120,7 @@@
        default ARCH_BRCMSTB || BMIPS_GENERIC
        select GENERIC_IRQ_CHIP
        select IRQ_DOMAIN
 -      select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
  
  config BCM7120_L2_IRQ
        tristate "Broadcom STB 7120-style L2 interrupt controller driver"
@@@ -177,9 -177,9 +177,9 @@@ config MADERA_IR
  config IRQ_MIPS_CPU
        bool
        select GENERIC_IRQ_CHIP
 -      select GENERIC_IRQ_IPI if SYS_SUPPORTS_MULTITHREADING
 +      select GENERIC_IRQ_IPI if SMP && SYS_SUPPORTS_MULTITHREADING
        select IRQ_DOMAIN
 -      select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
  
  config CLPS711X_IRQCHIP
        bool
@@@ -242,14 -242,6 +242,14 @@@ config RENESAS_RZA1_IRQ
          Enable support for the Renesas RZ/A1 Interrupt Controller, to use up
          to 8 external interrupts with configurable sense select.
  
 +config RENESAS_RZG2L_IRQC
 +      bool "Renesas RZ/G2L (and alike SoC) IRQC support" if COMPILE_TEST
 +      select GENERIC_IRQ_CHIP
 +      select IRQ_DOMAIN_HIERARCHY
 +      help
 +        Enable support for the Renesas RZ/G2L (and alike SoC) Interrupt Controller
 +        for external devices.
 +
  config SL28CPLD_INTC
        bool "Kontron sl28cpld IRQ controller"
        depends on MFD_SL28CPLD=y || COMPILE_TEST
@@@ -302,11 -294,11 +302,11 @@@ config VERSATILE_FPGA_IRQ_N
  config XTENSA_MX
        bool
        select IRQ_DOMAIN
 -      select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
  
  config XILINX_INTC
        bool "Xilinx Interrupt Controller IP"
 -      depends on OF
 +      depends on OF_ADDRESS
        select IRQ_DOMAIN
        help
          Support for the Xilinx Interrupt Controller IP core.
@@@ -330,8 -322,7 +330,8 @@@ config KEYSTONE_IR
  
  config MIPS_GIC
        bool
 -      select GENERIC_IRQ_IPI
 +      select GENERIC_IRQ_IPI if SMP
 +      select IRQ_DOMAIN_HIERARCHY
        select MIPS_CM
  
  config INGENIC_IRQ
@@@ -539,7 -530,6 +539,7 @@@ config SIFIVE_PLI
        bool "SiFive Platform-Level Interrupt Controller"
        depends on RISCV
        select IRQ_DOMAIN_HIERARCHY
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
        help
           This enables support for the PLIC chip found in SiFive (and
           potentially other) RISC-V systems.  The PLIC controls devices
@@@ -556,16 -546,6 +556,16 @@@ config EXYNOS_IRQ_COMBINE
          Say yes here to add support for the IRQ combiner devices embedded
          in Samsung Exynos chips.
  
 +config IRQ_LOONGARCH_CPU
 +      bool
 +      select GENERIC_IRQ_CHIP
 +      select IRQ_DOMAIN
 +      select GENERIC_IRQ_EFFECTIVE_AFF_MASK
 +      help
 +        Support for the LoongArch CPU Interrupt Controller. For details of
 +        irq chip hierarchy on LoongArch platforms please read the document
 +        Documentation/loongarch/irq-chip-model.rst.
 +
  config LOONGSON_LIOINTC
        bool "Loongson Local I/O Interrupt Controller"
        depends on MACH_LOONGSON64
@@@ -575,16 -555,6 +575,16 @@@
        help
          Support for the Loongson Local I/O Interrupt Controller.
  
 +config LOONGSON_EIOINTC
 +      bool "Loongson Extend I/O Interrupt Controller"
 +      depends on LOONGARCH
 +      depends on MACH_LOONGSON64
 +      default MACH_LOONGSON64
 +      select IRQ_DOMAIN_HIERARCHY
 +      select GENERIC_IRQ_CHIP
 +      help
 +        Support for the Loongson3 Extend I/O Interrupt Vector Controller.
 +
  config LOONGSON_HTPIC
        bool "Loongson3 HyperTransport PIC Controller"
        depends on MACH_LOONGSON64 && MIPS
@@@ -604,7 -574,7 +604,7 @@@ config LOONGSON_HTVE
  
  config LOONGSON_PCH_PIC
        bool "Loongson PCH PIC Controller"
 -      depends on MACH_LOONGSON64 || COMPILE_TEST
 +      depends on MACH_LOONGSON64
        default MACH_LOONGSON64
        select IRQ_DOMAIN_HIERARCHY
        select IRQ_FASTEOI_HIERARCHY_HANDLERS
@@@ -613,7 -583,7 +613,7 @@@
  
  config LOONGSON_PCH_MSI
        bool "Loongson PCH MSI Controller"
 -      depends on MACH_LOONGSON64 || COMPILE_TEST
 +      depends on MACH_LOONGSON64
        depends on PCI
        default MACH_LOONGSON64
        select IRQ_DOMAIN_HIERARCHY
@@@ -621,14 -591,6 +621,14 @@@
        help
          Support for the Loongson PCH MSI Controller.
  
 +config LOONGSON_PCH_LPC
 +      bool "Loongson PCH LPC Controller"
 +      depends on MACH_LOONGSON64
 +      default (MACH_LOONGSON64 && LOONGARCH)
 +      select IRQ_DOMAIN_HIERARCHY
 +      help
 +        Support for the Loongson PCH LPC Controller.
 +
  config MST_IRQ
        bool "MStar Interrupt Controller"
        depends on ARCH_MEDIATEK || ARCH_MSTARV7 || COMPILE_TEST
@@@ -665,4 -627,13 +665,13 @@@ config MCHP_EI
        help
          Support for Microchip External Interrupt Controller.
  
+ config SUNPLUS_SP7021_INTC
+       bool "Sunplus SP7021 interrupt controller" if COMPILE_TEST
+       default SOC_SP7021
+       help
+         Support for the Sunplus SP7021 Interrupt Controller IP core.
+         SP7021 SoC has 2 Chips: C-Chip & P-Chip. This is used as a
+         chained controller, routing all interrupt source in P-Chip to
+         the primary controller on C-Chip.
+ 
  endmenu

diff --combined drivers/irqchip/Makefile
index 86450eb113989ca20e3145e08b59e465ac6a6049,cb12a152663e5f508489ab4604118c7bfafe7d95..b6acbca2248bc24291a5f2719a024a818f45aec2
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -51,7 -51,6 +51,7 @@@ obj-$(CONFIG_RDA_INTC)                        += irq-rda-int
  obj-$(CONFIG_RENESAS_INTC_IRQPIN)     += irq-renesas-intc-irqpin.o
  obj-$(CONFIG_RENESAS_IRQC)            += irq-renesas-irqc.o
  obj-$(CONFIG_RENESAS_RZA1_IRQC)               += irq-renesas-rza1.o
 +obj-$(CONFIG_RENESAS_RZG2L_IRQC)      += irq-renesas-rzg2l.o
  obj-$(CONFIG_VERSATILE_FPGA_IRQ)      += irq-versatile-fpga.o
  obj-$(CONFIG_ARCH_NSPIRE)             += irq-zevio.o
  obj-$(CONFIG_ARCH_VT8500)             += irq-vt8500.o
@@@ -104,14 -103,11 +104,14 @@@ obj-$(CONFIG_LS1X_IRQ)                  += irq-ls1x.
  obj-$(CONFIG_TI_SCI_INTR_IRQCHIP)     += irq-ti-sci-intr.o
  obj-$(CONFIG_TI_SCI_INTA_IRQCHIP)     += irq-ti-sci-inta.o
  obj-$(CONFIG_TI_PRUSS_INTC)           += irq-pruss-intc.o
 +obj-$(CONFIG_IRQ_LOONGARCH_CPU)               += irq-loongarch-cpu.o
  obj-$(CONFIG_LOONGSON_LIOINTC)                += irq-loongson-liointc.o
 +obj-$(CONFIG_LOONGSON_EIOINTC)                += irq-loongson-eiointc.o
  obj-$(CONFIG_LOONGSON_HTPIC)          += irq-loongson-htpic.o
  obj-$(CONFIG_LOONGSON_HTVEC)          += irq-loongson-htvec.o
  obj-$(CONFIG_LOONGSON_PCH_PIC)                += irq-loongson-pch-pic.o
  obj-$(CONFIG_LOONGSON_PCH_MSI)                += irq-loongson-pch-msi.o
 +obj-$(CONFIG_LOONGSON_PCH_LPC)                += irq-loongson-pch-lpc.o
  obj-$(CONFIG_MST_IRQ)                 += irq-mst-intc.o
  obj-$(CONFIG_SL28CPLD_INTC)           += irq-sl28cpld.o
  obj-$(CONFIG_MACH_REALTEK_RTL)                += irq-realtek-rtl.o
@@@ -119,3 -115,4 +119,4 @@@ obj-$(CONFIG_WPCM450_AIC)          += irq-wpcm4
  obj-$(CONFIG_IRQ_IDT3243X)            += irq-idt3243x.o
  obj-$(CONFIG_APPLE_AIC)                       += irq-apple-aic.o
  obj-$(CONFIG_MCHP_EIC)                        += irq-mchp-eic.o
+ obj-$(CONFIG_SUNPLUS_SP7021_INTC)     += irq-sp7021-intc.o