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

Commit e328b880 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Olof Johansson
Browse files

ARM: clps711x: Re-add GPIO support 



arch_initcall was been removed from GPIO driver, so this patch
re-add support for GPIO into boards as platform_device.
Since some drivers (spi, nand, etc.) is not support deferred probe,
separate machine init calls is used in board code to make proper
loading sequence.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent a180132f

arch/arm/mach-clps711x/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -4,10 +4,7 @@ 


# Object file lists.



obj-y			:= common.o

obj-m			:=

obj-n			:=

obj-			:=

obj-y				:= common.o devices.o



obj-$(CONFIG_ARCH_AUTCPU12)	+= board-autcpu12.o

obj-$(CONFIG_ARCH_CDB89712)	+= board-cdb89712.o

arch/arm/mach-clps711x/board-autcpu12.c

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <mach/autcpu12.h>



#include "common.h"

#include "devices.h"



#define AUTCPU12_CS8900_BASE	(CS2_PHYS_BASE + 0x300)

#define AUTCPU12_CS8900_IRQ	(IRQ_EINT3)
@@ -149,6 +150,7 @@ static struct platform_device autcpu12_mmgpio_pdev __initdata = { 


static void __init autcpu12_init(void)

{

	clps711x_devices_init();

	platform_device_register_simple("video-clps711x", 0, NULL, 0);

	platform_device_register_simple("cs89x0", 0, autcpu12_cs8900_resource,

					ARRAY_SIZE(autcpu12_cs8900_resource));

arch/arm/mach-clps711x/board-cdb89712.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <asm/mach/map.h>



#include "common.h"

#include "devices.h"



#define CDB89712_CS8900_BASE	(CS2_PHYS_BASE + 0x300)

#define CDB89712_CS8900_IRQ	(IRQ_EINT3)
@@ -127,6 +128,7 @@ static struct platform_device cdb89712_sram_pdev __initdata = { 


static void __init cdb89712_init(void)

{

	clps711x_devices_init();

	platform_device_register(&cdb89712_flash_pdev);

	platform_device_register(&cdb89712_bootrom_pdev);

	platform_device_register(&cdb89712_sram_pdev);

arch/arm/mach-clps711x/board-edb7211.c

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <mach/hardware.h>



#include "common.h"

#include "devices.h"



#define VIDEORAM_SIZE		SZ_128K
@@ -150,6 +151,11 @@ fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi) 
}



static void __init edb7211_init(void)

{

	clps711x_devices_init();

}



static void __init edb7211_init_late(void)

{

	gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios));
@@ -175,6 +181,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") 
	.init_irq	= clps711x_init_irq,

	.init_time	= clps711x_timer_init,

	.init_machine	= edb7211_init,

	.init_late	= edb7211_init_late,

	.handle_irq	= clps711x_handle_irq,

	.restart	= clps711x_restart,

MACHINE_END

arch/arm/mach-clps711x/board-p720t.c

+6 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <video/platform_lcd.h>



#include "common.h"

#include "devices.h"



#define P720T_USERLED		CLPS711X_GPIO(3, 0)

#define P720T_NAND_CLE		CLPS711X_GPIO(4, 0)
@@ -198,6 +199,11 @@ static struct gpio_led_platform_data p720t_gpio_led_pdata __initdata = { 
};



static void __init p720t_init(void)

{

	clps711x_devices_init();

}



static void __init p720t_init_late(void)

{

	platform_device_register(&p720t_nand_pdev);

	platform_device_register_data(&platform_bus, "platform-lcd", 0,
@@ -207,10 +213,6 @@ static void __init p720t_init(void) 
				      &p720t_lcd_backlight_pdata,

				      sizeof(p720t_lcd_backlight_pdata));

	platform_device_register_simple("video-clps711x", 0, NULL, 0);

}



static void __init p720t_init_late(void)

{

	platform_device_register_data(&platform_bus, "leds-gpio", 0,

				      &p720t_gpio_led_pdata,

				      sizeof(p720t_gpio_led_pdata));