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

Commit c0b1541f authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] pxa/colibri: convert to use new MFP API 



Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Cc: Daniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4a5c5eab

arch/arm/mach-pxa/colibri.c

+7 −4
Original line number Diff line number Diff line
@@ -29,12 +29,17 @@ 
#include <asm/mach/irq.h>

#include <asm/mach/flash.h>

#include <mach/pxa-regs.h>

#include <mach/pxa2xx-gpio.h>

#include <mach/mfp-pxa27x.h>

#include <mach/colibri.h>



#include "generic.h"

#include "devices.h"



static unsigned long colibri_pin_config[] __initdata = {

	GPIO78_nCS_2,	/* Ethernet CS */

	GPIO114_GPIO,	/* Ethernet IRQ */

};



/*

 * Flash

 */
@@ -116,9 +121,7 @@ static struct platform_device *colibri_devices[] __initdata = { 


static void __init colibri_init(void)

{

	/* DM9000 LAN */

	pxa_gpio_mode(GPIO78_nCS_2_MD);

	pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);

	pxa2xx_mfp_config(ARRAY_AND_SIZE(colibri_pin_config));



	platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices));

}