--- /dev/null
+From eb4f756915875b0ea0757751cd29841f0504d547 Mon Sep 17 00:00:00 2001
+From: Wang Kefeng <wangkefeng.wang@huawei.com>
+Date: Mon, 23 Aug 2021 10:41:42 +0100
+Subject: ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
+
+From: Wang Kefeng <wangkefeng.wang@huawei.com>
+
+commit eb4f756915875b0ea0757751cd29841f0504d547 upstream.
+
+After commit 77a7300abad7 ("of/irq: Get rid of NO_IRQ usage"),
+no irq case has been removed, irq_of_parse_and_map() will return
+0 in all cases when get error from parse and map an interrupt into
+linux virq space.
+
+amba_device_register() is only used on no-DT initialization, see
+ s3c64xx_pl080_init() arch/arm/mach-s3c/pl080.c
+ ep93xx_init_devices() arch/arm/mach-ep93xx/core.c
+
+They won't set -1 to irq[0], so no need the warn.
+
+This reverts commit 2eac58d5026e4ec8b17ff8b62877fea9e1d2f1b3.
+
+Reviewed-by: Rob Herring <robh@kernel.org>
+Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
+Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/amba/bus.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/amba/bus.c
++++ b/drivers/amba/bus.c
+@@ -356,9 +356,6 @@ static int amba_device_try_add(struct am
+ void __iomem *tmp;
+ int i, ret;
+
+- WARN_ON(dev->irq[0] == (unsigned int)-1);
+- WARN_ON(dev->irq[1] == (unsigned int)-1);
+-
+ ret = request_resource(parent, &dev->res);
+ if (ret)
+ goto err_out;