Drop arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.14/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
deleted file mode 100644 (file)
index bbcfe16..0000000
--- a/queue-4.14/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9c5c660bbc401a6b042a98a8d94a635ed71e198a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Jul 2021 17:16:04 +0200
-Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ]
-
-When this driver is disabled, the board file fails to build,
-so add a dependency:
-
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration]
-  472 |         ixp4xx_pci_preinit();
-      |         ^~~~~~~~~~~~~~~~~~
-      |         iop3xx_pci_preinit
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration]
-  481 |                 if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) {
-      |                      ^~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function)
-  231 |                 .start          = IXP4XX_UART1_BASE_PHYS,
-      |                                   ^~~~~~~~~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init':
-arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration]
-  376 |         ixp4xx_sys_init();
-      |         ^~~~~~~~~~~~~~~
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: soc@kernel.org
-Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/mach-ixp4xx/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
-index c342dc4e8a45..2489b6151ace 100644
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -76,6 +76,7 @@ config MACH_IXDP465
- 
- config MACH_GORAMO_MLR
-       bool "GORAMO Multi Link Router"
-+      depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support GORAMO
-         MultiLink router.
--- 
-2.30.2
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 4054bace2b0755db299f6e59fc39c8be007431aa..174b0b9505b607ffbc23a6a71596d8ca6f61f189 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -43,5 +43,4 @@ scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch
 scsi-scsi_dh_rdac-avoid-crash-during-rdac_bus_attach.patch
 scsi-core-avoid-printing-an-error-if-target_alloc-re.patch
 arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch
-arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
 net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch

diff --git a/queue-4.19/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.19/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
deleted file mode 100644 (file)
index 2d5786d..0000000
--- a/queue-4.19/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 54964ecc4104980c371d55381a2337b9075e0725 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Jul 2021 17:16:04 +0200
-Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ]
-
-When this driver is disabled, the board file fails to build,
-so add a dependency:
-
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration]
-  472 |         ixp4xx_pci_preinit();
-      |         ^~~~~~~~~~~~~~~~~~
-      |         iop3xx_pci_preinit
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration]
-  481 |                 if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) {
-      |                      ^~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function)
-  231 |                 .start          = IXP4XX_UART1_BASE_PHYS,
-      |                                   ^~~~~~~~~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init':
-arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration]
-  376 |         ixp4xx_sys_init();
-      |         ^~~~~~~~~~~~~~~
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: soc@kernel.org
-Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/mach-ixp4xx/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
-index c342dc4e8a45..2489b6151ace 100644
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -76,6 +76,7 @@ config MACH_IXDP465
- 
- config MACH_GORAMO_MLR
-       bool "GORAMO Multi Link Router"
-+      depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support GORAMO
-         MultiLink router.
--- 
-2.30.2
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 25c783249997c0d00b4d4e0c344ebefb0061f6ae..69f25e03ede88889b87b9e5129f61c7229e70d11 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -55,5 +55,4 @@ scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch
 scsi-scsi_dh_rdac-avoid-crash-during-rdac_bus_attach.patch
 scsi-core-avoid-printing-an-error-if-target_alloc-re.patch
 arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch
-arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
 net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch

diff --git a/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
deleted file mode 100644 (file)
index 5078bc0..0000000
--- a/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b9812a8aa6eed8ec79440014fbef6f4e1e2c2f83 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Jul 2021 17:16:04 +0200
-Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ]
-
-When this driver is disabled, the board file fails to build,
-so add a dependency:
-
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration]
-  472 |         ixp4xx_pci_preinit();
-      |         ^~~~~~~~~~~~~~~~~~
-      |         iop3xx_pci_preinit
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration]
-  481 |                 if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) {
-      |                      ^~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function)
-  231 |                 .start          = IXP4XX_UART1_BASE_PHYS,
-      |                                   ^~~~~~~~~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init':
-arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration]
-  376 |         ixp4xx_sys_init();
-      |         ^~~~~~~~~~~~~~~
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: soc@kernel.org
-Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/mach-ixp4xx/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
-index c342dc4e8a45..2489b6151ace 100644
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -76,6 +76,7 @@ config MACH_IXDP465
- 
- config MACH_GORAMO_MLR
-       bool "GORAMO Multi Link Router"
-+      depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support GORAMO
-         MultiLink router.
--- 
-2.30.2
-

diff --git a/queue-4.4/series b/queue-4.4/series
index a7a990f0fd40512f451678b132d60442dd3c2d64..21f852abeaa3495873f3e410ab6a213e6a296e3a 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -18,4 +18,3 @@ arm-dts-am43x-epos-evm-reduce-i2c0-bus-speed-for-tps.patch
 dmaengine-of-dma-router_xlate-to-return-eprobe_defer.patch
 scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch
 scsi-core-avoid-printing-an-error-if-target_alloc-re.patch
-arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch

diff --git a/queue-4.9/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.9/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
deleted file mode 100644 (file)
index 1209db0..0000000
--- a/queue-4.9/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bf9b73c958cd29d651bd93d88c2665f9dd7f2201 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Jul 2021 17:16:04 +0200
-Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ]
-
-When this driver is disabled, the board file fails to build,
-so add a dependency:
-
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration]
-  472 |         ixp4xx_pci_preinit();
-      |         ^~~~~~~~~~~~~~~~~~
-      |         iop3xx_pci_preinit
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration]
-  481 |                 if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) {
-      |                      ^~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function)
-  231 |                 .start          = IXP4XX_UART1_BASE_PHYS,
-      |                                   ^~~~~~~~~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init':
-arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration]
-  376 |         ixp4xx_sys_init();
-      |         ^~~~~~~~~~~~~~~
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: soc@kernel.org
-Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/mach-ixp4xx/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
-index c342dc4e8a45..2489b6151ace 100644
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -76,6 +76,7 @@ config MACH_IXDP465
- 
- config MACH_GORAMO_MLR
-       bool "GORAMO Multi Link Router"
-+      depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support GORAMO
-         MultiLink router.
--- 
-2.30.2
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 76448f5573cf33e95d4cbf20d01d18e5a9231854..9a48f9070e3ed74f0b68a929e464a2966feb81b0 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -27,4 +27,3 @@ scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch
 scsi-scsi_dh_rdac-avoid-crash-during-rdac_bus_attach.patch
 scsi-core-avoid-printing-an-error-if-target_alloc-re.patch
 arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch
-arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch

diff --git a/queue-5.10/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-5.10/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
deleted file mode 100644 (file)
index 15cf471..0000000
--- a/queue-5.10/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5f942aaca9991ec74fa82248f34703641681ef7d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Jul 2021 17:16:04 +0200
-Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ]
-
-When this driver is disabled, the board file fails to build,
-so add a dependency:
-
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration]
-  472 |         ixp4xx_pci_preinit();
-      |         ^~~~~~~~~~~~~~~~~~
-      |         iop3xx_pci_preinit
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration]
-  481 |                 if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) {
-      |                      ^~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function)
-  231 |                 .start          = IXP4XX_UART1_BASE_PHYS,
-      |                                   ^~~~~~~~~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init':
-arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration]
-  376 |         ixp4xx_sys_init();
-      |         ^~~~~~~~~~~~~~~
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: soc@kernel.org
-Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/mach-ixp4xx/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
-index 165c184801e1..57e61e797189 100644
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -89,6 +89,7 @@ config MACH_IXDP465
- 
- config MACH_GORAMO_MLR
-       bool "GORAMO Multi Link Router"
-+      depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support GORAMO
-         MultiLink router.
--- 
-2.30.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 52deaf73ccf09d358dfa3aad7f5d5689ece0d50b..311817d36bcd77903c8559dc352e160b6a447edb 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -28,7 +28,6 @@ scsi-core-fix-capacity-set-to-zero-after-offlinining.patch
 drm-amdgpu-fix-the-doorbell-missing-when-in-cgpg-iss.patch
 qede-fix-crash-in-rmmod-qede-while-automatic-debug-c.patch
 arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch
-arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
 net-usb-pegasus-check-the-return-value-of-get_gerist.patch
 net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch
 drm-amd-display-fix-dynamic-bpp-issue-with-8k30-with.patch

diff --git a/queue-5.13/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-5.13/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
deleted file mode 100644 (file)
index 9fc6123..0000000
--- a/queue-5.13/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 80dbc63aa6264ab8d9274381973ddb6beb243c1f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Jul 2021 17:16:04 +0200
-Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ]
-
-When this driver is disabled, the board file fails to build,
-so add a dependency:
-
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration]
-  472 |         ixp4xx_pci_preinit();
-      |         ^~~~~~~~~~~~~~~~~~
-      |         iop3xx_pci_preinit
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration]
-  481 |                 if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) {
-      |                      ^~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function)
-  231 |                 .start          = IXP4XX_UART1_BASE_PHYS,
-      |                                   ^~~~~~~~~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init':
-arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration]
-  376 |         ixp4xx_sys_init();
-      |         ^~~~~~~~~~~~~~~
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: soc@kernel.org
-Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/mach-ixp4xx/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
-index 165c184801e1..57e61e797189 100644
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -89,6 +89,7 @@ config MACH_IXDP465
- 
- config MACH_GORAMO_MLR
-       bool "GORAMO Multi Link Router"
-+      depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support GORAMO
-         MultiLink router.
--- 
-2.30.2
-

diff --git a/queue-5.13/series b/queue-5.13/series
index fa5860946f68cd10044eaf2a28fea02f0eab6c66..44e3c1ac381cb1af894a5e531fc0b2e1fd29b86d 100644 (file)
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -16,7 +16,6 @@ scsi-core-fix-capacity-set-to-zero-after-offlinining.patch
 drm-amdgpu-fix-the-doorbell-missing-when-in-cgpg-iss.patch
 qede-fix-crash-in-rmmod-qede-while-automatic-debug-c.patch
 arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch
-arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
 net-usb-pegasus-check-the-return-value-of-get_gerist.patch
 net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch
 perf-x86-fix-out-of-bound-msr-access.patch

diff --git a/queue-5.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-5.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
deleted file mode 100644 (file)
index 2d54bc5..0000000
--- a/queue-5.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 61635a65ff62933ccabf54a6fb19280e9307f268 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Jul 2021 17:16:04 +0200
-Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ]
-
-When this driver is disabled, the board file fails to build,
-so add a dependency:
-
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration]
-  472 |         ixp4xx_pci_preinit();
-      |         ^~~~~~~~~~~~~~~~~~
-      |         iop3xx_pci_preinit
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit':
-arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration]
-  481 |                 if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) {
-      |                      ^~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function)
-  231 |                 .start          = IXP4XX_UART1_BASE_PHYS,
-      |                                   ^~~~~~~~~~~~~~~~~~~~~~
-arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init':
-arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration]
-  376 |         ixp4xx_sys_init();
-      |         ^~~~~~~~~~~~~~~
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: soc@kernel.org
-Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/mach-ixp4xx/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
-index 165c184801e1..57e61e797189 100644
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -89,6 +89,7 @@ config MACH_IXDP465
- 
- config MACH_GORAMO_MLR
-       bool "GORAMO Multi Link Router"
-+      depends on IXP4XX_PCI_LEGACY
-       help
-         Say 'Y' here if you want your kernel to support GORAMO
-         MultiLink router.
--- 
-2.30.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 86c76ba5fbbf43a1d5d2df45ab88021aedd599f8..324332707555856de5b0bc17ede303124aaa3cbd 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -20,6 +20,5 @@ scsi-scsi_dh_rdac-avoid-crash-during-rdac_bus_attach.patch
 scsi-core-avoid-printing-an-error-if-target_alloc-re.patch
 scsi-core-fix-capacity-set-to-zero-after-offlinining.patch
 arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch
-arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch
 net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch
 drm-amd-display-fix-dynamic-bpp-issue-with-8k30-with.patch