---

yaml --- r: 303187 b: refs/heads/master c: c4cea7f h: refs/heads/master i: 303185: 386aa9b 303183: b807a85 v: v3
git-mirror · Apr 22, 2012 · c749e54 · c749e54
1 parent 9f484d0
commit c749e54
Show file tree

Hide file tree

Showing 290 changed files with 3,289 additions and 4,896 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19f36bfa0021617ce07a79e186673d2da2258b60
+refs/heads/master: c4cea7fc1bfd8a36d08f8114efcb11d649d97d5a
diff --git a/trunk/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml b/trunk/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml
@@ -1,6 +1,6 @@
     <refentry id="V4L2-PIX-FMT-NV12M">
       <refmeta>
-	<refentrytitle>V4L2_PIX_FMT_NV12M ('NV12M')</refentrytitle>
+	<refentrytitle>V4L2_PIX_FMT_NV12M ('NM12')</refentrytitle>
 	&manvol;
       </refmeta>
       <refnamediv>

diff --git a/trunk/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml b/trunk/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml
@@ -1,6 +1,6 @@
     <refentry id="V4L2-PIX-FMT-YUV420M">
       <refmeta>
-	<refentrytitle>V4L2_PIX_FMT_YUV420M ('YU12M')</refentrytitle>
+	<refentrytitle>V4L2_PIX_FMT_YUV420M ('YM12')</refentrytitle>
 	&manvol;
       </refmeta>
       <refnamediv>

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/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/MAINTAINERS b/trunk/MAINTAINERS
@@ -2321,9 +2321,9 @@ S:	Supported
 F:	drivers/acpi/dock.c
 
 DOCUMENTATION
-M:	Randy Dunlap <rdunlap@xenotime.net>
+M:	Rob Landley <rob@landley.net>
 L:	linux-doc@vger.kernel.org
-T:	quilt http://xenotime.net/kernel-doc-patches/current/
+T:	TBD
 S:	Maintained
 F:	Documentation/
 

diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*

diff --git a/trunk/arch/arm/boot/dts/omap3-beagle.dts b/trunk/arch/arm/boot/dts/omap3-beagle.dts
@@ -18,52 +18,3 @@
 		reg = <0x80000000 0x20000000>; /* 512 MB */
 	};
 };
-
-&i2c1 {
-	clock-frequency = <2600000>;
-
-	twl: twl@48 {
-		reg = <0x48>;
-		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
-		interrupt-parent = <&intc>;
-
-		vsim: regulator@10 {
-			compatible = "ti,twl4030-vsim";
-			regulator-min-microvolt = <1800000>;
-			regulator-max-microvolt = <3000000>;
-		};
-	};
-};
-
-/include/ "twl4030.dtsi"
-
-&i2c2 {
-	clock-frequency = <400000>;
-};
-
-&i2c3 {
-	clock-frequency = <100000>;
-
-	/*
-	 * Display monitor features are burnt in the EEPROM
-	 * as EDID data.
-	 */
-	eeprom@50 {
-		compatible = "ti,eeprom";
-		reg = <0x50>;
-	};
-};
-
-&mmc1 {
-	vmmc-supply = <&vmmc1>;
-	vmmc_aux-supply = <&vsim>;
-	ti,bus-width = <8>;
-};
-
-&mmc2 {
-	status = "disable";
-};
-
-&mmc3 {
-	status = "disable";
-};
diff --git a/trunk/arch/arm/boot/dts/omap3.dtsi b/trunk/arch/arm/boot/dts/omap3.dtsi
@@ -69,60 +69,6 @@
 			reg = <0x48200000 0x1000>;
 		};
 
-		gpio1: gpio@48310000 {
-			compatible = "ti,omap3-gpio";
-			ti,hwmods = "gpio1";
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		gpio2: gpio@49050000 {
-			compatible = "ti,omap3-gpio";
-			ti,hwmods = "gpio2";
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		gpio3: gpio@49052000 {
-			compatible = "ti,omap3-gpio";
-			ti,hwmods = "gpio3";
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		gpio4: gpio@49054000 {
-			compatible = "ti,omap3-gpio";
-			ti,hwmods = "gpio4";
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		gpio5: gpio@49056000 {
-			compatible = "ti,omap3-gpio";
-			ti,hwmods = "gpio5";
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		gpio6: gpio@49058000 {
-			compatible = "ti,omap3-gpio";
-			ti,hwmods = "gpio6";
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
 		uart1: serial@4806a000 {
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart1";
@@ -167,53 +113,5 @@
 			#size-cells = <0>;
 			ti,hwmods = "i2c3";
 		};
-
-		mcspi1: spi@48098000 {
-			compatible = "ti,omap2-mcspi";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			ti,hwmods = "mcspi1";
-			ti,spi-num-cs = <4>;
-		};
-
-		mcspi2: spi@4809a000 {
-			compatible = "ti,omap2-mcspi";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			ti,hwmods = "mcspi2";
-			ti,spi-num-cs = <2>;
-		};
-
-		mcspi3: spi@480b8000 {
-			compatible = "ti,omap2-mcspi";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			ti,hwmods = "mcspi3";
-			ti,spi-num-cs = <2>;
-		};
-
-		mcspi4: spi@480ba000 {
-			compatible = "ti,omap2-mcspi";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			ti,hwmods = "mcspi4";
-			ti,spi-num-cs = <1>;
-		};
-
-		mmc1: mmc@4809c000 {
-			compatible = "ti,omap3-hsmmc";
-			ti,hwmods = "mmc1";
-			ti,dual-volt;
-		};
-
-		mmc2: mmc@480b4000 {
-			compatible = "ti,omap3-hsmmc";
-			ti,hwmods = "mmc2";
-		};
-
-		mmc3: mmc@480ad000 {
-			compatible = "ti,omap3-hsmmc";
-			ti,hwmods = "mmc3";
-		};
 	};
 };
diff --git a/trunk/arch/arm/boot/dts/omap4-panda.dts b/trunk/arch/arm/boot/dts/omap4-panda.dts
@@ -18,59 +18,3 @@
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
 };
-
-&i2c1 {
-	clock-frequency = <400000>;
-
-	twl: twl@48 {
-		reg = <0x48>;
-		/* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
-		interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
-		interrupt-parent = <&gic>;
-	};
-};
-
-/include/ "twl6030.dtsi"
-
-&i2c2 {
-	clock-frequency = <400000>;
-};
-
-&i2c3 {
-	clock-frequency = <100000>;
-
-	/*
-	 * Display monitor features are burnt in their EEPROM as EDID data.
-	 * The EEPROM is connected as I2C slave device.
-	 */
-	eeprom@50 {
-		compatible = "ti,eeprom";
-		reg = <0x50>;
-	};
-};
-
-&i2c4 {
-	clock-frequency = <400000>;
-};
-
-&mmc1 {
-	vmmc-supply = <&vmmc>;
-	ti,bus-width = <8>;
-};
-
-&mmc2 {
-	status = "disable";
-};
-
-&mmc3 {
-	status = "disable";
-};
-
-&mmc4 {
-	status = "disable";
-};
-
-&mmc5 {
-	ti,non-removable;
-	ti,bus-width = <4>;
-};