| Message ID | 1343999430-31816-3-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/03/2012 03:10 PM, Thomas Petazzoni wrote: > 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 <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> [...]
On Friday 03 August 2012, Thomas Petazzoni wrote: > diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h > index fd556f7..aafdd79 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; > - const u32 bridge_virt_base; > + u32 bridge_virt_base; > > /* If NULL, the default cpu_win_can_remap will be used, using > the value in remappable_wins */ It would be nice to also change the type of this to void __iomem*, since you are already touching the bridge_virt_base. Arnd
Le Fri, 3 Aug 2012 13:41:32 +0000, Arnd Bergmann <arnd@arndb.de> a écrit : > > + u32 bridge_virt_base; > > > > /* If NULL, the default cpu_win_can_remap will be used, using > > the value in remappable_wins */ > > It would be nice to also change the type of this to void __iomem*, since you are > already touching the bridge_virt_base. Yeah, I was also thinking about this cleanup. Will rework my patch series to include a patch fixing this before doing the other changes. Thanks! Thomas
diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h index fd556f7..aafdd79 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; - const u32 bridge_virt_base; + u32 bridge_virt_base; /* If NULL, the default cpu_win_can_remap will be used, using the value in remappable_wins */
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 <thomas.petazzoni@free-electrons.com> --- arch/arm/plat-orion/include/plat/addr-map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)