Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a2f5501 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent d19beac1

arch/arm/mach-dove/mpp.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-kirkwood/mpp.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-mv78xx0/mpp.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-orion5x/mpp.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/plat-orion/include/plat/mpp.h

+1 −1
Original line number Diff line number Diff line
@@ -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