Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d9e02ca authored Jan 08, 2013 by Olof Johansson

Merge tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo:

It includes one critical fix - wrong flexcan2 clock will hang system
when the port gets brought up.  The other two are non-critical fixes,
which are sent together here, since it's still early -rc stage.

* tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: dts: imx31-bug: Fix manufacturer compatible string
  clk: imx: Remove 'clock-output-names' from the examples

parents 5cf87a12 e37f0d5b

Documentation/devicetree/bindings/clock/imx23-clock.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -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 {

Documentation/devicetree/bindings/clock/imx25-clock.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 {

Documentation/devicetree/bindings/clock/imx28-clock.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -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 {

Documentation/devicetree/bindings/clock/imx6q-clock.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 {

arch/arm/boot/dts/imx31-bug.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */