summaryrefslogtreecommitdiffstats
path: root/drivers/soc/ixp4xx/ixp4xx-qmgr.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2021-04-29 23:34:10 +0200
committerLinus Walleij <linus.walleij@linaro.org>2021-06-16 15:14:30 +0200
commitd5d9f7ac58ea1041375a028f143ca5784693ea86 (patch)
tree48770ffb1834729c9444507532d85fc43f8dced9 /drivers/soc/ixp4xx/ixp4xx-qmgr.c
parent713ce38d46eb5caef20aeb8f9794ce4521cb58bf (diff)
downloadlinux-d5d9f7ac58ea1041375a028f143ca5784693ea86.tar.bz2
ARM/ixp4xx: Make NEED_MACH_IO_H optional
In order to create a proper PCI driver for the IXP4xx we need to make the old PCI driver and its reliance on <mach/io.h> optional. Create a new Kconfig symbol for the legacy PCI driver IXP4XX_PCI_LEGACY and only activate NEED_MACH_IO_H for this driver. A few files need to be adjusted to explicitly include the <mach/hardware.h> and <mach/cpu.h> headers that they previously obtained implicitly using <linux/io.h> that would include <mach/io.h> and in turn include these two headers. This breaks our reliance on the old PCI and indirect PCI support so we can reimplement a proper purely DT-based driver in the PCI subsystem. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Imre Kaloz <kaloz@openwrt.org> Cc: Krzysztof Halasa <khalasa@piap.pl> Cc: Zoltan HERPAI <wigyori@uid0.hu> Cc: Raylynn Knight <rayknight@me.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/soc/ixp4xx/ixp4xx-qmgr.c')
-rw-r--r--drivers/soc/ixp4xx/ixp4xx-qmgr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/soc/ixp4xx/ixp4xx-qmgr.c b/drivers/soc/ixp4xx/ixp4xx-qmgr.c
index 8c968382cea7..1b1631ac0438 100644
--- a/drivers/soc/ixp4xx/ixp4xx-qmgr.c
+++ b/drivers/soc/ixp4xx/ixp4xx-qmgr.c
@@ -12,6 +12,8 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/soc/ixp4xx/qmgr.h>
+#include <mach/hardware.h>
+#include <mach/cpu.h>
static struct qmgr_regs __iomem *qmgr_regs;
static int qmgr_irq_1;