diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 09:12:28 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 09:12:28 +0200 |
| commit | cb32b4e0fc53ebd45708dd7aa8d7fa224e97308c (patch) | |
| tree | 68b8015b5e0ba3acb69db4f1c458841d327e74fe /arch/arm/boot/dts/imx6q-sabrelite.dts | |
| parent | Merge remote-tracking branch 'mturquette/clk-3.7' into imx/dt-for-3.7-2 (diff) | |
| parent | ARM: imx6q: replace clk_register_clkdev with clock DT lookup (diff) | |
| download | linux-cb32b4e0fc53ebd45708dd7aa8d7fa224e97308c.tar.xz linux-cb32b4e0fc53ebd45708dd7aa8d7fa224e97308c.zip | |
Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2
Conflicts:
arch/arm/boot/dts/imx6q.dtsi
Diffstat (limited to 'arch/arm/boot/dts/imx6q-sabrelite.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6q-sabrelite.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts index 1c57e19e8a8a..0fb29ca7a9e1 100644 --- a/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts @@ -122,6 +122,7 @@ codec: sgtl5000@0a { compatible = "fsl,sgtl5000"; reg = <0x0a>; + clocks = <&clks 169>; VDDA-supply = <®_2p5v>; VDDIO-supply = <®_3p3v>; }; |