---

yaml --- r: 303227 b: refs/heads/master c: 4809f90 h: refs/heads/master i: 303225: d571b53 303223: 3014e08 v: v3
git-mirror · May 1, 2012 · b401acb · b401acb
1 parent 4dcdfe0
commit b401acb
Show file tree

Hide file tree

Showing 179 changed files with 3,446 additions and 7,038 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47fad7c6f8d9f64780793cc67d8280259538c31c
+refs/heads/master: 4809f90aadb299743b8f8021ff386f0ef0392c86
diff --git a/trunk/Documentation/arm/SPEAr/overview.txt b/trunk/Documentation/arm/SPEAr/overview.txt
@@ -17,14 +17,14 @@ Introduction
   SPEAr (Platform)
 	- SPEAr3XX (3XX SOC series, based on ARM9)
 		- SPEAr300 (SOC)
-			- SPEAr300 Evaluation Board
+			- SPEAr300_EVB (Evaluation Board)
 		- SPEAr310 (SOC)
-			- SPEAr310 Evaluation Board
+			- SPEAr310_EVB (Evaluation Board)
 		- SPEAr320 (SOC)
-			- SPEAr320 Evaluation Board
+			- SPEAr320_EVB (Evaluation Board)
 	- SPEAr6XX (6XX SOC series, based on ARM9)
 		- SPEAr600 (SOC)
-			- SPEAr600 Evaluation Board
+			- SPEAr600_EVB (Evaluation Board)
 	- SPEAr13XX (13XX SOC series, based on ARM CORTEXA9)
 		- SPEAr1300 (SOC)
 
@@ -51,11 +51,10 @@ Introduction
   Common file for machines of spear3xx family is mach-spear3xx/spear3xx.c and for
   spear6xx is mach-spear6xx/spear6xx.c. mach-spear* also contain soc/machine
   specific files, like spear300.c, spear310.c, spear320.c and spear600.c.
-  mach-spear* doesn't contains board specific files as they fully support
-  Flattened Device Tree.
+  mach-spear* also contains board specific files for each machine type.
 
 
   Document Author
   ---------------
 
-  Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics
+  Viresh Kumar, (c) 2010 ST Microelectronics
diff --git a/trunk/Documentation/devicetree/bindings/arm/lpc32xx-mic.txt b/trunk/Documentation/devicetree/bindings/arm/lpc32xx-mic.txt
diff --git a/trunk/Documentation/devicetree/bindings/arm/lpc32xx.txt b/trunk/Documentation/devicetree/bindings/arm/lpc32xx.txt
diff --git a/trunk/Documentation/devicetree/bindings/arm/spear.txt b/trunk/Documentation/devicetree/bindings/arm/spear.txt
@@ -6,21 +6,3 @@ Boards with the ST SPEAr600 SoC shall have the following properties:
 Required root node property:
 
 compatible = "st,spear600";
-
-Boards with the ST SPEAr300 SoC shall have the following properties:
-
-Required root node property:
-
-compatible = "st,spear300";
-
-Boards with the ST SPEAr310 SoC shall have the following properties:
-
-Required root node property:
-
-compatible = "st,spear310";
-
-Boards with the ST SPEAr320 SoC shall have the following properties:
-
-Required root node property:
-
-compatible = "st,spear320";
diff --git a/trunk/Documentation/devicetree/bindings/i2c/pnx.txt b/trunk/Documentation/devicetree/bindings/i2c/pnx.txt
diff --git a/trunk/Documentation/devicetree/bindings/net/lpc-eth.txt b/trunk/Documentation/devicetree/bindings/net/lpc-eth.txt
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -340,8 +340,8 @@ config ARCH_AT91
 	select IRQ_DOMAIN
 	select NEED_MACH_IO_H if PCCARD
 	help
-	  This enables support for systems based on Atmel
-	  AT91RM9200 and AT91SAM9* processors.
+	  This enables support for systems based on the Atmel AT91RM9200,
+	  AT91SAM9 processors.
 
 config ARCH_BCMRING
 	bool "Broadcom BCMRING"
@@ -597,7 +597,6 @@ config ARCH_LPC32XX
 	select USB_ARCH_HAS_OHCI
 	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
-	select USE_OF
 	help
 	  Support for the NXP LPC32XX family of processors