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

Commit 9839c6b8 authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

[ARM] 2888/1: OMAP 3/4: Update omap include files, take 2 



Patch from Tony Lindgren

This patch syncs the mainline kernel with linux-omap tree.
The highlights of the patch are:
- Start adding 24xx support by Paul Mundt
- Clean-up of cpu detection by Dirk Behme and Tony Lindgren
- Add DSP header by Toshihiro Kobayashi
- Add support for mtd-xip by Vladimir Barinov
- Add various new mux registers
- Move OMAP specific serial defines back to serial.h

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 92105bb7

include/asm-arm/arch-omap/board-h4.h

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
#define __ASM_ARCH_OMAP_H4_H



/* Placeholder for H4 specific defines */

/* GPMC CS1 */

#define OMAP24XX_ETHR_START             0x08000300

#define OMAP24XX_ETHR_GPIO_IRQ		92



#endif /*  __ASM_ARCH_OMAP_H4_H */

include/asm-arm/arch-omap/board-innovator.h

+0 −25
Original line number Diff line number Diff line
@@ -36,31 +36,6 @@ 
#define OMAP1510P1_EMIFS_PRI_VALUE		0x00

#define OMAP1510P1_EMIFF_PRI_VALUE		0x00



/*

 * These definitions define an area of FLASH set aside

 * for the use of MTD/JFFS2. This is the area of flash

 * that a JFFS2 filesystem will reside which is mounted

 * at boot with the "root=/dev/mtdblock/0 rw"

 * command line option. The flash address used here must

 * fall within the legal range defined by rrload for storing

 * the filesystem component. This address will be sufficiently

 * deep into the overall flash range to avoid the other

 * components also stored in flash such as the bootloader,

 * the bootloader params, and the kernel.

 * The SW2 settings for the map below are:

 * 1 off, 2 off, 3 on, 4 off.

 */



/* Intel flash_0, partitioned as expected by rrload */

#define OMAP_FLASH_0_BASE	0xD8000000

#define OMAP_FLASH_0_START	0x00000000

#define OMAP_FLASH_0_SIZE	SZ_16M



/* Intel flash_1, used for cramfs or other flash file systems */

#define OMAP_FLASH_1_BASE	0xD9000000

#define OMAP_FLASH_1_START	0x01000000

#define OMAP_FLASH_1_SIZE	SZ_16M



#define NR_FPGA_IRQS		24

#define NR_IRQS                 IH_BOARD_BASE + NR_FPGA_IRQS

include/asm-arm/arch-omap/board-perseus2.h

+4 −13
Original line number Diff line number Diff line
@@ -36,23 +36,14 @@ 
#define OMAP_SDRAM_DEVICE		D256M_1X16_4B

#endif



/*

 * These definitions define an area of FLASH set aside

 * for the use of MTD/JFFS2. This is the area of flash

 * that a JFFS2 filesystem will reside which is mounted

 * at boot with the "root=/dev/mtdblock/0 rw"

 * command line option.

 */



/* Intel flash_0, partitioned as expected by rrload */

#define OMAP_FLASH_0_BASE	0xD8000000	/* VA */

#define OMAP_FLASH_0_START	0x00000000	/* PA */

#define OMAP_FLASH_0_SIZE	SZ_32M



#define MAXIRQNUM		IH_BOARD_BASE

#define MAXFIQNUM		MAXIRQNUM

#define MAXSWINUM		MAXIRQNUM



#define NR_IRQS			(MAXIRQNUM + 1)



/* Samsung NAND flash at CS2B or CS3(NAND Boot) */

#define OMAP_NAND_FLASH_START1	   0x0A000000 /* CS2B */

#define OMAP_NAND_FLASH_START2	   0x0C000000 /* CS3 */



#endif

include/asm-arm/arch-omap/board-voiceblue.h

+0 −5
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ 
#ifndef __ASM_ARCH_VOICEBLUE_H

#define __ASM_ARCH_VOICEBLUE_H



#if (EXTERNAL_MAX_NR_PORTS < 4)

#undef EXTERNAL_MAX_NR_PORTS

#define EXTERNAL_MAX_NR_PORTS	4

#endif



extern void voiceblue_wdt_enable(void);

extern void voiceblue_wdt_disable(void);

extern void voiceblue_wdt_ping(void);

include/asm-arm/arch-omap/board.h

+16 −3
Original line number Diff line number Diff line
@@ -30,10 +30,23 @@ struct omap_clock_config { 
	u8 system_clock_type;

};



struct omap_mmc_conf {

	unsigned enabled:1;

	/* nomux means "standard" muxing is wrong on this board, and that

	 * board-specific code handled it before common init logic.

	 */

	unsigned nomux:1;

	/* switch pin can be for card detect (default) or card cover */

	unsigned cover:1;

	/* 4 wire signaling is optional, and is only used for SD/SDIO */

	unsigned wire4:1;

	s16 power_pin;

	s16 switch_pin;

	s16 wp_pin;

};



struct omap_mmc_config {

	u8 mmc_blocks;

	s16 mmc1_power_pin, mmc2_power_pin;

	s16 mmc1_switch_pin, mmc2_switch_pin;

	struct omap_mmc_conf mmc[2];

};



struct omap_serial_console_config {