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

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

Merge 7xx-iosplit-plat-merge with omap-fixes 

Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
parents 648f4e3e 8171d880

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

+6 −6
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include <mach/board-ams-delta.h>

#include <plat/board-ams-delta.h>

#include <mach/gpio.h>

#include <mach/keypad.h>

#include <mach/mux.h>

#include <mach/usb.h>

#include <mach/board.h>

#include <mach/common.h>

#include <plat/keypad.h>

#include <plat/mux.h>

#include <plat/usb.h>

#include <plat/board.h>

#include <plat/common.h>



static u8 ams_delta_latch1_reg;

static u16 ams_delta_latch2_reg;

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

+16 −16
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ 
#include <asm/mach/flash.h>

#include <asm/mach/map.h>



#include <mach/tc.h>

#include <plat/tc.h>

#include <mach/gpio.h>

#include <mach/mux.h>

#include <mach/fpga.h>

#include <mach/nand.h>

#include <mach/keypad.h>

#include <mach/common.h>

#include <mach/board.h>

#include <plat/mux.h>

#include <plat/fpga.h>

#include <plat/nand.h>

#include <plat/keypad.h>

#include <plat/common.h>

#include <plat/board.h>



/* fsample is pretty close to p2-sample */
@@ -107,7 +107,7 @@ static struct resource smc91x_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= INT_730_MPU_EXT_NIRQ,

		.start	= INT_7XX_MPU_EXT_NIRQ,

		.end	= 0,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	},
@@ -196,8 +196,8 @@ static struct platform_device smc91x_device = { 


static struct resource kp_resources[] = {

	[0] = {

		.start	= INT_730_MPUIO_KEYPAD,

		.end	= INT_730_MPUIO_KEYPAD,

		.start	= INT_7XX_MPUIO_KEYPAD,

		.end	= INT_7XX_MPUIO_KEYPAD,

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -309,7 +309,7 @@ static void __init omap_fsample_map_io(void) 
	/*

	 * Hold GSM Reset until needed

	 */

	omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);

	omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);



	/*

	 * UARTs -> done automagically by 8250 driver
@@ -320,21 +320,21 @@ static void __init omap_fsample_map_io(void) 
	 */



	/* Flash: CS0 timings setup */

	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);

	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);

	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);

	omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);



	/*

	 * Ethernet support through the debug board

	 * CS1 timings setup

	 */

	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);

	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);

	omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);

	omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);



	/*

	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,

	 * It is used as the Ethernet controller interrupt

	 */

	omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);

	omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);

}



MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")

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

+4 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ 
#include <asm/mach/map.h>



#include <mach/gpio.h>

#include <mach/mux.h>

#include <mach/usb.h>

#include <mach/board.h>

#include <mach/common.h>

#include <plat/mux.h>

#include <plat/usb.h>

#include <plat/board.h>

#include <plat/common.h>



static void __init omap_generic_init_irq(void)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include <linux/i2c/tps65010.h>



#include <mach/mmc.h>

#include <plat/mmc.h>

#include <mach/gpio.h>



#include "board-h2.h"

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

+8 −8
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ 
#include <asm/mach/flash.h>

#include <asm/mach/map.h>



#include <mach/mux.h>

#include <mach/dma.h>

#include <mach/tc.h>

#include <mach/nand.h>

#include <mach/irda.h>

#include <mach/usb.h>

#include <mach/keypad.h>

#include <mach/common.h>

#include <plat/mux.h>

#include <plat/dma.h>

#include <plat/tc.h>

#include <plat/nand.h>

#include <plat/irda.h>

#include <plat/usb.h>

#include <plat/keypad.h>

#include <plat/common.h>



#include "board-h2.h"