6 files changed, 2 insertions, 20 deletions

diff --git a/Documentation/devicetree/bindings/clock/imx23-clock.txt b/Documentation/devicetree/bindings/clock/imx23-clock.txt
index baadbb11fe98..5083c0b834b2 100644
--- a/Documentation/devicetree/bindings/clock/imx23-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx23-clock.txt
@@ -60,11 +60,6 @@ clks: clkctrl@80040000 {
         compatible = "fsl,imx23-clkctrl";
         reg = <0x80040000 0x2000>;
         #clock-cells = <1>;
-        clock-output-names =
-                ...
-                "uart",         /* 32 */
-                ...
-                "end_of_list";
 };
 
 auart0: serial@8006c000 {
diff --git a/Documentation/devicetree/bindings/clock/imx25-clock.txt b/Documentation/devicetree/bindings/clock/imx25-clock.txt
index c2a3525ecb4e..db4f2f05c4d0 100644
--- a/Documentation/devicetree/bindings/clock/imx25-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx25-clock.txt
@@ -146,10 +146,6 @@ clks: ccm@53f80000 {
         compatible = "fsl,imx25-ccm";
         reg = <0x53f80000 0x4000>;
         interrupts = <31>;
-        clock-output-names = ...
-                        "uart_ipg",
-                        "uart_serial",
-                        ...;
 };
 
 uart1: serial@43f90000 {
diff --git a/Documentation/devicetree/bindings/clock/imx28-clock.txt b/Documentation/devicetree/bindings/clock/imx28-clock.txt
index 52a49a4a50b3..e6587af62ff0 100644
--- a/Documentation/devicetree/bindings/clock/imx28-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx28-clock.txt
@@ -83,11 +83,6 @@ clks: clkctrl@80040000 {
         compatible = "fsl,imx28-clkctrl";
         reg = <0x80040000 0x2000>;
         #clock-cells = <1>;
-        clock-output-names =
-                ...
-                "uart",         /* 45 */
-                ...
-                "end_of_list";
 };
 
 auart0: serial@8006a000 {
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
index d77b4e68dc42..f73fdf595568 100644
--- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
@@ -211,10 +211,6 @@ clks: ccm@020c4000 {
         reg = <0x020c4000 0x4000>;
         interrupts = <0 87 0x04 0 88 0x04>;
         #clock-cells = <1>;
-        clock-output-names = ...
-                             "uart_ipg",
-                             "uart_serial",
-                             ...;
 };
 
 uart1: serial@02020000 {
diff --git a/arch/arm/boot/dts/imx31-bug.dts b/arch/arm/boot/dts/imx31-bug.dts
index 24731cb78e8e..7f67402328d3 100644
--- a/arch/arm/boot/dts/imx31-bug.dts
+++ b/arch/arm/boot/dts/imx31-bug.dts
@@ -14,7 +14,7 @@
 
 / {
         model = "Buglabs i.MX31 Bug 1.x";
-        compatible = "fsl,imx31-bug", "fsl,imx31";
+        compatible = "buglabs,imx31-bug", "fsl,imx31";
 
         memory {
                 reg = <0x80000000 0x8000000>; /* 128M */
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 552aed4ff982..edc3f1eb6699 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -492,7 +492,7 @@
                                 compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
                                 reg = <0x53fcc000 0x4000>;
                                 interrupts = <83>;
-                                clocks = <&clks 158>, <&clks 157>;
+                                clocks = <&clks 87>, <&clks 86>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };