diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 03:12:28 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-17 03:12:28 -0400 |
| commit | cb32b4e0fc53ebd45708dd7aa8d7fa224e97308c (patch) | |
| tree | 68b8015b5e0ba3acb69db4f1c458841d327e74fe /arch/arm/boot/dts/imx6q-sabrelite.dts | |
| parent | b1f174b19c15e36a5e6f209d98caba77385d790e (diff) | |
| parent | 0e87e0436c0cc3954eb62181a96d7217ca955a4f (diff) | |
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 @@ | |||
| 122 | codec: sgtl5000@0a { | 122 | codec: sgtl5000@0a { |
| 123 | compatible = "fsl,sgtl5000"; | 123 | compatible = "fsl,sgtl5000"; |
| 124 | reg = <0x0a>; | 124 | reg = <0x0a>; |
| 125 | clocks = <&clks 169>; | ||
| 125 | VDDA-supply = <®_2p5v>; | 126 | VDDA-supply = <®_2p5v>; |
| 126 | VDDIO-supply = <®_3p3v>; | 127 | VDDIO-supply = <®_3p3v>; |
| 127 | }; | 128 | }; |