---

yaml --- r: 308337 b: refs/heads/master c: a1e327e h: refs/heads/master i: 308335: 64d4f15 v: v3
git-mirror · May 11, 2012 · 565ea57 · 565ea57
1 parent 0f96505
commit 565ea57
Show file tree

Hide file tree

Showing 652 changed files with 12,938 additions and 19,358 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e29402edf848359d619ce06af86d61e62c292c87
+refs/heads/master: a1e327e683ef4adbb74fbe56b5ca29a89f53088e
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-hsi b/trunk/Documentation/ABI/testing/sysfs-bus-hsi
diff --git a/trunk/Documentation/devicetree/bindings/arm/fsl.txt b/trunk/Documentation/devicetree/bindings/arm/fsl.txt
@@ -1,14 +1,6 @@
 Freescale i.MX Platforms Device Tree Bindings
 -----------------------------------------------
 
-i.MX23 Evaluation Kit
-Required root node properties:
-    - compatible = "fsl,imx23-evk", "fsl,imx23";
-
-i.MX28 Evaluation Kit
-Required root node properties:
-    - compatible = "fsl,imx28-evk", "fsl,imx28";
-
 i.MX51 Babbage Board
 Required root node properties:
     - compatible = "fsl,imx51-babbage", "fsl,imx51";

diff --git a/...devicetree/bindings/ata/ahci-platform.txt → .../devicetree/bindings/ata/calxeda-sata.txt b/...devicetree/bindings/ata/ahci-platform.txt → .../devicetree/bindings/ata/calxeda-sata.txt
@@ -1,10 +1,10 @@
-* AHCI SATA Controller
+* Calxeda SATA Controller
 
 SATA nodes are defined to describe on-chip Serial ATA controllers.
 Each SATA controller should have its own node.
 
 Required properties:
-- compatible        : compatible list, contains "calxeda,hb-ahci" or "snps,spear-ahci"
+- compatible        : compatible list, contains "calxeda,hb-ahci"
 - interrupts        : <interrupt mapping for SATA IRQ>
 - reg               : <registers mapping>
 
@@ -14,3 +14,4 @@ Example:
                 reg = <0xffe08000 0x1000>;
                 interrupts = <115>;
         };
+
diff --git a/trunk/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt b/trunk/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt
diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio-mxs.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio-mxs.txt
diff --git a/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt
diff --git a/trunk/Documentation/devicetree/bindings/mmc/mxs-mmc.txt b/trunk/Documentation/devicetree/bindings/mmc/mxs-mmc.txt
diff --git a/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt b/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt