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

Commit 7f9187c2 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap1: Add initcall checks for omap1 and booted board 



Otherwise multi-omap1 configurations will fail.

Tested-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent df1e9d1c

arch/arm/mach-omap1/board-ams-delta.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -339,6 +339,9 @@ static int __init ams_delta_modem_init(void) 
{

{

	int err;

	int err;





	if (!machine_is_ams_delta())

		return -ENODEV;



	omap_cfg_reg(M14_1510_GPIO2);

	omap_cfg_reg(M14_1510_GPIO2);

	ams_delta_modem_ports[0].irq =

	ams_delta_modem_ports[0].irq =

			gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ);

			gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ);

arch/arm/mach-omap1/board-voiceblue.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,9 @@ static struct platform_device serial_device = { 




static int __init ext_uart_init(void)

static int __init ext_uart_init(void)

{

{

	if (!machine_is_voiceblue())

		return -ENODEV;



	return platform_device_register(&serial_device);

	return platform_device_register(&serial_device);

}

}

arch_initcall(ext_uart_init);

arch_initcall(ext_uart_init);
@@ -236,6 +239,9 @@ static struct notifier_block panic_block = { 




static int __init voiceblue_setup(void)

static int __init voiceblue_setup(void)

{

{

	if (!machine_is_voiceblue())

		return -ENODEV;



	/* Setup panic notifier */

	/* Setup panic notifier */

	atomic_notifier_chain_register(&panic_notifier_list, &panic_block);

	atomic_notifier_chain_register(&panic_notifier_list, &panic_block);

arch/arm/mach-omap1/devices.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -288,6 +288,9 @@ static inline void omap_init_audio(void) {} 
 */

 */

static int __init omap1_init_devices(void)

static int __init omap1_init_devices(void)

{

{

	if (!cpu_class_is_omap1())

		return -ENODEV;



	/* please keep these calls, and their implementations above,

	/* please keep these calls, and their implementations above,

	 * in alphabetical order so they're easier to sort through.

	 * in alphabetical order so they're easier to sort through.

	 */

	 */

arch/arm/mach-omap1/lcd_dma.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -424,6 +424,9 @@ static int __init omap_init_lcd_dma(void) 
{

{

	int r;

	int r;





	if (!cpu_class_is_omap1())

		return -ENODEV;



	if (cpu_is_omap16xx()) {

	if (cpu_is_omap16xx()) {

		u16 w;

		u16 w;

arch/arm/mach-omap1/leds.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,9 @@ 
static int __init

static int __init

omap_leds_init(void)

omap_leds_init(void)

{

{

	if (!cpu_class_is_omap1())

		return -ENODEV;



	if (machine_is_omap_innovator())

	if (machine_is_omap_innovator())

		leds_event = innovator_leds_event;

		leds_event = innovator_leds_event;