dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

arm: plat-orion: use void __iomem pointers for MPP functions 

The registration function for MPP now takes void __iomem pointers, so
we remove the temporary "unsigned long" casts from the mach-*/mpp.c
files.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Thomas Petazzoni 2012-09-11 14:27:24 +02:00 committed by Jason Cooper
parent d19beac1d9
commit 5a2f550193
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-dove/mpp.c
View File

@ -151,8 +151,7 @@ void __init dove_mpp_conf(unsigned int *mpp_list,
dove_mpp_dump_regs();
/* Use platform code for pins 0-23 */
orion_mpp_conf(mpp_list, 0, MPP_MAX,
(unsigned long) DOVE_MPP_VIRT_BASE);
orion_mpp_conf(mpp_list, 0, MPP_MAX, DOVE_MPP_VIRT_BASE);
dove_mpp_conf_grp(mpp_grp_list);
dove_mpp_cfg_au1(grp_au1_52_57);

3
arch/arm/mach-kirkwood/mpp.c
View File

@ -38,6 +38,5 @@ static unsigned int __init kirkwood_variant(void)
void __init kirkwood_mpp_conf(unsigned int *mpp_list)
{
orion_mpp_conf(mpp_list, kirkwood_variant(),
MPP_MAX,
(unsigned long) DEV_BUS_VIRT_BASE);
MPP_MAX, DEV_BUS_VIRT_BASE);
}

3
arch/arm/mach-mv78xx0/mpp.c
View File

@ -33,6 +33,5 @@ static unsigned int __init mv78xx0_variant(void)
void __init mv78xx0_mpp_conf(unsigned int *mpp_list)
{
orion_mpp_conf(mpp_list, mv78xx0_variant(),
MPP_MAX,
(unsigned long) DEV_BUS_VIRT_BASE);
MPP_MAX, DEV_BUS_VIRT_BASE);
}

3
arch/arm/mach-orion5x/mpp.c
View File

@ -40,6 +40,5 @@ static unsigned int __init orion5x_variant(void)
void __init orion5x_mpp_conf(unsigned int *mpp_list)
{
orion_mpp_conf(mpp_list, orion5x_variant(),
MPP_MAX,
(unsigned long) ORION5X_DEV_BUS_VIRT_BASE);
MPP_MAX, ORION5X_DEV_BUS_VIRT_BASE);
}

2
arch/arm/plat-orion/include/plat/mpp.h
View File

@ -29,6 +29,6 @@
#define MPP_OUTPUT_MASK GENERIC_MPP(0, 0x0, 0, 1)
void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
unsigned int mpp_max, unsigned int dev_bus);
unsigned int mpp_max, void __iomem *dev_bus);
#endif

6
arch/arm/plat-orion/mpp.c
View File

@ -17,15 +17,15 @@
#include <plat/mpp.h>
/* Address of the ith MPP control register */
static __init unsigned long mpp_ctrl_addr(unsigned int i,
unsigned long dev_bus)
static __init void __iomem *mpp_ctrl_addr(unsigned int i,
void __iomem *dev_bus)
{
return dev_bus + (i) * 4;
}
void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
unsigned int mpp_max, unsigned int dev_bus)
unsigned int mpp_max, void __iomem *dev_bus)
{
unsigned int mpp_nr_regs = (1 + mpp_max/8);
u32 mpp_ctrl[mpp_nr_regs];