diff options
author | Deepak Saxena <dsaxena@plexity.net> | 2005-10-28 10:18:59 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-28 10:18:59 -0400 |
commit | 87fe04bd2a39f263211cc232da9f4f094eaffea0 (patch) | |
tree | d6b74cf34b442ae3e0a519dec4d2aed1dea406d9 | |
parent | db0d087e34d251254f6349e607c2a2ec295cd90b (diff) |
[ARM] 2985/1: Replace map_desc.physical with map_desc.pfn: IXP4xx
Patch from Deepak Saxena
IXP4xx map_desc.pfn conversion
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 36b6045213ee..6c396447c4e0 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -44,24 +44,24 @@ | |||
44 | static struct map_desc ixp4xx_io_desc[] __initdata = { | 44 | static struct map_desc ixp4xx_io_desc[] __initdata = { |
45 | { /* UART, Interrupt ctrl, GPIO, timers, NPEs, MACs, USB .... */ | 45 | { /* UART, Interrupt ctrl, GPIO, timers, NPEs, MACs, USB .... */ |
46 | .virtual = IXP4XX_PERIPHERAL_BASE_VIRT, | 46 | .virtual = IXP4XX_PERIPHERAL_BASE_VIRT, |
47 | .physical = IXP4XX_PERIPHERAL_BASE_PHYS, | 47 | .pfn = __phys_to_pfn(IXP4XX_PERIPHERAL_BASE_PHYS), |
48 | .length = IXP4XX_PERIPHERAL_REGION_SIZE, | 48 | .length = IXP4XX_PERIPHERAL_REGION_SIZE, |
49 | .type = MT_DEVICE | 49 | .type = MT_DEVICE |
50 | }, { /* Expansion Bus Config Registers */ | 50 | }, { /* Expansion Bus Config Registers */ |
51 | .virtual = IXP4XX_EXP_CFG_BASE_VIRT, | 51 | .virtual = IXP4XX_EXP_CFG_BASE_VIRT, |
52 | .physical = IXP4XX_EXP_CFG_BASE_PHYS, | 52 | .pfn = __phys_to_pfn(IXP4XX_EXP_CFG_BASE_PHYS), |
53 | .length = IXP4XX_EXP_CFG_REGION_SIZE, | 53 | .length = IXP4XX_EXP_CFG_REGION_SIZE, |
54 | .type = MT_DEVICE | 54 | .type = MT_DEVICE |
55 | }, { /* PCI Registers */ | 55 | }, { /* PCI Registers */ |
56 | .virtual = IXP4XX_PCI_CFG_BASE_VIRT, | 56 | .virtual = IXP4XX_PCI_CFG_BASE_VIRT, |
57 | .physical = IXP4XX_PCI_CFG_BASE_PHYS, | 57 | .pfn = __phys_to_pfn(IXP4XX_PCI_CFG_BASE_PHYS), |
58 | .length = IXP4XX_PCI_CFG_REGION_SIZE, | 58 | .length = IXP4XX_PCI_CFG_REGION_SIZE, |
59 | .type = MT_DEVICE | 59 | .type = MT_DEVICE |
60 | }, | 60 | }, |
61 | #ifdef CONFIG_DEBUG_LL | 61 | #ifdef CONFIG_DEBUG_LL |
62 | { /* Debug UART mapping */ | 62 | { /* Debug UART mapping */ |
63 | .virtual = IXP4XX_DEBUG_UART_BASE_VIRT, | 63 | .virtual = IXP4XX_DEBUG_UART_BASE_VIRT, |
64 | .physical = IXP4XX_DEBUG_UART_BASE_PHYS, | 64 | .pfn = __phys_to_pfn(IXP4XX_DEBUG_UART_BASE_PHYS), |
65 | .length = IXP4XX_DEBUG_UART_REGION_SIZE, | 65 | .length = IXP4XX_DEBUG_UART_REGION_SIZE, |
66 | .type = MT_DEVICE | 66 | .type = MT_DEVICE |
67 | } | 67 | } |