Message ID | 3582240.H8v1IXn8EB@wuerfel |
---|---|
State | New |
Headers | show |
Arnd Bergmann <arnd@arndb.de> writes: > I guess we can bring back the macros for the case that MTD_XIP and XIP_KERNEL > are both enabled. > > Arnd I wouldn't have ICMR and ICIP exposed to drivers, Eric's original move looks corect to me. On the other hand, I'm wondering if xip_irqpending(), xip_currtime() and xip_cpu_idle() should be declared as functions in mtd-xip.h, and be part of something like arch/arm/mach-pxa/xip.c ... Cheers.
On Saturday 05 March 2016, Robert Jarzmik wrote: > Arnd Bergmann <arnd@arndb.de> writes: > > > I guess we can bring back the macros for the case that MTD_XIP and XIP_KERNEL > > are both enabled. > > > > Arnd > I wouldn't have ICMR and ICIP exposed to drivers, Eric's original move looks > corect to me. Yes, it's a reasonable cleanup that we have done in many places, except this one introduced a regression for MTD_XIP. > On the other hand, I'm wondering if xip_irqpending(), xip_currtime() and > xip_cpu_idle() should be declared as functions in mtd-xip.h, and be part of > something like arch/arm/mach-pxa/xip.c ... They have to at least be marked __xipram and must not reference anything in .text or .rodata, but there might be additional requirements. Arnd
diff --git a/arch/arm/mach-pxa/include/mach/regs-intc.h b/arch/arm/mach-pxa/include/mach/regs-intc.h deleted file mode 100644 index 662288eb6f95..000000000000 --- a/arch/arm/mach-pxa/include/mach/regs-intc.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __ASM_MACH_REGS_INTC_H -#define __ASM_MACH_REGS_INTC_H - -#include <mach/hardware.h> - -/* - * Interrupt Controller - */ - -#define ICIP __REG(0x40D00000) /* Interrupt Controller IRQ Pending Register */ -#define ICMR __REG(0x40D00004) /* Interrupt Controller Mask Register */ -#define ICLR __REG(0x40D00008) /* Interrupt Controller Level Register */ -#define ICFP __REG(0x40D0000C) /* Interrupt Controller FIQ Pending Register */ -#define ICPR __REG(0x40D00010) /* Interrupt Controller Pending Register */ -#define ICCR __REG(0x40D00014) /* Interrupt Controller Control Register */ -#define ICHP __REG(0x40D00018) /* Interrupt Controller Highest Priority Register */ and it's possible that nobody ever noticed... I guess we can bring back the macros for the case that MTD_XIP and XIP_KERNEL are both enabled. Arnd _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel