Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a427ceef934d8162c8c61d152e969bc3ec21a4e5

Authored by Deepak Saxena
Committed by Russell King
1 parent 6cb1907c1a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ARM] 2998/1: Replace map_desc.physical with map_desc.pfn: Footbridge 

Patch from Deepak Saxena

Footbridge map_desc.pfn conversion

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 48 additions and 9 deletions Side-by-side Diff

arch/arm/mach-footbridge/common.c
Diff comments   View file @ a427cee
... ... @@ -130,8 +130,17 @@
130 130 * it means that we have extra bullet protection on our feet.
131 131 */
132 132 static struct map_desc fb_common_io_desc[] __initdata = {
133   - { ARMCSR_BASE, DC21285_ARMCSR_BASE, ARMCSR_SIZE, MT_DEVICE },
134   - { XBUS_BASE, 0x40000000, XBUS_SIZE, MT_DEVICE }
  133 + {
  134 + .virtual = ARMCSR_BASE,
  135 + .pfn = DC21285_ARMCSR_BASE,
  136 + .length = ARMCSR_SIZE,
  137 + .type = MT_DEVICE
  138 + }, {
  139 + .virtual = XBUS_BASE,
  140 + .pfn = __phys_to_pfn(0x40000000),
  141 + .length = XBUS_SIZE,
  142 + .type = MT_DEVICE
  143 + }
135 144 };
136 145  
137 146 /*
... ... @@ -140,11 +149,32 @@
140 149 */
141 150 static struct map_desc ebsa285_host_io_desc[] __initdata = {
142 151 #if defined(CONFIG_ARCH_FOOTBRIDGE) && defined(CONFIG_FOOTBRIDGE_HOST)
143   - { PCIMEM_BASE, DC21285_PCI_MEM, PCIMEM_SIZE, MT_DEVICE },
144   - { PCICFG0_BASE, DC21285_PCI_TYPE_0_CONFIG, PCICFG0_SIZE, MT_DEVICE },
145   - { PCICFG1_BASE, DC21285_PCI_TYPE_1_CONFIG, PCICFG1_SIZE, MT_DEVICE },
146   - { PCIIACK_BASE, DC21285_PCI_IACK, PCIIACK_SIZE, MT_DEVICE },
147   - { PCIO_BASE, DC21285_PCI_IO, PCIO_SIZE, MT_DEVICE }
  152 + {
  153 + .virtual = PCIMEM_BASE,
  154 + .pfn = __phys_to_pfn(DC21285_PCI_MEM),
  155 + .length = PCIMEM_SIZE,
  156 + .type = MT_DEVICE
  157 + }, {
  158 + .virtual = PCICFG0_BASE,
  159 + .pfn = __phys_to_pfn(DC21285_PCI_TYPE_0_CONFIG),
  160 + .length = PCICFG0_SIZE,
  161 + .type = MT_DEVICE
  162 + }, {
  163 + .virtual = PCICFG1_BASE,
  164 + .pfn = __phys_to_pfn(DC21285_PCI_TYPE_1_CONFIG),
  165 + .length = PCICFG1_SIZE,
  166 + .type = MT_DEVICE
  167 + }, {
  168 + .virtual = PCIIACK_BASE,
  169 + .pfn = __phys_to_pfn(DC21285_PCI_IACK),
  170 + .length = PCIIACK_SIZE,
  171 + .type = MT_DEVICE
  172 + }, {
  173 + .virtual = PCIO_BASE,
  174 + .pfn = __phys_to_pfn(DC21285_PCI_IO),
  175 + .length = PCIO_SIZE,
  176 + .type = MT_DEVICE
  177 + }
148 178 #endif
149 179 };
150 180  
... ... @@ -153,8 +183,17 @@
153 183 */
154 184 static struct map_desc co285_io_desc[] __initdata = {
155 185 #ifdef CONFIG_ARCH_CO285
156   - { PCIO_BASE, DC21285_PCI_IO, PCIO_SIZE, MT_DEVICE },
157   - { PCIMEM_BASE, DC21285_PCI_MEM, PCIMEM_SIZE, MT_DEVICE }
  186 + {
  187 + .virtual = PCIO_BASE,
  188 + .pfn = __phys_to_pfn(DC21285_PCI_IO),
  189 + .length = PCIO_SIZE,
  190 + .type = MT_DEVICE
  191 + }, {
  192 + .virtual = PCIMEM_BASE,
  193 + .pfn = __phys_to_pfn(DC21285_PCI_MEM),
  194 + .length = PCIMEM_SIZE,
  195 + .type = MT_DEVICE
  196 + }
158 197 #endif
159 198 };
160 199