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

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

[PATCH] ARM: 2797/1: OMAP update 1/11: Update include files 



Patch from Tony Lindgren

This patch by various OMAP developers syncs the OMAP
specific include files with the linux-omap tree.

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

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

+0 −5
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ 
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */

#define OMAP1610_ETHR_START		0x04000300



/* Intel STRATA NOR flash at CS3 or CS2B(NAND Boot) */

#define OMAP_NOR_FLASH_SIZE             SZ_32M

#define OMAP_NOR_FLASH_START1           0x0C000000 /* CS3 */

#define OMAP_NOR_FLASH_START2           0x0A000000 /* CS2B */



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

#define OMAP_NAND_FLASH_START1           0x0A000000 /* CS2B */

#define OMAP_NAND_FLASH_START2           0x0C000000 /* CS3 */

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

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ 
/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */

#define OMAP1710_ETHR_START		0x04000300



/* Intel STRATA NOR flash at CS3 or CS2B(NAND Boot) */

#define OMAP_NOR_FLASH_SIZE             SZ_32M

#define OMAP_NOR_FLASH_START1 		0x0C000000 /* CS3 */

#define OMAP_NOR_FLASH_START2 		0x0A000000 /* CS2B */



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

#define OMAP_NAND_FLASH_START1           0x0A000000 /* CS2B */

#define OMAP_NAND_FLASH_START2           0x0C000000 /* CS3 */

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

+0 −5
Original line number Diff line number Diff line
@@ -32,10 +32,5 @@ 
/* At OMAP5912 OSK the Ethernet is directly connected to CS1 */

#define OMAP_OSK_ETHR_START		0x04800300



/* Micron NOR flash at CS3 mapped to address 0x0 if BM bit is 1 */

#define OMAP_OSK_NOR_FLASH_BASE		0xD8000000

#define OMAP_OSK_NOR_FLASH_SIZE		SZ_32M

#define OMAP_OSK_NOR_FLASH_START	0x00000000



#endif /*  __ASM_ARCH_OMAP_OSK_H */

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

+9 −3
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 
/* Different peripheral ids */

#define OMAP_TAG_CLOCK		0x4f01

#define OMAP_TAG_MMC		0x4f02

#define OMAP_TAG_UART		0x4f03

#define OMAP_TAG_SERIAL_CONSOLE 0x4f03

#define OMAP_TAG_USB		0x4f04

#define OMAP_TAG_LCD		0x4f05

#define OMAP_TAG_GPIO_SWITCH	0x4f06

#define OMAP_TAG_UART		0x4f07



#define OMAP_TAG_BOOT_REASON    0x4f80

#define OMAP_TAG_FLASH_PART	0x4f81
@@ -35,7 +36,7 @@ struct omap_mmc_config { 
	s16 mmc1_switch_pin, mmc2_switch_pin;

};



struct omap_uart_config {

struct omap_serial_console_config {

	u8 console_uart;

	u32 console_speed;

};
@@ -83,6 +84,7 @@ struct omap_lcd_config { 
#define OMAP_GPIO_SWITCH_TYPE_COVER		0x0000

#define OMAP_GPIO_SWITCH_TYPE_CONNECTION	0x0001

#define OMAP_GPIO_SWITCH_FLAG_INVERTED		0x0001

#define OMAP_GPIO_SWITCH_FLAG_OUTPUT		0x0002

struct omap_gpio_switch_config {

	char name[12];

	u16 gpio;
@@ -99,6 +101,10 @@ struct omap_boot_reason_config { 
	char reason_str[12];

};



struct omap_uart_config {

	/* Bit field of UARTs present; bit 0 --> UART1 */

	unsigned int enabled_uarts;

};



struct omap_board_config_entry {

	u16 tag;

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

+16 −8
Original line number Diff line number Diff line
@@ -52,6 +52,19 @@ 
 * ---------------------------------------------------------------------------

 */



/*

 * ----------------------------------------------------------------------------

 * Timers

 * ----------------------------------------------------------------------------

 */

#define OMAP_MPU_TIMER1_BASE	(0xfffec500)

#define OMAP_MPU_TIMER2_BASE	(0xfffec600)

#define OMAP_MPU_TIMER3_BASE	(0xfffec700)

#define MPU_TIMER_FREE		(1 << 6)

#define MPU_TIMER_CLOCK_ENABLE	(1 << 5)

#define MPU_TIMER_AR		(1 << 1)

#define MPU_TIMER_ST		(1 << 0)



/*

 * ----------------------------------------------------------------------------

 * Clocks
@@ -78,6 +91,7 @@ 


/* DSP clock control */

#define DSP_CONFIG_REG_BASE     (0xe1008000)

#define DSP_CKCTL		(DSP_CONFIG_REG_BASE + 0x0)

#define DSP_IDLECT1		(DSP_CONFIG_REG_BASE + 0x4)

#define DSP_IDLECT2		(DSP_CONFIG_REG_BASE + 0x8)
@@ -88,6 +102,7 @@ 
 */

#define ULPD_REG_BASE		(0xfffe0800)

#define ULPD_IT_STATUS		(ULPD_REG_BASE + 0x14)

#define ULPD_SETUP_ANALOG_CELL_3	(ULPD_REG_BASE + 0x24)

#define ULPD_CLOCK_CTRL		(ULPD_REG_BASE + 0x30)

#	define DIS_USB_PVCI_CLK		(1 << 5)	/* no USB/FAC synch */

#	define USB_MCLK_EN		(1 << 4)	/* enable W4_USB_CLKO */
@@ -268,17 +283,10 @@ 
 * Processor specific defines

 * ---------------------------------------------------------------------------

 */

#ifdef CONFIG_ARCH_OMAP730

#include "omap730.h"

#endif



#ifdef CONFIG_ARCH_OMAP1510

#include "omap730.h"

#include "omap1510.h"

#endif



#ifdef CONFIG_ARCH_OMAP16XX

#include "omap16xx.h"

#endif



/*

 * ---------------------------------------------------------------------------