From 3ac5c424f60676b4cbc346a7c3c1cada87ff5b61 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 24 Sep 2012 07:22:02 +0000 Subject: [PATCH] --- yaml --- r: 333309 b: refs/heads/master c: 21c8715f0a1f4df8bfa2bd6f3915e5e33c1c2e6e h: refs/heads/master i: 333307: 267a64162a6df6b2d4983f7ad644f41e404565a5 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/include/mach/cm.h | 2 +- trunk/arch/arm/mach-integrator/include/mach/platform.h | 6 +++--- trunk/arch/arm/mach-integrator/integrator_ap.c | 2 +- trunk/arch/arm/mach-integrator/integrator_cp.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index df1d14ff3387..b3580353af79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6e9fbbf4c9aa837c0d39a097f96aaf4f90dfef1 +refs/heads/master: 21c8715f0a1f4df8bfa2bd6f3915e5e33c1c2e6e diff --git a/trunk/arch/arm/mach-integrator/include/mach/cm.h b/trunk/arch/arm/mach-integrator/include/mach/cm.h index 1a78692e32a4..202e6a57f100 100644 --- a/trunk/arch/arm/mach-integrator/include/mach/cm.h +++ b/trunk/arch/arm/mach-integrator/include/mach/cm.h @@ -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) diff --git a/trunk/arch/arm/mach-integrator/include/mach/platform.h b/trunk/arch/arm/mach-integrator/include/mach/platform.h index 4c0347526851..efeac5d0bc9e 100644 --- a/trunk/arch/arm/mach-integrator/include/mach/platform.h +++ b/trunk/arch/arm/mach-integrator/include/mach/platform.h @@ -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 diff --git a/trunk/arch/arm/mach-integrator/integrator_ap.c b/trunk/arch/arm/mach-integrator/integrator_ap.c index d5b5435a09ae..e6617c134faf 100644 --- a/trunk/arch/arm/mach-integrator/integrator_ap.c +++ b/trunk/arch/arm/mach-integrator/integrator_ap.c @@ -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)); } diff --git a/trunk/arch/arm/mach-integrator/integrator_cp.c b/trunk/arch/arm/mach-integrator/integrator_cp.c index 6870a1fbcd78..5b08e8e4cc83 100644 --- a/trunk/arch/arm/mach-integrator/integrator_cp.c +++ b/trunk/arch/arm/mach-integrator/integrator_cp.c @@ -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 */ }