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

Commit c2cdaffe authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Fix gpio_request calls to happen as arch_initcall 



Looks like some boards are calling gpio_request from init_irq.
This will make the request_irq fail, as GPIO will be initialized
as postcore_initcall.

Reported-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 7b045c96

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

+11 −10
Original line number Original line Diff line number Diff line
@@ -120,6 +120,15 @@ static struct resource smc91x_resources[] = { 
	},

	},

};

};





static void __init fsample_init_smc91x(void)

{

	fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);

	mdelay(50);

	fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) & ~1,

		   H2P2_DBG_FPGA_LAN_RESET);

	mdelay(50);

}



static struct mtd_partition nor_partitions[] = {

static struct mtd_partition nor_partitions[] = {

	/* bootloader (U-Boot, etc) in first sector */

	/* bootloader (U-Boot, etc) in first sector */

	{

	{
@@ -285,6 +294,8 @@ static struct omap_board_config_kernel fsample_config[] = { 




static void __init omap_fsample_init(void)

static void __init omap_fsample_init(void)

{

{

	fsample_init_smc91x();



	if (gpio_request(FSAMPLE_NAND_RB_GPIO_PIN, "NAND ready") < 0)

	if (gpio_request(FSAMPLE_NAND_RB_GPIO_PIN, "NAND ready") < 0)

		BUG();

		BUG();

	gpio_direction_input(FSAMPLE_NAND_RB_GPIO_PIN);

	gpio_direction_input(FSAMPLE_NAND_RB_GPIO_PIN);
@@ -312,21 +323,11 @@ static void __init omap_fsample_init(void) 
	omap_register_i2c_bus(1, 100, NULL, 0);

	omap_register_i2c_bus(1, 100, NULL, 0);

}

}





static void __init fsample_init_smc91x(void)

{

	fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);

	mdelay(50);

	fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) & ~1,

		   H2P2_DBG_FPGA_LAN_RESET);

	mdelay(50);

}



static void __init omap_fsample_init_irq(void)

static void __init omap_fsample_init_irq(void)

{

{

	omap1_init_common_hw();

	omap1_init_common_hw();

	omap_init_irq();

	omap_init_irq();

	omap_gpio_init();

	omap_gpio_init();

	fsample_init_smc91x();

}

}





/* Only FPGA needs to be mapped here. All others are done with ioremap */

/* Only FPGA needs to be mapped here. All others are done with ioremap */

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -375,7 +375,6 @@ static void __init h2_init_irq(void) 
	omap1_init_common_hw();

	omap1_init_common_hw();

	omap_init_irq();

	omap_init_irq();

	omap_gpio_init();

	omap_gpio_init();

	h2_init_smc91x();

}

}





static struct omap_usb_config h2_usb_config __initdata = {

static struct omap_usb_config h2_usb_config __initdata = {
@@ -403,6 +402,8 @@ static struct omap_board_config_kernel h2_config[] __initdata = { 




static void __init h2_init(void)

static void __init h2_init(void)

{

{

	h2_init_smc91x();



	/* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped

	/* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped

	 * to address 0 by a dip switch), NAND on CS2B.  The NAND driver will

	 * to address 0 by a dip switch), NAND on CS2B.  The NAND driver will

	 * notice whether a NAND chip is enabled at probe time.

	 * notice whether a NAND chip is enabled at probe time.

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

+11 −10
Original line number Original line Diff line number Diff line
@@ -264,6 +264,15 @@ static struct platform_device smc91x_device = { 
	.resource	= smc91x_resources,

	.resource	= smc91x_resources,

};

};





static void __init h3_init_smc91x(void)

{

	omap_cfg_reg(W15_1710_GPIO40);

	if (gpio_request(40, "SMC91x irq") < 0) {

		printk("Error requesting gpio 40 for smc91x irq\n");

		return;

	}

}



#define GPTIMER_BASE		0xFFFB1400

#define GPTIMER_BASE		0xFFFB1400

#define GPTIMER_REGS(x)	(0xFFFB1400 + (x * 0x800))

#define GPTIMER_REGS(x)	(0xFFFB1400 + (x * 0x800))

#define GPTIMER_REGS_SIZE	0x46

#define GPTIMER_REGS_SIZE	0x46
@@ -376,6 +385,8 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = { 




static void __init h3_init(void)

static void __init h3_init(void)

{

{

	h3_init_smc91x();



	/* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped

	/* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped

	 * to address 0 by a dip switch), NAND on CS2B.  The NAND driver will

	 * to address 0 by a dip switch), NAND on CS2B.  The NAND driver will

	 * notice whether a NAND chip is enabled at probe time.

	 * notice whether a NAND chip is enabled at probe time.
@@ -422,21 +433,11 @@ static void __init h3_init(void) 
	h3_mmc_init();

	h3_mmc_init();

}

}





static void __init h3_init_smc91x(void)

{

	omap_cfg_reg(W15_1710_GPIO40);

	if (gpio_request(40, "SMC91x irq") < 0) {

		printk("Error requesting gpio 40 for smc91x irq\n");

		return;

	}

}



static void __init h3_init_irq(void)

static void __init h3_init_irq(void)

{

{

	omap1_init_common_hw();

	omap1_init_common_hw();

	omap_init_irq();

	omap_init_irq();

	omap_gpio_init();

	omap_gpio_init();

	h3_init_smc91x();

}

}





static void __init h3_map_io(void)

static void __init h3_map_io(void)

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -296,7 +296,6 @@ static void __init innovator_init_irq(void) 
		omap1510_fpga_init_irq();

		omap1510_fpga_init_irq();

	}

	}

#endif

#endif

	innovator_init_smc91x();

}

}





#ifdef CONFIG_ARCH_OMAP15XX

#ifdef CONFIG_ARCH_OMAP15XX
@@ -387,6 +386,8 @@ static struct omap_board_config_kernel innovator_config[] = { 




static void __init innovator_init(void)

static void __init innovator_init(void)

{

{

	innovator_init_smc91x();



#ifdef CONFIG_ARCH_OMAP15XX

#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap1510()) {

	if (cpu_is_omap1510()) {

		unsigned char reg;

		unsigned char reg;

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -284,8 +284,6 @@ static void __init osk_init_irq(void) 
	omap1_init_common_hw();

	omap1_init_common_hw();

	omap_init_irq();

	omap_init_irq();

	omap_gpio_init();

	omap_gpio_init();

	osk_init_smc91x();

	osk_init_cf();

}

}





static struct omap_usb_config osk_usb_config __initdata = {

static struct omap_usb_config osk_usb_config __initdata = {
@@ -541,6 +539,9 @@ static void __init osk_init(void) 
{

{

	u32 l;

	u32 l;





	osk_init_smc91x();

	osk_init_cf();



	/* Workaround for wrong CS3 (NOR flash) timing

	/* Workaround for wrong CS3 (NOR flash) timing

	 * There are some U-Boot versions out there which configure

	 * There are some U-Boot versions out there which configure

	 * wrong CS3 memory timings. This mainly leads to CRC

	 * wrong CS3 memory timings. This mainly leads to CRC