ARM: integrator: use __iomem pointers for MMIO, part 2
Due to some interesting merges in the integrator code, not all users of mmio pointers were converted before, this fixes all warnings that got introduced as a consequence. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
c6e9fbbf4c
commit
21c8715f0a
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
void cm_control(u32, u32);
|
||||
|
||||
#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL)
|
||||
#define CM_CTRL __io_address(INTEGRATOR_HDR_CTRL)
|
||||
|
||||
#define CM_CTRL_LED (1 << 0)
|
||||
#define CM_CTRL_nMBDET (1 << 1)
|
||||
|
|
|
@ -324,9 +324,9 @@
|
|||
*/
|
||||
#define PHYS_PCI_V3_BASE 0x62000000
|
||||
|
||||
#define PCI_MEMORY_VADDR 0xe8000000
|
||||
#define PCI_CONFIG_VADDR 0xec000000
|
||||
#define PCI_V3_VADDR 0xed000000
|
||||
#define PCI_MEMORY_VADDR IOMEM(0xe8000000)
|
||||
#define PCI_CONFIG_VADDR IOMEM(0xec000000)
|
||||
#define PCI_V3_VADDR IOMEM(0xed000000)
|
||||
|
||||
/* ------------------------------------------------------------------------
|
||||
* Integrator Interrupt Controllers
|
||||
|
|
|
@ -157,7 +157,7 @@ static struct map_desc ap_io_desc[] __initdata = {
|
|||
static void __init ap_map_io(void)
|
||||
{
|
||||
iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
|
||||
vga_base = PCI_MEMORY_VADDR;
|
||||
vga_base = (unsigned long)PCI_MEMORY_VADDR;
|
||||
pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));
|
||||
}
|
||||
|
||||
|
|
|
@ -261,6 +261,8 @@ static void __init intcp_init_early(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
|
||||
static void __init intcp_timer_init_of(void)
|
||||
{
|
||||
struct device_node *node;
|
||||
|
@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = {
|
|||
.init = intcp_timer_init_of,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
|
||||
static const struct of_device_id fpga_irq_of_match[] __initconst = {
|
||||
{ .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },
|
||||
{ /* Sentinel */ }
|
||||
|
|
Loading…
Reference in a new issue