From: Thomas Petazzoni Date: Tue, 11 Sep 2012 12:27:28 +0000 (+0200) Subject: arm: plat-orion: make bridge_virt_base non-const to support DT use case X-Git-Tag: next-20120924~18^2~1^2~3^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=87d136415c78c02680dc474cb4093ba7911b07a4;p=karo-tx-linux.git arm: plat-orion: make bridge_virt_base non-const to support DT use case For the Armada 370 and XP SoCs where the DT is used, we need to fill at runtime the bridge_virt_base field on the orion_addr_map_cfg. Therefore, remove the 'const' qualifier on this field. Signed-off-by: Thomas Petazzoni Acked-by: Gregory CLEMENT Acked-by: Arnd Bergmann Tested-by: Andrew Lunn Signed-off-by: Jason Cooper --- diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h index 0a746fdfaf74..ec63e4a627d0 100644 --- a/arch/arm/plat-orion/include/plat/addr-map.h +++ b/arch/arm/plat-orion/include/plat/addr-map.h @@ -16,7 +16,7 @@ extern struct mbus_dram_target_info orion_mbus_dram_info; struct orion_addr_map_cfg { const int num_wins; /* Total number of windows */ const int remappable_wins; - void __iomem * const bridge_virt_base; + void __iomem *bridge_virt_base; /* If NULL, the default cpu_win_can_remap will be used, using the value in remappable_wins */