diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-08 08:39:00 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 08:39:00 -0800 |
| commit | 2d9e02cad61c49798d9d36b9d87739c279fd6b0f (patch) | |
| tree | cd3411d435b6163a65963c427b5ec7d4f794908c /Documentation/devicetree/bindings/clock/imx6q-clock.txt | |
| parent | 5cf87a12cac05460666faa22711b655a327b2219 (diff) | |
| parent | e37f0d5b32c2a66677d0f2a21431a87e7e9ce22d (diff) | |
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
Diffstat (limited to 'Documentation/devicetree/bindings/clock/imx6q-clock.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/imx6q-clock.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt index d77b4e68dc4..f73fdf59556 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 { |