Merge AT91, EP93xx, General devel, PXA, S3C, V6+ and Xscale trees

This commit is contained in:
Russell King
2007-02-17 20:09:53 +00:00
committed by Russell King
232 changed files with 12235 additions and 5486 deletions
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_aic.h
* include/asm-arm/arch-at91/at91_aic.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_dbgu.h
* include/asm-arm/arch-at91/at91_dbgu.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -35,6 +35,20 @@
#define AT91_CIDR_NVPSIZ (0xf << 8) /* Nonvolatile Program Memory Size */
#define AT91_CIDR_NVPSIZ2 (0xf << 12) /* Second Nonvolatile Program Memory Size */
#define AT91_CIDR_SRAMSIZ (0xf << 16) /* Internal SRAM Size */
#define AT91_CIDR_SRAMSIZ_1K (1 << 16)
#define AT91_CIDR_SRAMSIZ_2K (2 << 16)
#define AT91_CIDR_SRAMSIZ_112K (4 << 16)
#define AT91_CIDR_SRAMSIZ_4K (5 << 16)
#define AT91_CIDR_SRAMSIZ_80K (6 << 16)
#define AT91_CIDR_SRAMSIZ_160K (7 << 16)
#define AT91_CIDR_SRAMSIZ_8K (8 << 16)
#define AT91_CIDR_SRAMSIZ_16K (9 << 16)
#define AT91_CIDR_SRAMSIZ_32K (10 << 16)
#define AT91_CIDR_SRAMSIZ_64K (11 << 16)
#define AT91_CIDR_SRAMSIZ_128K (12 << 16)
#define AT91_CIDR_SRAMSIZ_256K (13 << 16)
#define AT91_CIDR_SRAMSIZ_96K (14 << 16)
#define AT91_CIDR_SRAMSIZ_512K (15 << 16)
#define AT91_CIDR_ARCH (0xff << 20) /* Architecture Identifier */
#define AT91_CIDR_NVPTYP (7 << 28) /* Nonvolatile Program Memory Type */
#define AT91_CIDR_EXT (1 << 31) /* Extension Flag */
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_ecc.h
* include/asm-arm/arch-at91/at91_ecc.h
*
* Error Corrected Code Controller (ECC) - System peripherals regsters.
* Based on AT91SAM9260 datasheet revision B.
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_lcdc.h
* include/asm-arm/arch-at91/at91_lcdc.h
*
* LCD Controller (LCDC).
* Based on AT91SAM9261 datasheet revision E.
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_mci.h
* include/asm-arm/arch-at91/at91_mci.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_pio.h
* include/asm-arm/arch-at91/at91_pio.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_pit.h
* include/asm-arm/arch-at91/at91_pit.h
*
* Periodic Interval Timer (PIT) - System peripherals regsters.
* Based on AT91SAM9261 datasheet revision D.
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_pmc.h
* include/asm-arm/arch-at91/at91_pmc.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_rstc.h
* include/asm-arm/arch-at91/at91_rstc.h
*
* Reset Controller (RSTC) - System peripherals regsters.
* Based on AT91SAM9261 datasheet revision D.
@@ -17,7 +17,7 @@
#define AT91_RSTC_PROCRST (1 << 0) /* Processor Reset */
#define AT91_RSTC_PERRST (1 << 2) /* Peripheral Reset */
#define AT91_RSTC_EXTRST (1 << 3) /* External Reset */
#define AT91_RSTC_KEY (0xff << 24) /* KEY Password */
#define AT91_RSTC_KEY (0xa5 << 24) /* KEY Password */
#define AT91_RSTC_SR (AT91_RSTC + 0x04) /* Reset Controller Status Register */
#define AT91_RSTC_URSTS (1 << 0) /* User Reset Status */
@@ -34,6 +34,5 @@
#define AT91_RSTC_URSTEN (1 << 0) /* User Reset Enable */
#define AT91_RSTC_URSTIEN (1 << 4) /* User Reset Interrupt Enable */
#define AT91_RSTC_ERSTL (0xf << 8) /* External Reset Length */
#define AT91_RSTC_KEY (0xff << 24) /* KEY Password */
#endif
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_rtc.h
* include/asm-arm/arch-at91/at91_rtc.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_rtt.h
* include/asm-arm/arch-at91/at91_rtt.h
*
* Real-time Timer (RTT) - System peripherals regsters.
* Based on AT91SAM9261 datasheet revision D.
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_shdwc.h
* include/asm-arm/arch-at91/at91_shdwc.h
*
* Shutdown Controller (SHDWC) - System peripherals regsters.
* Based on AT91SAM9261 datasheet revision D.
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_spi.h
* include/asm-arm/arch-at91/at91_spi.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_ssc.h
* include/asm-arm/arch-at91/at91_ssc.h
*
* Copyright (C) SAN People
*
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_st.h
* include/asm-arm/arch-at91/at91_st.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_tc.h
* include/asm-arm/arch-at91/at91_tc.h
*
* Copyright (C) SAN People
*
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_twi.h
* include/asm-arm/arch-at91/at91_twi.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91_wdt.h
* include/asm-arm/arch-at91/at91_wdt.h
*
* Watchdog Timer (WDT) - System peripherals regsters.
* Based on AT91SAM9261 datasheet revision D.
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91rm9200.h
* include/asm-arm/arch-at91/at91rm9200.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People
@@ -1,5 +1,5 @@
/*
* include/asm-arm/arch-at91rm9200/at91rm9200_emac.h
* include/asm-arm/arch-at91/at91rm9200_emac.h
*
* Copyright (C) 2005 Ivan Kokshaysky
* Copyright (C) SAN People

Some files were not shown because too many files have changed in this diff Show More