Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[pandora-kernel.git] / Documentation / devicetree / bindings / serial / sirf-uart.txt

diff --git a/Documentation/devicetree/bindings/serial/sirf-uart.txt b/Documentation/devicetree/bindings/serial/sirf-uart.txt
index 3acdd96..f0c3926 100644 (file)
--- a/Documentation/devicetree/bindings/serial/sirf-uart.txt
+++ b/Documentation/devicetree/bindings/serial/sirf-uart.txt
@@ -2,7 +2,7 @@
 
 Required properties:
 - compatible : Should be "sirf,prima2-uart", "sirf, prima2-usp-uart",
-               "sirf,marco-uart" or "sirf,marco-bt-uart" which means
+               "sirf,atlas7-uart" or "sirf,atlas7-bt-uart" which means
                uart located in BT module and used for BT.
 - reg : Offset and length of the register set for the device
 - interrupts : Should contain uart interrupt
@@ -37,7 +37,7 @@ usp@b0090000 {
 for uart use in BT module,
 uart6: uart@11000000 {
        cell-index = <6>;
-       compatible = "sirf,marco-bt-uart", "sirf,marco-uart";
+       compatible = "sirf,atlas7-bt-uart", "sirf,atlas7-uart";
        reg = <0x11000000 0x1000>;
        interrupts = <0 100 0>;
        clocks = <&clks 138>, <&clks 140>, <&clks 141>;