Merge tag 'gemini-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git...

Gemini changes for the v5.16 kernel cycle:

- Add device trees for Edimax NS2502 and SSI 1328

- Consolidate PCI interrupts

* tag 'gemini-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: gemini: Consolidate PCI interrupt-map properties
  ARM: gemini: add device tree for ssi1328
  ARM: gemini: add device tree for edimax NS2502
  dt-bindings: add vendor prefix for ssi
  dt-bindings: add vendor prefix for edimax
  ARM: dts: gemini: add labels for USB, IDE, flash and ethernet

Link: https://lore.kernel.org/r/CACRpkdac5Sbt42CtuLMgCazfHdhcP98mEKGjeZ-DVcb=_N90Bg@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml
index 18f3f3b,917c3b8..5186c9c
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -191,8 -191,6 +191,8 @@@ patternProperties
      description: B&R Industrial Automation GmbH
    "^bticino,.*":
      description: Bticino International
 +  "^calamp,.*":
 +    description: CalAmp Corp.
    "^calaosystems,.*":
      description: CALAO Systems SAS
    "^calxeda,.*":
@@@ -337,6 -335,8 +337,8 @@@
      description: EBV Elektronik
    "^eckelmann,.*":
      description: Eckelmann AG
+   "^edimax,.*":
+     description: EDIMAX Technology Co., Ltd
    "^edt,.*":
      description: Emerging Display Technologies
    "^eeti,.*":
@@@ -397,8 -397,6 +399,8 @@@
      description: Exar Corporation
    "^excito,.*":
      description: Excito
 +  "^exegin,.*":
 +    description: Exegin Technologies Limited
    "^ezchip,.*":
      description: EZchip Semiconductor
    "^facebook,.*":
@@@ -581,8 -579,6 +583,8 @@@
      description: JEDEC Solid State Technology Association
    "^jesurun,.*":
      description: Shenzhen Jesurun Electronics Business Dept.
 +  "^jethome,.*":
 +    description: JetHome (IP Sokolov P.A.)
    "^jianda,.*":
      description: Jiandangjing Technology Co., Ltd.
    "^kam,.*":
@@@ -1108,6 -1104,8 +1110,8 @@@
      description: SparkFun Electronics
    "^sprd,.*":
      description: Spreadtrum Communications Inc.
+   "^ssi,.*":
+     description: SSI Computer Corp
    "^sst,.*":
      description: Silicon Storage Technology, Inc.
    "^sstar,.*":

diff --combined arch/arm/boot/dts/Makefile
index b62c6fb,d2da53b..d4fce45
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -25,7 -25,6 +25,7 @@@ dtb-$(CONFIG_SOC_AT91SAM9) += 
        usb_a9263.dtb \
        at91-foxg20.dtb \
        at91-kizbox.dtb \
 +      at91-lmu5000.dtb \
        at91sam9g20ek.dtb \
        at91sam9g20ek_2mmc.dtb \
        tny_a9g20.dtb \
@@@ -41,7 -40,6 +41,7 @@@
        at91-kizboxmini-base.dtb \
        at91-kizboxmini-mb.dtb \
        at91-kizboxmini-rd.dtb \
 +      at91-q5xr5.dtb \
        at91-smartkiz.dtb \
        at91-wb45n.dtb \
        at91sam9g15ek.dtb \
@@@ -94,7 -92,6 +94,7 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2837-rpi-cm3-io3.dtb \
        bcm2711-rpi-400.dtb \
        bcm2711-rpi-4-b.dtb \
 +      bcm2711-rpi-cm4-io.dtb \
        bcm2835-rpi-zero.dtb \
        bcm2835-rpi-zero-w.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
@@@ -120,7 -117,6 +120,7 @@@
        bcm4709-netgear-r7000.dtb \
        bcm4709-netgear-r8000.dtb \
        bcm4709-tplink-archer-c9-v1.dtb \
 +      bcm47094-asus-rt-ac88u.dtb \
        bcm47094-dlink-dir-885l.dtb \
        bcm47094-linksys-panamera.dtb \
        bcm47094-luxul-abr-4500.dtb \
