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

Commit 79b357c2 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'devel-gpio' into omap-for-linus

parents b2d6fef5 5de62b86

arch/arm/mach-omap1/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ ifeq ($(CONFIG_ARCH_OMAP15XX),y) 
obj-$(CONFIG_MACH_OMAP_INNOVATOR)	+= fpga.o

endif



# GPIO

obj-$(CONFIG_ARCH_OMAP730)		+= gpio7xx.o

obj-$(CONFIG_ARCH_OMAP850)		+= gpio7xx.o

obj-$(CONFIG_ARCH_OMAP15XX)		+= gpio15xx.o

obj-$(CONFIG_ARCH_OMAP16XX)		+= gpio16xx.o



# LEDs support

led-$(CONFIG_MACH_OMAP_H2)		+= leds-h2p2-debug.o

led-$(CONFIG_MACH_OMAP_H3)		+= leds-h2p2-debug.o

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

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ static void __init ams_delta_init_irq(void) 
{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

}



static struct map_desc ams_delta_io_desc[] __initdata = {

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

+11 −11
Original line number 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[] = {

	/* 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)

{

	fsample_init_smc91x();



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

		BUG();

	gpio_direction_input(FSAMPLE_NAND_RB_GPIO_PIN);
@@ -312,21 +323,10 @@ static void __init omap_fsample_init(void) 
	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)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

	fsample_init_smc91x();

}



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

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

+2 −2
Original line number Diff line number Diff line
@@ -374,8 +374,6 @@ static void __init h2_init_irq(void) 
{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

	h2_init_smc91x();

}



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


static void __init h2_init(void)

{

	h2_init_smc91x();



	/* 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

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

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

+11 −11
Original line number Diff line number Diff line
@@ -264,6 +264,15 @@ static struct platform_device smc91x_device = { 
	.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_REGS(x)	(0xFFFB1400 + (x * 0x800))

#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)

{

	h3_init_smc91x();



	/* 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

	 * notice whether a NAND chip is enabled at probe time.
@@ -422,21 +433,10 @@ static void __init h3_init(void) 
	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)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap_gpio_init();

	h3_init_smc91x();

}



static void __init h3_map_io(void)