---

yaml
---
r: 303203
b: refs/heads/master
c: fd9a80b
h: refs/heads/master
i:
  303201: 7f7c0fe
  303199: 648532a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6875dc6521be57f695845d13469109a388029e43
+refs/heads/master: fd9a80b238ffd5fb4c82e3752327968bd7b01ad1

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

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";

trunk/arch/arm/Kconfig

@@ -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
 

trunk/arch/arm/boot/dts/db8500.dtsi

@@ -55,7 +55,7 @@
 
 		gpio0: gpio@8012e000 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0x8012e000 0x80>;
 			interrupts = <0 119 0x4>;
 			supports-sleepmode;
@@ -64,7 +64,7 @@
 
 		gpio1: gpio@8012e080 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0x8012e080 0x80>;
 			interrupts = <0 120 0x4>;
 			supports-sleepmode;
@@ -73,7 +73,7 @@
 
 		gpio2: gpio@8000e000 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0x8000e000 0x80>;
 			interrupts = <0 121 0x4>;
 			supports-sleepmode;
@@ -82,7 +82,7 @@
 
 		gpio3: gpio@8000e080 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0x8000e080 0x80>;
 			interrupts = <0 122 0x4>;
 			supports-sleepmode;
@@ -91,7 +91,7 @@
 
 		gpio4: gpio@8000e100 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0x8000e100 0x80>;
 			interrupts = <0 123 0x4>;
 			supports-sleepmode;
@@ -100,7 +100,7 @@
 
 		gpio5: gpio@8000e180 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0x8000e180 0x80>;
 			interrupts = <0 124 0x4>;
 			supports-sleepmode;
@@ -109,7 +109,7 @@
 
 		gpio6: gpio@8011e000 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0x8011e000 0x80>;
 			interrupts = <0 125 0x4>;
 			supports-sleepmode;
@@ -118,7 +118,7 @@
 
 		gpio7: gpio@8011e080 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0x8011e080 0x80>;
 			interrupts = <0 126 0x4>;
 			supports-sleepmode;
@@ -127,7 +127,7 @@
 
 		gpio8: gpio@a03fe000 {
 			compatible = "stericsson,db8500-gpio",
-				"stmicroelectronics,nomadik-gpio";
+				"st,nomadik-gpio";
 			reg =  <0xa03fe000 0x80>;
 			interrupts = <0 127 0x4>;
 			supports-sleepmode;