@@@ -161,12 -157,6 +161,12 @@@ dtb-$(CONFIG_ARCH_BCM_NSP) += 
        bcm958525xmc.dtb \
        bcm958622hr.dtb \
        bcm958623hr.dtb \
 +      bcm958625-meraki-mx64.dtb \
 +      bcm958625-meraki-mx64-a0.dtb \
 +      bcm958625-meraki-mx64w.dtb \
 +      bcm958625-meraki-mx64w-a0.dtb \
 +      bcm958625-meraki-mx65.dtb \
 +      bcm958625-meraki-mx65w.dtb \
        bcm958625hr.dtb \
        bcm988312hr.dtb \
        bcm958625k.dtb
@@@ -229,9 -219,11 +229,11 @@@ dtb-$(CONFIG_ARCH_GEMINI) += 
        gemini-dlink-dir-685.dtb \
        gemini-dlink-dns-313.dtb \
        gemini-nas4220b.dtb \
+       gemini-ns2502.dtb \
        gemini-rut1xx.dtb \
        gemini-sl93512r.dtb \
        gemini-sq201.dtb \
+       gemini-ssi1328.dtb \
        gemini-wbd111.dtb \
        gemini-wbd222.dtb
  dtb-$(CONFIG_ARCH_HI3xxx) += \
@@@ -645,12 -637,10 +647,12 @@@ dtb-$(CONFIG_SOC_IMX6SL) += 
        imx6sl-evk.dtb \
        imx6sl-tolino-shine2hd.dtb \
        imx6sl-tolino-shine3.dtb \
 +      imx6sl-tolino-vision5.dtb \
        imx6sl-warp.dtb
  dtb-$(CONFIG_SOC_IMX6SLL) += \
        imx6sll-evk.dtb \
 -      imx6sll-kobo-clarahd.dtb
 +      imx6sll-kobo-clarahd.dtb \
 +      imx6sll-kobo-librah2o.dtb
  dtb-$(CONFIG_SOC_IMX6SX) += \
        imx6sx-nitrogen6sx.dtb \
        imx6sx-sabreauto.dtb \
@@@ -683,7 -673,6 +685,7 @@@ dtb-$(CONFIG_SOC_IMX6UL) += 
        imx6ul-tx6ul-0011.dtb \
        imx6ul-tx6ul-mainboard.dtb \
        imx6ull-14x14-evk.dtb \
 +      imx6ull-colibri-emmc-eval-v3.dtb \
        imx6ull-colibri-eval-v3.dtb \
        imx6ull-colibri-wifi-eval-v3.dtb \
        imx6ull-myir-mys-6ulx-eval.dtb \
@@@ -952,7 -941,6 +954,7 @@@ dtb-$(CONFIG_ARCH_OXNAS) += 
        ox810se-wd-mbwe.dtb \
        ox820-cloudengines-pogoplug-series-3.dtb
  dtb-$(CONFIG_ARCH_QCOM) += \
 +      qcom-apq8026-lge-lenok.dtb \
        qcom-apq8060-dragonboard.dtb \
        qcom-apq8064-cm-qs600.dtb \
        qcom-apq8064-ifc6410.dtb \
@@@ -1127,7 -1115,6 +1129,7 @@@ dtb-$(CONFIG_ARCH_STM32) += 
        stm32h743i-eval.dtb \
        stm32h743i-disco.dtb \
        stm32h750i-art-pi.dtb \
 +      stm32mp135f-dk.dtb \
        stm32mp153c-dhcom-drc02.dtb \
        stm32mp157a-avenger96.dtb \
        stm32mp157a-dhcor-avenger96.dtb \
@@@ -1402,7 -1389,6 +1404,7 @@@ dtb-$(CONFIG_MACH_ARMADA_370) += 
  dtb-$(CONFIG_MACH_ARMADA_375) += \
        armada-375-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_38X) += \
 +      armada-381-netgear-gs110emx.dtb \
        armada-382-rd-ac3x-48g4x2xl.dtb \
        armada-385-atl-x530.dtb\
        armada-385-clearfog-gtr-s4.dtb \
@@@ -1513,5 -1499,4 +1515,5 @@@ dtb-$(CONFIG_ARCH_ASPEED) += 
        aspeed-bmc-opp-zaius.dtb \
        aspeed-bmc-portwell-neptune.dtb \
        aspeed-bmc-quanta-q71l.dtb \
 -      aspeed-bmc-supermicro-x11spi.dtb
 +      aspeed-bmc-supermicro-x11spi.dtb \
 +      aspeed-bmc-tyan-s7106.dtb